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

When LearnCircuitBuildTimeout is disabled by other options, be quieter

Browse Source
This commit is contained in:
teor 2016-09-05 15:11:45 +10:00 committed by Nick Mathewson
parent 07d32d2e68
commit c43211fd6c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/or/config.c
View File

@ -3465,8 +3465,18 @@ options_validate(or_options_t *old_options, or_options_t *options,
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.");
int severity = LOG_NOTICE;
/* Be a little quieter if we've deliberately disabled
* LearnCircuitBuildTimeout. */
if (options->OnionServiceSingleHopMode) {
severity = LOG_INFO;
#ifdef ENABLE_TOR2WEB_MODE
} else if (options->Tor2webMode) {
severity = LOG_INFO;
#endif
}
log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "
"didn't a CircuitBuildTimeout. I'll pick a plausible default.");
}
if (options->PathBiasNoticeRate > 1.0) {