diff options
| author | teor <teor2345@gmail.com> | 2016-12-16 22:30:55 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2016-12-16 22:30:55 +1100 |
| commit | 2e2d22d29a1829550d60c4115ad2a9822945a799 (patch) | |
| tree | e63f45f7d4614ffb08bd5fde3acbcfa55b0e504c /src/or/policies.c | |
| parent | f2445fc608fcb71cbff913dddcc4c2a38417535f (diff) | |
| download | tor-2e2d22d29a1829550d60c4115ad2a9822945a799.tar.gz tor-2e2d22d29a1829550d60c4115ad2a9822945a799.zip | |
Make fascist_firewall_use_ipv6() check ORPort & DirPort IP preferences
This makes clients try harder to find an IPv6 address when searching for
a directory server.
Required for #19608.
Diffstat (limited to 'src/or/policies.c')
| -rw-r--r-- | src/or/policies.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/or/policies.c b/src/or/policies.c index f4c0cddbcc..dcee65301c 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -297,8 +297,8 @@ parse_reachable_addresses(void) } else if (fascist_firewall_use_ipv6(options) && (policy_is_reject_star(reachable_or_addr_policy, AF_INET6, 0) || policy_is_reject_star(reachable_dir_addr_policy, AF_INET6, 0))) { - log_warn(LD_CONFIG, "You have configured tor to use IPv6 " - "(ClientUseIPv6 1 or UseBridges 1), but " + log_warn(LD_CONFIG, "You have configured tor to use or prefer IPv6 " + "(or UseBridges 1), but " "ReachableAddresses, ReachableORAddresses, or " "ReachableDirAddresses reject all IPv6 addresses. " "Tor will not connect using IPv6."); @@ -426,6 +426,9 @@ fascist_firewall_allows_address(const tor_addr_t *addr, } /** Is this client configured to use IPv6? + * Returns true if the client might use IPv6 for some of its connections + * (including dual-stack and IPv6-only clients), and false if it will never + * use IPv6 for any connections. * Use node_ipv6_or/dir_preferred() when checking a specific node and OR/Dir * port: it supports bridge client per-node IPv6 preferences. */ @@ -433,9 +436,11 @@ int fascist_firewall_use_ipv6(const or_options_t *options) { /* Clients use IPv6 if it's set, or they use bridges, or they don't use - * IPv4 */ - return (options->ClientUseIPv6 == 1 || options->UseBridges == 1 - || options->ClientUseIPv4 == 0); + * IPv4, or they prefer it. + * ClientPreferIPv6DirPort is deprecated, but check it anyway. */ + return (options->ClientUseIPv6 == 1 || options->ClientUseIPv4 == 0 || + options->ClientPreferIPv6ORPort == 1 || + options->ClientPreferIPv6DirPort == 1 || options->UseBridges == 1); } /** Do we prefer to connect to IPv6, ignoring ClientPreferIPv6ORPort and |