Commit a8dd9302 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

Fixes 14280 bugfix on 1053af0b in 0.2.4.7-alpha.
parent 1053af0b

changes/bug14280

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/connection_edge.c

+1 −2
Original line number Diff line number Diff line
@@ -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 "