diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:28:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:28:10 -0500 |
| commit | 1f498220bda87e44d8a3ab12825270fde6eec7dc (patch) | |
| tree | faad108e8ad3cf63340766faaaeebb369127280a /src/app | |
| parent | 48f734178362d3a8b490a23ceff202a2027a27fc (diff) | |
| parent | 42e31b5c45b5387d1c81067386373636bb8fd5c2 (diff) | |
| download | tor-1f498220bda87e44d8a3ab12825270fde6eec7dc.tar.gz tor-1f498220bda87e44d8a3ab12825270fde6eec7dc.zip | |
Merge remote-tracking branch 'tor-github/pr/1620'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 9 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 5 | ||||
| -rw-r--r-- | src/app/config/testnet.inc | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 680a7eeefa..72ab065fb5 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -451,7 +451,7 @@ static const config_var_t option_vars_[] = { V(EnforceDistinctSubnets, BOOL, "1"), V_D(EntryNodes, ROUTERSET, NULL), V(EntryStatistics, BOOL, "0"), - V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"), + OBSOLETE("TestingEstimatedDescriptorPropagationTime"), V_D(ExcludeNodes, ROUTERSET, NULL), V_D(ExcludeExitNodes, ROUTERSET, NULL), OBSOLETE("ExcludeSingleHopRelays"), @@ -4123,7 +4123,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) CHECK_DEFAULT(TestingV3AuthInitialDistDelay); CHECK_DEFAULT(TestingV3AuthVotingStartOffset); CHECK_DEFAULT(TestingAuthDirTimeToLearnReachability); - CHECK_DEFAULT(TestingEstimatedDescriptorPropagationTime); CHECK_DEFAULT(TestingServerDownloadInitialDelay); CHECK_DEFAULT(TestingClientDownloadInitialDelay); CHECK_DEFAULT(TestingServerConsensusDownloadInitialDelay); @@ -4151,12 +4150,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) if (options_validate_dirauth_testing(old_options, options, msg) < 0) return -1; - if (options->TestingEstimatedDescriptorPropagationTime < 0) { - REJECT("TestingEstimatedDescriptorPropagationTime must be non-negative."); - } else if (options->TestingEstimatedDescriptorPropagationTime > 60*60) { - COMPLAIN("TestingEstimatedDescriptorPropagationTime is insanely high."); - } - if (options->TestingClientMaxIntervalWithoutRequest < 1) { REJECT("TestingClientMaxIntervalWithoutRequest is way too low."); } else if (options->TestingClientMaxIntervalWithoutRequest > 3600) { diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index e63ae2510f..4915be187c 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -723,11 +723,6 @@ struct or_options_t { * altered on testing networks. */ int TestingAuthDirTimeToLearnReachability; - /** Clients don't download any descriptor this recent, since it will - * probably not have propagated to enough caches. Only altered on testing - * networks. */ - int TestingEstimatedDescriptorPropagationTime; - /** Schedule for when servers should download things in general. Only * altered on testing networks. */ int TestingServerDownloadInitialDelay; diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 0ed3c38627..f146a03cd1 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -17,7 +17,6 @@ { "TestingV3AuthInitialVoteDelay", "20 seconds" }, { "TestingV3AuthInitialDistDelay", "20 seconds" }, { "TestingAuthDirTimeToLearnReachability", "0 minutes" }, -{ "TestingEstimatedDescriptorPropagationTime", "0 minutes" }, { "MinUptimeHidServDirectoryV2", "0 minutes" }, { "TestingServerDownloadInitialDelay", "0" }, { "TestingClientDownloadInitialDelay", "0" }, |