[tor-commits] [tor/master] Stop forcing IPv4 and IPv6 traffic on non-SOCKSPorts

[nickm at torproject.org]

commit 09b3af578d3dd57f91d3d21c74e86a36c32cbd0e
Author: Neel Chauhan <neel at neelc.org>
Date:   Tue Oct 27 17:57:48 2020 -0700

    Stop forcing IPv4 and IPv6 traffic on non-SOCKSPorts
---
 changes/bug33607               | 5 +++++
 src/core/mainloop/connection.c | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/changes/bug33607 b/changes/bug33607
new file mode 100644
index 0000000000..c18d37b0d3
--- /dev/null
+++ b/changes/bug33607
@@ -0,0 +1,5 @@
+  o Minor bugfixes (ipv6):
+    - Allow non-SOCKSPorts to disable IPv4, IPv6, and Prefer IPv4. Some rare
+      configs might break, but in this case you can disable NoIPv4Traffic and
+      NoIPv6Traffic as needed. Fixes bug 33607; bugfix on 0.4.1.1-alpha. Patch
+      by Neel Chauhan.
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;