diff options
| author | Mike Perry <mikeperry-git@fscked.org> | 2009-09-01 20:27:43 -0700 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@fscked.org> | 2009-09-16 15:52:04 -0700 |
| commit | 6eba08e22f2b0ab91433d6b641eab45a65a4495d (patch) | |
| tree | de0053ab08d170e43b9b295a12b8ad6134dc4e7f /src/or/circuituse.c | |
| parent | fd412549fdd6631c12d1e6d9092a9506f60d9789 (diff) | |
| download | tor-6eba08e22f2b0ab91433d6b641eab45a65a4495d.tar.gz tor-6eba08e22f2b0ab91433d6b641eab45a65a4495d.zip | |
Use our variable directly for timeout.
Using CircuitBuildTimeout is prone to issues with SIGHUP, etc.
Also, shuffle the circuit build times array after loading it
in so that newer measurements don't replace chunks of
similarly timed measurements.
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index d53cb198a2..4162790ec3 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -264,8 +264,8 @@ void circuit_expire_building(time_t now) { circuit_t *victim, *circ = global_circuitlist; - time_t general_cutoff = now - get_options()->CircuitBuildTimeout; - time_t begindir_cutoff = now - get_options()->CircuitBuildTimeout/2; + time_t general_cutoff = now - circ_times.timeout; + time_t begindir_cutoff = now - circ_times.timeout/2; time_t introcirc_cutoff = begindir_cutoff; cpath_build_state_t *build_state; |