diff options
Diffstat (limited to 'src/app/config/config.c')
| -rw-r--r-- | src/app/config/config.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 9011f36735..88da7a0aa7 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -563,7 +563,7 @@ static const config_var_t option_vars_[] = { V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), VPORT(MetricsPort), V(MetricsPortPolicy, LINELIST, NULL), - V(MinTimeToReportBandwidth, INTERVAL, "1 day"), + V(TestingMinTimeToReportBandwidth, INTERVAL, "1 day"), VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), @@ -3712,13 +3712,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; } - if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW && - !options->TestingTorNetwork) { - log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; " - "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW); - options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW; - } - if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); @@ -3994,6 +3987,7 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) CHECK_DEFAULT(TestingSigningKeySlop); CHECK_DEFAULT(TestingAuthKeySlop); CHECK_DEFAULT(TestingLinkKeySlop); + CHECK_DEFAULT(TestingMinTimeToReportBandwidth); or_options_free(dflt_options); } #undef CHECK_DEFAULT |