commit b9a8f8c17ce11dd867e0afec7cbb65c55a3d7e8c Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 13 09:17:43 2013 -0400
Fix the warning about LearnCircuitBuildTimeout && !CircuitBuildTimeout
This is for bug 6304.
Add a changes file too --- changes/bug6304 | 4 ++++ src/or/config.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/changes/bug6304 b/changes/bug6304 new file mode 100644 index 0000000..445560a --- /dev/null +++ b/changes/bug6304 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Behave correctly when the user disables LearnCircuitBuildTimeout + but doesn't tell us what they would like the timeout to be. Fixes + bug 6304; bugfix on 0.2.2.14-alpha. diff --git a/src/or/config.c b/src/or/config.c index 90a5dfb..b04a874 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3761,15 +3761,19 @@ options_validate(or_options_t *old_options, or_options_t *options, options->LearnCircuitBuildTimeout = 0; }
- if (!(options->LearnCircuitBuildTimeout) && - options->CircuitBuildTimeout < RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT) { + if (!options->LearnCircuitBuildTimeout && options->CircuitBuildTimeout && + options->CircuitBuildTimeout < RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT) { log_warn(LD_CONFIG, - "CircuitBuildTimeout is shorter (%d seconds) than recommended " - "(%d seconds), and LearnCircuitBuildTimeout is disabled. " + "CircuitBuildTimeout is shorter (%d seconds) than the recommended " + "minimum (%d seconds), and LearnCircuitBuildTimeout is disabled. " "If tor isn't working, raise this value or enable " "LearnCircuitBuildTimeout.", options->CircuitBuildTimeout, RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT ); + } else if (!options->LearnCircuitBuildTimeout && + !options->CircuitBuildTimeout) { + log_notice(LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but didn't " + "a CircuitBuildTimeout. I'll pick a plausible default."); }
if (options->MaxCircuitDirtiness < MIN_MAX_CIRCUIT_DIRTINESS) {