nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

relay: Split state checks out of circuit_extend()

Browse Source 
Part of 33633.
This commit is contained in:
teor 2020-04-01 09:20:58 +10:00
parent beee9ca608
commit 2563d74a5c
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/feature/relay/circuitbuild_relay.c
View File

@ -42,17 +42,12 @@
/* Before replying to an extend cell, check the state of the circuit /* Before replying to an extend cell, check the state of the circuit
* <b>circ</b>, and the configured tor mode. * <b>circ</b>, and the configured tor mode.
* *
* Return -1 if we want to warn and tear down the circuit, else return 0. * If the state and mode are valid, return 0.
* Otherwise, if they are invalid, log a protocol warning, and return -1.
*/ */
int static int
circuit_extend(struct cell_t *cell, struct circuit_t *circ) circuit_extend_state_valid_helper(const struct circuit_t *circ)
{ {
channel_t *n_chan;
relay_header_t rh;
extend_cell_t ec;
const char *msg = NULL;
int should_launch = 0;
if (!server_mode(get_options())) { if (!server_mode(get_options())) {
circuitbuild_warn_client_extend(); circuitbuild_warn_client_extend();
return -1; return -1;
@ -69,6 +64,29 @@ circuit_extend(struct cell_t *cell, struct circuit_t *circ)
return -1; return -1;
} }
return 0;
}
/** Take the 'extend' <b>cell</b>, pull out addr/port plus the onion
* skin and identity digest for the next hop. If we're already connected,
* pass the onion skin to the next hop using a create cell; otherwise
* launch a new OR connection, and <b>circ</b> will notice when the
* connection succeeds or fails.
*
* Return -1 if we want to warn and tear down the circuit, else return 0.
*/
int
circuit_extend(struct cell_t *cell, struct circuit_t *circ)
{
channel_t *n_chan;
relay_header_t rh;
extend_cell_t ec;
const char *msg = NULL;
int should_launch = 0;
if (circuit_extend_state_valid_helper(circ) < 0)
return -1;
relay_header_unpack(&rh, cell->payload); relay_header_unpack(&rh, cell->payload);
if (extend_cell_parse(&ec, rh.command, if (extend_cell_parse(&ec, rh.command,