Ensure relays must use IPv4, and can use IPv6

A mistake in previous refactoring had relays using IPv4 and IPv6.
This commit is contained in:
teor (Tim Wilson-Brown)
2016-02-20 19:28:51 +11:00
parent 5494938467
commit 25543387ed
+4 -5
View File
@@ -408,13 +408,12 @@ fascist_firewall_allows_address(const tor_addr_t *addr,
if (tor_addr_family(addr) == AF_INET &&
(!options->ClientUseIPv4 || (pref_only && pref_ipv6)))
return 0;
/* Bridges can always use IPv6 */
if (tor_addr_family(addr) == AF_INET6 &&
(!fascist_firewall_use_ipv6(options) || (pref_only && !pref_ipv6)))
return 0;
}
if (tor_addr_family(addr) == AF_INET6 &&
(!fascist_firewall_use_ipv6(options) || (pref_only && !pref_ipv6)))
return 0;
return addr_policy_permits_tor_addr(addr, port,
firewall_policy);
}