diff options
Diffstat (limited to 'src/feature/relay/circuitbuild_relay.c')
| -rw-r--r-- | src/feature/relay/circuitbuild_relay.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/feature/relay/circuitbuild_relay.c b/src/feature/relay/circuitbuild_relay.c index f167d0a8e4..9da89953fb 100644 --- a/src/feature/relay/circuitbuild_relay.c +++ b/src/feature/relay/circuitbuild_relay.c @@ -39,11 +39,8 @@ #include "feature/relay/routermode.h" #include "feature/relay/selftest.h" -/** 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. +/* Before replying to an extend cell, check the state of the circuit + * <b>circ</b>, and the configured tor mode. * * Return -1 if we want to warn and tear down the circuit, else return 0. */ @@ -56,6 +53,11 @@ circuit_extend(struct cell_t *cell, struct circuit_t *circ) const char *msg = NULL; int should_launch = 0; + if (!server_mode(get_options())) { + circuitbuild_warn_client_extend(); + return -1; + } + if (circ->n_chan) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "n_chan already set. Bug/attack. Closing."); @@ -67,12 +69,6 @@ circuit_extend(struct cell_t *cell, struct circuit_t *circ) return -1; } - if (!server_mode(get_options())) { - log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Got an extend cell, but running as a client. Closing."); - return -1; - } - relay_header_unpack(&rh, cell->payload); if (extend_cell_parse(&ec, rh.command, |