diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-12-19 08:24:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-12-19 08:57:47 -0500 |
| commit | ea91edff15014eb24458cb0309e22d761cb170c1 (patch) | |
| tree | b03945096897ea43f8d47bfb35b4f2766460e19e /src/app | |
| parent | a6ba56761b6dc22011eee015f371d37d7b399a64 (diff) | |
| download | tor-ea91edff15014eb24458cb0309e22d761cb170c1.tar.gz tor-ea91edff15014eb24458cb0309e22d761cb170c1.zip | |
Dirauth options: move versioning options to dirauth module
This commit moves VersioningAuthoritativeDirectory,
RecommendedClientVersions, and RecommendedServerVersions.
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 4 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 680a7eeefa..095c12109c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -623,9 +623,6 @@ static const config_var_t option_vars_[] = { V(ReachableAddresses, LINELIST, NULL), V(ReachableDirAddresses, LINELIST, NULL), V(ReachableORAddresses, LINELIST, NULL), - V(RecommendedVersions, LINELIST, NULL), - V(RecommendedClientVersions, LINELIST, NULL), - V(RecommendedServerVersions, LINELIST, NULL), OBSOLETE("RecommendedPackages"), V(ReducedConnectionPadding, BOOL, "0"), V(ConnectionPadding, AUTOBOOL, "auto"), @@ -703,7 +700,6 @@ static const config_var_t option_vars_[] = { V(V3AuthUseLegacyKey, BOOL, "0"), V(V3BandwidthsFile, FILENAME, NULL), V(GuardfractionFile, FILENAME, NULL), - VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), OBSOLETE("VoteOnHidServDirectoriesV2"), V(VirtualAddrNetworkIPv4, STRING, "127.192.0.0/10"), V(VirtualAddrNetworkIPv6, STRING, "[FE80::]/10"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index e63ae2510f..037dbf5a32 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -113,11 +113,6 @@ struct or_options_t { * [][0] is IPv4, [][1] is IPv6 */ tor_addr_t OutboundBindAddresses[OUTBOUND_ADDR_MAX][2]; - /** Directory server only: which versions of - * Tor should we tell users to run? */ - struct config_line_t *RecommendedVersions; - struct config_line_t *RecommendedClientVersions; - struct config_line_t *RecommendedServerVersions; /** Whether dirservers allow router descriptors with private IPs. */ int DirAllowPrivateAddresses; /** Whether routers accept EXTEND cells to routers with private IPs. */ @@ -192,9 +187,6 @@ struct or_options_t { int AuthoritativeDir; /**< Boolean: is this an authoritative directory? */ int V3AuthoritativeDir; /**< Boolean: is this an authoritative directory * for version 3 directories? */ - int VersioningAuthoritativeDir; /**< Boolean: is this an authoritative - * directory that's willing to recommend - * versions? */ int BridgeAuthoritativeDir; /**< Boolean: is this an authoritative directory * that aggregates bridge descriptors? */ |