diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-01-22 15:10:18 +1100 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-01-29 07:16:32 +1100 |
| commit | 77a9de0d48e61e6762e65f6099c9a424544eb0ad (patch) | |
| tree | bd79d43ad9ccb3942cd4c2d1c1699c94e86b7ef2 /src/or/policies.c | |
| parent | 3a00215c35b01909a2db24132ab800298d61b647 (diff) | |
| download | tor-77a9de0d48e61e6762e65f6099c9a424544eb0ad.tar.gz tor-77a9de0d48e61e6762e65f6099c9a424544eb0ad.zip | |
Automatically use IPv6 when ClientUseIPv4 is 0
Consequential changes to log messages:
* it's no longer possible to disable both IPv4 and IPv6,
* refactor common string out of remaining log messages
Diffstat (limited to 'src/or/policies.c')
| -rw-r--r-- | src/or/policies.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/policies.c b/src/or/policies.c index 0dc4f96c8b..734558d836 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -420,11 +420,13 @@ fascist_firewall_allows_address(const tor_addr_t *addr, } /** Is this client configured to use IPv6? - * Clients use IPv6 if ClientUseIPv6 is 1, or UseBridges is 1. */ int fascist_firewall_use_ipv6(const or_options_t *options) { - return (options->ClientUseIPv6 == 1 || options->UseBridges == 1); + /* 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); } /** Do we prefer to connect to IPv6, ignoring ClientPreferIPv6ORPort and |