diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-10-21 12:35:36 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-10-21 12:35:36 +0000 |
| commit | bd1c14f0156c4d166ed1706544242e31d7ddceff (patch) | |
| tree | bc0eba46fb171915cdfa876eb928cce943077dfb /src/app/config | |
| parent | 1e08efdb5891008f8180603bccf461c467275f57 (diff) | |
| parent | 0135fb028c8ca0ce310009f20efef89e53a36f2c (diff) | |
| download | tor-bd1c14f0156c4d166ed1706544242e31d7ddceff.tar.gz tor-bd1c14f0156c4d166ed1706544242e31d7ddceff.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
Diffstat (limited to 'src/app/config')
| -rw-r--r-- | src/app/config/config.c | 2 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 4 | ||||
| -rw-r--r-- | src/app/config/testnet.inc | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index bfa258c904..2877bc1e6a 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -550,6 +550,7 @@ static const config_var_t option_vars_[] = { V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), VPORT(MetricsPort), V(MetricsPortPolicy, LINELIST, NULL), + V(TestingMinTimeToReportBandwidth, INTERVAL, "1 day"), VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), @@ -3980,6 +3981,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 diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 510ece42a3..151b77c457 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -1060,6 +1060,10 @@ struct or_options_t { /** List of policy allowed to query the Metrics port. */ struct config_line_t *MetricsPortPolicy; + /** How far must we be into the current bandwidth-measurement period to + * report bandwidth observations from this period? */ + int TestingMinTimeToReportBandwidth; + /** * Configuration objects for individual modules. * diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 00b307782b..039454a0d0 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -19,6 +19,7 @@ { "TestingV3AuthInitialDistDelay", "20 seconds" }, { "TestingAuthDirTimeToLearnReachability", "0 minutes" }, { "MinUptimeHidServDirectoryV2", "0 minutes" }, +{ "TestingMinTimeToReportBandwidth", "0 seconds" }, { "TestingServerDownloadInitialDelay", "0" }, { "TestingClientDownloadInitialDelay", "0" }, { "TestingServerConsensusDownloadInitialDelay", "0" }, |