aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-09-29 18:01:22 -0400
committerRoger Dingledine <arma@torproject.org>2010-09-29 18:01:22 -0400
commit7f10707c42e69ef69395aecf7984d16107c78331 (patch)
tree0c1c431d27fa11e1fa700743d0c675f1c04110fd /src/or/circuituse.c
parentf1b0e4e4b4d238595b1694df201e995bee235960 (diff)
downloadtor-7f10707c42e69ef69395aecf7984d16107c78331.tar.gz
tor-7f10707c42e69ef69395aecf7984d16107c78331.zip
refactor and recomment; no actual changes
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 6ecb925230..66ee0c4353 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -278,8 +278,9 @@ void
circuit_expire_building(time_t now)
{
circuit_t *victim, *next_circ = global_circuitlist;
- /* circ_times.timeout is BUILD_TIMEOUT_INITIAL_VALUE if we haven't
- * decided on a customized one yet */
+ /* circ_times.timeout_ms and circ_times.close_ms are from
+ * circuit_build_times_get_initial_timeout() if we haven't computed
+ * custom timeouts yet */
time_t general_cutoff = now - tor_lround(circ_times.timeout_ms/1000);
time_t begindir_cutoff = now - tor_lround(circ_times.timeout_ms/2000);
time_t fourhop_cutoff = now - tor_lround(4*circ_times.timeout_ms/3000);