nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix to test for bug8444 / 6034

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-09 19:45:17 -05:00
parent 5e0ce4c578
commit d13b996d83
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/circuitbuild.c
View File

@ -540,6 +540,7 @@ circuit_build_times_get_initial_timeout(void)
* Check if we have LearnCircuitBuildTimeout, and if we don't, * Check if we have LearnCircuitBuildTimeout, and if we don't,
* always use CircuitBuildTimeout, no questions asked. * always use CircuitBuildTimeout, no questions asked.
*/ */
/*XXXX025 this logic could be cleaned up a lot. */
if (get_options()->LearnCircuitBuildTimeout) { if (get_options()->LearnCircuitBuildTimeout) {
if (!unit_tests && get_options()->CircuitBuildTimeout) { if (!unit_tests && get_options()->CircuitBuildTimeout) {
timeout = get_options()->CircuitBuildTimeout*1000; timeout = get_options()->CircuitBuildTimeout*1000;
@ -552,7 +553,10 @@ circuit_build_times_get_initial_timeout(void)
timeout = circuit_build_times_initial_timeout(); timeout = circuit_build_times_initial_timeout();
} }
} else { } else {
if (get_options()->CircuitBuildTimeout > 0)
timeout = get_options()->CircuitBuildTimeout*1000; timeout = get_options()->CircuitBuildTimeout*1000;
else
timeout = circuit_build_times_initial_timeout();
} }
return timeout; return timeout;