diff options
| author | teor <teor@torproject.org> | 2020-03-13 12:25:43 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-03-13 12:28:19 +1000 |
| commit | cc2fb91ea52fab733ee5ddde7c485854c5b170c3 (patch) | |
| tree | 35e7abbdf782e38e4a208df9f8165240d3f2123e /src | |
| parent | 3e42004e54054b111068e0a83825b95b7c8ff585 (diff) | |
| download | tor-cc2fb91ea52fab733ee5ddde7c485854c5b170c3.tar.gz tor-cc2fb91ea52fab733ee5ddde7c485854c5b170c3.zip | |
connection: Stop forcing some ports to prefer IPv6
Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections.
Instead, prefer IPv6 connections by default, but allow users to change
their configs using the "NoPreferIPv6" port flag.
Fixes bug 33608; bugfix on 0.4.3.1-alpha.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/mainloop/connection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index bfd850da86..57b48d49f3 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1514,10 +1514,11 @@ connection_listener_new(const struct sockaddr *listensockaddr, } } + /* Force IPv4 and IPv6 traffic on for non-SOCKSPorts. + * Forcing options on isn't a good idea, see #32994 and #33607. */ if (type != CONN_TYPE_AP_LISTENER) { lis_conn->entry_cfg.ipv4_traffic = 1; lis_conn->entry_cfg.ipv6_traffic = 1; - lis_conn->entry_cfg.prefer_ipv6 = 1; } if (connection_add(conn) < 0) { /* no space, forget it */ |