aboutsummaryrefslogtreecommitdiff
path: root/src/core/mainloop
diff options
context:
space:
mode:
authorNeel Chauhan <neel@neelc.org>2020-10-27 17:57:48 -0700
committerNeel Chauhan <neel@neelc.org>2020-10-27 17:57:48 -0700
commit09b3af578d3dd57f91d3d21c74e86a36c32cbd0e (patch)
treec5b77de1a0cdaeb5955ef7d398be8f77f07e237c /src/core/mainloop
parent362229f184c92712ee5a3027ce5d29024ca5b382 (diff)
downloadtor-09b3af578d3dd57f91d3d21c74e86a36c32cbd0e.tar.gz
tor-09b3af578d3dd57f91d3d21c74e86a36c32cbd0e.zip
Stop forcing IPv4 and IPv6 traffic on non-SOCKSPorts
Diffstat (limited to 'src/core/mainloop')
-rw-r--r--src/core/mainloop/connection.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
index 3d551c4ba8..41d67183aa 100644
--- a/src/core/mainloop/connection.c
+++ b/src/core/mainloop/connection.c
@@ -1718,13 +1718,6 @@ 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;
- }
-
if (connection_add(conn) < 0) { /* no space, forget it */
log_warn(LD_NET,"connection_add for listener failed. Giving up.");
goto err;