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

minor fixes

Browse Source 
svn:r6709
This commit is contained in:
Roger Dingledine 2006-07-04 03:19:59 +00:00
parent 9fce316d1c
commit dc79dd6a46
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/circuitbuild.c
View File

@ -54,9 +54,8 @@ static routerinfo_t *choose_random_entry(cpath_build_state_t *state);
static void entry_guards_changed(void); static void entry_guards_changed(void);
/** Iterate over values of circ_id, starting from conn-\>next_circ_id, /** Iterate over values of circ_id, starting from conn-\>next_circ_id,
* and with the high bit specified by circ_id_type (see * and with the high bit specified by conn-\>circ_id_type, until we get
* decide_circ_id_type()), until we get a circ_id that is not in use * a circ_id that is not in use by any other circuit on that conn.
* by any other circuit on that conn.
* *
* Return it, or 0 if can't get a unique circ_id. * 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(); or_options_t *options = get_options();
if (!options->FastFirstHopPK || options->ORPort) if (!options->FastFirstHopPK || server_mode(options))
return 0; return 0;
else if (!router || !router->platform || else if (!router || !router->platform ||
!tor_version_as_new_as(router->platform, "0.1.0.6-rc")) !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); circuit_set_state(circ, CIRCUIT_STATE_BUILDING);
log_info(LD_CIRC,"First hop: finished sending %s cell to '%s'", log_info(LD_CIRC,"First hop: finished sending %s cell to '%s'",
fast ? "CREATE_FAST" : "CREATE", fast ? "CREATE_FAST" : "CREATE",
router ? router->nickname : "<unnamed>"); router ? router->nickname : "<unnamed>");
} else { } else {
tor_assert(circ->cpath->state == CPATH_STATE_OPEN); tor_assert(circ->cpath->state == CPATH_STATE_OPEN);
tor_assert(circ->state == CIRCUIT_STATE_BUILDING); tor_assert(circ->state == CIRCUIT_STATE_BUILDING);

2
src/or/connection_or.c
View File

@ -551,7 +551,7 @@ connection_or_nonopen_was_started_here(connection_t *conn)
* buffer is undefined.) * buffer is undefined.)
* *
* As side effects, * 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 * 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 * descriptors that claim to be on that IP/port but that aren't
* this guy; and note that this guy is reachable. * this guy; and note that this guy is reachable.

1
src/or/relay.c
View File

@ -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, * Return -1 to indicate that we should mark the circuit for close,
* else return 0. * else return 0.
*/ */
/* wrap this into receive_relay_cell one day */
static int static int
relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction, relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
crypt_path_t **layer_hint, char *recognized) crypt_path_t **layer_hint, char *recognized)