diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-13 16:49:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-13 16:49:48 -0500 |
| commit | 94e8f60901eee5d0f0da512703e4de7fb7e0b449 (patch) | |
| tree | 34182b10f0d9c19e382eb2989caeccea8bddb418 /src/or/config.c | |
| parent | 3e45b12f38beca55f58ea612a9f77580e76e37d8 (diff) | |
| parent | 8a7e5c3ba082c5a90db2f4e1bc701fcdcfb86cd8 (diff) | |
| download | tor-94e8f60901eee5d0f0da512703e4de7fb7e0b449.tar.gz tor-94e8f60901eee5d0f0da512703e4de7fb7e0b449.zip | |
Merge branch 'ipv6-only-client_squashed'
Diffstat (limited to 'src/or/config.c')
| -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 d4177878e7..b8ca14e85b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3361,23 +3361,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 " |