diff options
| author | teor <teor2345@gmail.com> | 2016-12-16 22:31:06 +1100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-13 16:49:27 -0500 |
| commit | 5227ff4aadcb41f8758d426bf8ddfb4fb2d82cdf (patch) | |
| tree | f3fef68a7ccff1cb585816f07d4e4f717ca4e6ca /src/or | |
| parent | 2e2d22d29a1829550d60c4115ad2a9822945a799 (diff) | |
| download | tor-5227ff4aadcb41f8758d426bf8ddfb4fb2d82cdf.tar.gz tor-5227ff4aadcb41f8758d426bf8ddfb4fb2d82cdf.zip | |
Remove redundant options checks for IPv6 preference conflicts
It is no longer possible for the IPv6 preference options to differ from the
IPv6 usage: preferring IPv6 implies possibly using IPv6.
Also remove the corresponding unit test warning message checks.
(But keep the unit tests themselves - they now run without warnings.)
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/or/config.c b/src/or/config.c index 6948bdbdb4..bbe93a5ba1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3305,23 +3305,6 @@ options_validate(or_options_t *old_options, or_options_t *options, "of the Internet, so they must not set Reachable*Addresses " "or FascistFirewall or FirewallPorts or ClientUseIPv4 0."); - /* We check if Reachable*Addresses blocks all addresses in - * parse_reachable_addresses(). */ - -#define WARN_PLEASE_USE_IPV6_LOG_MSG \ - "ClientPreferIPv6%sPort 1 is ignored unless tor is using IPv6. " \ - "Please set ClientUseIPv6 1, ClientUseIPv4 0, or configure bridges." - - if (!fascist_firewall_use_ipv6(options) - && options->ClientPreferIPv6ORPort == 1) - log_warn(LD_CONFIG, WARN_PLEASE_USE_IPV6_LOG_MSG, "OR"); - - if (!fascist_firewall_use_ipv6(options) - && options->ClientPreferIPv6DirPort == 1) - log_warn(LD_CONFIG, WARN_PLEASE_USE_IPV6_LOG_MSG, "Dir"); - -#undef WARN_PLEASE_USE_IPV6_LOG_MSG - if (options->UseBridges && server_mode(options)) REJECT("Servers must be able to freely connect to the rest " |