diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuitbuild.c | 9 | ||||
| -rw-r--r-- | src/or/connection_or.c | 2 | ||||
| -rw-r--r-- | src/or/relay.c | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b618cec23d..e6d13d6673 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -54,9 +54,8 @@ static routerinfo_t *choose_random_entry(cpath_build_state_t *state); static void entry_guards_changed(void); /** Iterate over values of circ_id, starting from conn-\>next_circ_id, - * and with the high bit specified by circ_id_type (see - * decide_circ_id_type()), until we get a circ_id that is not in use - * by any other circuit on that conn. + * and with the high bit specified by conn-\>circ_id_type, until we get + * a circ_id that is not in use by any other circuit on that conn. * * Return it, or 0 if can't get a unique circ_id. */ @@ -530,7 +529,7 @@ should_use_create_fast_for_router(routerinfo_t *router) { or_options_t *options = get_options(); - if (!options->FastFirstHopPK || options->ORPort) + if (!options->FastFirstHopPK || server_mode(options)) return 0; else if (!router || !router->platform || !tor_version_as_new_as(router->platform, "0.1.0.6-rc")) @@ -600,7 +599,7 @@ circuit_send_next_onion_skin(circuit_t *circ) circuit_set_state(circ, CIRCUIT_STATE_BUILDING); log_info(LD_CIRC,"First hop: finished sending %s cell to '%s'", fast ? "CREATE_FAST" : "CREATE", - router ? router->nickname : "<unnamed>"); + router ? router->nickname : "<unnamed>"); } else { tor_assert(circ->cpath->state == CPATH_STATE_OPEN); tor_assert(circ->state == CIRCUIT_STATE_BUILDING); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index ce3bfeea01..9b574d4902 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -551,7 +551,7 @@ connection_or_nonopen_was_started_here(connection_t *conn) * buffer is undefined.) * * As side effects, - * 1) Set conn->circ_id_type according to tor-spec.txt + * 1) Set conn->circ_id_type according to tor-spec.txt. * 2) If we're an authdirserver and we initiated the connection: drop all * descriptors that claim to be on that IP/port but that aren't * this guy; and note that this guy is reachable. diff --git a/src/or/relay.c b/src/or/relay.c index a367b01318..95b999c726 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -240,7 +240,6 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, int cell_direction) * Return -1 to indicate that we should mark the circuit for close, * else return 0. */ -/* wrap this into receive_relay_cell one day */ static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction, crypt_path_t **layer_hint, char *recognized) |