nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace a 4 with a 6; fix a bug that nobody noticed :/

Browse Source 
Fixes 14280 bugfix on 1053af0b9c in 0.2.4.7-alpha.
This commit is contained in:
Nick Mathewson 2015-01-19 11:51:08 -05:00
parent 1053af0b9c
commit a8dd930274
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug14280 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Reject socks requests to literal IPv6 addresses when IPv6Traffic
flag is not set; and not because the NoIPv4Traffic flag was set.
Previously we'd looked at the NoIPv4Traffic flag for both types
of literal addresses. Fixes bug 14280; bugfix on 0.2.4.7-alpha.

3
src/or/connection_edge.c
View File

@ -1364,9 +1364,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
/* If we reach this point, it's an IPv4 or an IPv6 address. */
sa_family_t family = tor_addr_family(&addr);
/* XXXX bug: the second one should be "ipv6_traffic" */
if ((family == AF_INET && ! conn->entry_cfg.ipv4_traffic) ||
(family == AF_INET6 && ! conn->entry_cfg.ipv4_traffic)) {
(family == AF_INET6 && ! conn->entry_cfg.ipv6_traffic)) {
/* You can't do an IPv4 address on a v6-only socks listener,
* or vice versa. */
log_warn(LD_NET, "Rejecting SOCKS request for an IP address "