From b31e2c2491951c10e1e53d4d0cc32a3ac728e279 Mon Sep 17 00:00:00 2001 From: Karsten Loesing Date: Wed, 5 Nov 2008 10:40:29 +0000 Subject: (a - b) / 2 != a - (b / 2); this is the reason why tunneled directory requests and client-side introduction circuits don't time out after the intended 30 seconds (task #847). Bugfix on r17106. Found by miner. svn:r17189 --- src/or/circuituse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 14acbf5e6..f4ea3e8d8 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -268,8 +268,8 @@ circuit_expire_building(time_t now) { circuit_t *victim, *circ = global_circuitlist; time_t general_cutoff = now - get_options()->CircuitBuildTimeout; - time_t begindir_cutoff = general_cutoff/2; - time_t introcirc_cutoff = general_cutoff/2; + time_t begindir_cutoff = now - get_options()->CircuitBuildTimeout/2; + time_t introcirc_cutoff = begindir_cutoff; cpath_build_state_t *build_state; while (circ) { -- cgit v1.2.3