nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't poll to see if we need to build circuits for timeout data if LearnCircuitBuildTimeout is disabled

Browse Source
This commit is contained in:
Andrea Shepard 2012-06-12 12:12:06 -07:00 committed by Nick Mathewson
parent a0f76289fd
commit 0c3c0b1ddd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/circuituse.c
View File

@ -746,6 +746,7 @@ circuit_predict_and_launch_new(void)
* want, don't do another -- we want to leave a few slots open so * want, don't do another -- we want to leave a few slots open so
* we can still build circuits preemptively as needed. */ * we can still build circuits preemptively as needed. */
if (num < MAX_UNUSED_OPEN_CIRCUITS-2 && if (num < MAX_UNUSED_OPEN_CIRCUITS-2 &&
get_options()->LearnCircuitBuildTimeout &&
circuit_build_times_needs_circuits_now(&circ_times)) { circuit_build_times_needs_circuits_now(&circ_times)) {
flags = CIRCLAUNCH_NEED_CAPACITY; flags = CIRCLAUNCH_NEED_CAPACITY;
log_info(LD_CIRC, log_info(LD_CIRC,
@ -881,7 +882,8 @@ circuit_expire_old_circuits_clientside(void)
tor_gettimeofday(&now); tor_gettimeofday(&now);
cutoff = now; cutoff = now;
if (circuit_build_times_needs_circuits(&circ_times)) { if (get_options()->LearnCircuitBuildTimeout &&
circuit_build_times_needs_circuits(&circ_times)) {
/* Circuits should be shorter lived if we need more of them /* Circuits should be shorter lived if we need more of them
* for learning a good build timeout */ * for learning a good build timeout */
cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING; cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING;