mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/184' into master

Browse source
This commit is contained in:
Nick Mathewson 2020-11-17 08:22:44 -05:00
commit 6c61011781
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/bug33607 Normal file
View file

@ -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.

7
src/core/mainloop/connection.c
View file

@ -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 */ if (connection_add(conn) < 0) { /* no space, forget it */
log_warn(LD_NET,"connection_add for listener failed. Giving up."); log_warn(LD_NET,"connection_add for listener failed. Giving up.");
goto err; goto err;