diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-09-20 19:50:44 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-09-20 19:50:44 -0400 |
| commit | cf2afcd7072d20755ad030ed8240c21ec649dcd7 (patch) | |
| tree | 58b8125dd4daaf3ca73eadae47e0e00eeda5ed2d /src/or/or.h | |
| parent | f39bedf250ce878436acda2b7217fa0b5621ffaa (diff) | |
| download | tor-cf2afcd7072d20755ad030ed8240c21ec649dcd7.tar tor-cf2afcd7072d20755ad030ed8240c21ec649dcd7.tar.gz | |
Fix typos and comments, plus two bugs
A) We were considering a circuit had timed out in the special cases
where we close rendezvous circuits because the final rendezvous
circuit couldn't be built in time.
B) We were looking at the wrong timestamp_created when considering
a timeout.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/or/or.h b/src/or/or.h index 791f54449..a7db06f71 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2937,11 +2937,11 @@ typedef struct { int nonlive_timeouts; /** If the network is not live, have we yet discarded our history? */ int nonlive_discarded; - /** Circular array of circuits that have made it past 1 hop. Slot is + /** Circular array of circuits that have made it to the first hop. Slot is * 1 if circuit timed out, 0 if circuit succeeded */ - int8_t onehop_timeouts[RECENT_CIRCUITS]; + int8_t timeouts_after_firsthop[RECENT_CIRCUITS]; /** Index into circular array. */ - int onehop_idx; + int after_firsthop_idx; } network_liveness_t; /** Structure for circuit build times history */ @@ -3004,8 +3004,6 @@ int circuit_build_times_network_check_changed(circuit_build_times_t *cbt); /* Network liveness functions */ void circuit_build_times_network_is_live(circuit_build_times_t *cbt); int circuit_build_times_network_check_live(circuit_build_times_t *cbt); -void circuit_build_times_network_timeout(circuit_build_times_t *cbt, - int did_onehop, time_t start_time); void circuit_build_times_network_circ_success(circuit_build_times_t *cbt); /********************************* circuitlist.c ***********************/ |