diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-07-23 14:07:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-07-23 14:07:32 +0000 |
| commit | 15b2b8bd69ff30a85c2364bcc528090b36aa9286 (patch) | |
| tree | cde62b5daf0796a6356c9c5f209a9ed8fd845129 /src/or/config.c | |
| parent | cc46b232485b192d988bc6ef9ffbfcb88e630491 (diff) | |
| download | tor-15b2b8bd69ff30a85c2364bcc528090b36aa9286.tar.gz tor-15b2b8bd69ff30a85c2364bcc528090b36aa9286.zip | |
r17309@aud-055: nickm | 2008-07-23 16:05:43 +0200
Patch from Christian Wilms: remove (HiddenService|Rend)(Exclude)?Nodes options. They never worked properly, and nobody seems to be using them. Resolves bug 754.
svn:r16144
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/or/config.c b/src/or/config.c index a7ec8bf931..1d4e58d21d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -221,8 +221,8 @@ static config_var_t _option_vars[] = { V(HashedControlPassword, LINELIST, NULL), V(HidServDirectoryV2, BOOL, "0"), VAR("HiddenServiceDir", LINELIST_S, RendConfigLines, NULL), - VAR("HiddenServiceExcludeNodes", LINELIST_S, RendConfigLines, NULL), - VAR("HiddenServiceNodes", LINELIST_S, RendConfigLines, NULL), + OBSOLETE("HiddenServiceExcludeNodes"), + OBSOLETE("HiddenServiceNodes"), VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines, NULL), VAR("HiddenServicePort", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines, NULL), @@ -275,8 +275,8 @@ static config_var_t _option_vars[] = { V(RejectPlaintextPorts, CSV, ""), V(RelayBandwidthBurst, MEMUNIT, "0"), V(RelayBandwidthRate, MEMUNIT, "0"), - V(RendExcludeNodes, STRING, NULL), - V(RendNodes, STRING, NULL), + OBSOLETE("RendExcludeNodes"), + OBSOLETE("RendNodes"), V(RendPostPeriod, INTERVAL, "1 hour"), V(RephistTrackTime, INTERVAL, "24 hours"), OBSOLETE("RouterFile"), @@ -496,9 +496,6 @@ static config_var_description_t options_description[] = { { "ReachableAddresses", "Addresses we can connect to, as IP/bits:port-port. " "By default, we assume all addresses are reachable." }, /* reachablediraddresses, reachableoraddresses. */ - { "RendNodes", "A list of preferred nodes to use for a rendezvous point, " - "when possible." }, - { "RendExcludenodes", "A list of nodes never to use as rendezvous points." }, /* SafeSOCKS */ { "SOCKSPort", "The port where we listen for SOCKS connections from " "applications." }, @@ -3314,10 +3311,6 @@ options_validate(or_options_t *old_options, or_options_t *options, return -1; if (check_nickname_list(options->EntryNodes, "EntryNodes", msg)) return -1; - if (check_nickname_list(options->RendNodes, "RendNodes", msg)) - return -1; - if (check_nickname_list(options->RendNodes, "RendExcludeNodes", msg)) - return -1; if (check_nickname_list(options->TestVia, "TestVia", msg)) return -1; if (check_nickname_list(options->MyFamily, "MyFamily", msg)) |