diff options
| author | Iain R. Learmonth <irl@fsfe.org> | 2019-05-16 12:54:31 +0100 |
|---|---|---|
| committer | Iain R. Learmonth <irl@fsfe.org> | 2019-05-16 13:31:54 +0100 |
| commit | 58cb98af32e8436eccf9536255b8158271f1c03d (patch) | |
| tree | 364cbb1430dba74ffcdf4eeff480579171531b2b /src/app | |
| parent | d86896b29c7a5278bedd89a7150ddbe7531b365b (diff) | |
| download | tor-58cb98af32e8436eccf9536255b8158271f1c03d.tar.gz tor-58cb98af32e8436eccf9536255b8158271f1c03d.zip | |
Prop 301: No longer vote on RecommendedPackages
This is the first half of implementing proposal 301. The
RecommendedPackages torrc option is marked as obsolete and
the test cases for the option removed. Additionally, the code relating
to generating and formatting package lines in votes is removed.
These lines may still appear in votes from other directory authorities
running earlier versions of the code and so consensuses may still
contain package lines. A new consensus method will be needed to stop
including package lines in consensuses.
Fixes: #28465
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 9 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index d03305627b..4382a44723 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -593,7 +593,7 @@ static config_var_t option_vars_[] = { V(RecommendedVersions, LINELIST, NULL), V(RecommendedClientVersions, LINELIST, NULL), V(RecommendedServerVersions, LINELIST, NULL), - V(RecommendedPackages, LINELIST, NULL), + OBSOLETE("RecommendedPackages"), V(ReducedConnectionPadding, BOOL, "0"), V(ConnectionPadding, AUTOBOOL, "auto"), V(RefuseUnknownExits, AUTOBOOL, "auto"), @@ -3521,13 +3521,6 @@ options_validate(or_options_t *old_options, or_options_t *options, "features to be broken in unpredictable ways."); } - for (cl = options->RecommendedPackages; cl; cl = cl->next) { - if (! validate_recommended_package_line(cl->value)) { - log_warn(LD_CONFIG, "Invalid RecommendedPackage line %s will be ignored", - escaped(cl->value)); - } - } - if (options->AuthoritativeDir) { if (!options->ContactInfo && !options->TestingTorNetwork) REJECT("Authoritative directory servers must set ContactInfo"); diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 4e03bec7fa..7e79834f8c 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -121,7 +121,6 @@ struct or_options_t { struct config_line_t *RecommendedVersions; struct config_line_t *RecommendedClientVersions; struct config_line_t *RecommendedServerVersions; - struct config_line_t *RecommendedPackages; /** Whether dirservers allow router descriptors with private IPs. */ int DirAllowPrivateAddresses; /** Whether routers accept EXTEND cells to routers with private IPs. */ |