From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Nov 2012 02:40:55 +0000 (-0400)
Subject: When asking for a specific address type, others aren't acceptable
X-Git-Tag: tor-0.2.4.7-alpha~35^2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93591383a9169bd1716aa6495424e5e5e6161bd8;p=thirdparty%2Ftor.git

When asking for a specific address type, others aren't acceptable
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 1dd1dbc4d4..2f3ed5d6f8 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1168,6 +1168,10 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
                      "no IPv4 traffic supported.");
             connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY);
             return -1;
+          } else if (family == AF_INET6) {
+            conn->ipv4_traffic_ok = 0;
+          } else if (family == AF_INET) {
+            conn->ipv6_traffic_ok = 0;
           }
         }
       }