Commit b31e2c24 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

(a - b) / 2 != a - (b / 2); this is the reason why tunneled directory requests... 

(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
parent 73c6cb83

src/or/circuituse.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {