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

Merge branch 'bug22252_029' into maint-0.3.0

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-18 10:06:06 -04:00
commit 935cd77f62
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug22252 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (configuration):
- Do not crash when starting with LearnCircuitBuildTimeout 0.
Fixes bug 22252; bugfix on 0.2.9.3-alpha.

11
src/or/circuitstats.c
View File

@ -106,11 +106,20 @@ get_circuit_build_timeout_ms(void)
*/
int
circuit_build_times_disabled(const or_options_t *options)
{
return circuit_build_times_disabled_(options, 0);
}
/** As circuit_build_times_disabled, but take options as an argument. */
int
circuit_build_times_disabled_(const or_options_t *options,
int ignore_consensus)
{
if (unit_tests) {
return 0;
} else {
int consensus_disabled = networkstatus_get_param(NULL, "cbtdisabled",
int consensus_disabled =
ignore_consensus ? 0 : networkstatus_get_param(NULL, "cbtdisabled",
0, 0, 1);
int config_disabled = !options->LearnCircuitBuildTimeout;
int dirauth_disabled = options->AuthoritativeDir;

3
src/or/circuitstats.h
View File

@ -18,6 +18,9 @@ double get_circuit_build_close_time_ms(void);
double get_circuit_build_timeout_ms(void);
int circuit_build_times_disabled(const or_options_t *options);
int circuit_build_times_disabled_(const or_options_t *options,
int ignore_consensus);
int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
void circuit_build_times_update_state(const circuit_build_times_t *cbt,
or_state_t *state);

2
src/or/config.c
View File

@ -3535,7 +3535,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
int severity = LOG_NOTICE;
/* Be a little quieter if we've deliberately disabled
* LearnCircuitBuildTimeout. */
if (circuit_build_times_disabled(options)) {
if (circuit_build_times_disabled_(options, 1)) {
severity = LOG_INFO;
}
log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "