From: Karsten Loesing <karsten.loesing@gmx.net>
Date: Wed, 5 Nov 2008 10:40:29 +0000 (+0000)
Subject: (a - b) / 2 != a - (b / 2); this is the reason why tunneled directory requests and... 
X-Git-Tag: tor-0.2.1.7-alpha~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b31e2c2491951c10e1e53d4d0cc32a3ac728e279;p=thirdparty%2Ftor.git

(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
---

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 14acbf5e6c..f4ea3e8d84 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) {