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

relay/circuitbuild: Refactor circuit_extend()

Browse Source 
Make the "else" case explicit at the end of the function.

Part of 33633.
This commit is contained in:
teor 2020-04-06 19:21:13 +10:00
parent 6d75f3244f
commit d79e5d52bc
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,18 +295,20 @@ circuit_extend(struct cell_t *cell, struct circuit_t *circ)
* OR_CONN_STATE_OPEN. * OR_CONN_STATE_OPEN.
*/ */
return 0; return 0;
} else {
/* Connection is already established.
* So we need to extend the circuit to the next hop. */
tor_assert(!circ->n_hop);
circ->n_chan = n_chan;
log_debug(LD_CIRC,
"n_chan is %s.",
channel_get_canonical_remote_descr(n_chan));
if (circuit_deliver_create_cell(circ, &ec.create_cell, 1) < 0)
return -1;
return 0;
} }
tor_assert(!circ->n_hop); /* Connection is already established. */
circ->n_chan = n_chan;
log_debug(LD_CIRC,
"n_chan is %s.",
channel_get_canonical_remote_descr(n_chan));
if (circuit_deliver_create_cell(circ, &ec.create_cell, 1) < 0)
return -1;
return 0;
} }
/** On a relay, accept a create cell, initialise a circuit, and send a /** On a relay, accept a create cell, initialise a circuit, and send a