From: Linus Nordberg <linus@torproject.org>
Date: Tue, 18 Sep 2012 12:41:14 +0000 (+0200)
Subject: Print the correct address family in log printout.
X-Git-Tag: tor-0.2.4.3-alpha~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a989dbc3dcf2d5dd80b279084053fff3e94d124d;p=thirdparty%2Ftor.git

Print the correct address family in log printout.

Look at the address family of the preferred OR port rather than the
node.ipv6_preferred flag since the logic has changed with new
ClientUseIPv6 config option.

Fixes ticket 6884.
---

diff --git a/changes/6884 b/changes/6884
new file mode 100644
index 0000000000..90585dc14c
--- /dev/null
+++ b/changes/6884
@@ -0,0 +1,4 @@
+  o Minor bugfixes (client):
+    - Correct log printout about which address family is preferred
+      when connecting to a bridge with both an IPv4 and IPv6 OR port.
+      Fixes bug 6884.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index d4969239cb..515312f0ea 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -5641,7 +5641,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node)
                  "Bridge '%s' has both an IPv4 and an IPv6 address.  "
                  "Will prefer using its %s address (%s:%d).",
                  ri->nickname,
-                 node->ipv6_preferred ? "IPv6" : "IPv4",
+                 tor_addr_family(&ap.addr) == AF_INET6 ? "IPv6" : "IPv4",
                  fmt_addr(&ap.addr), ap.port);
     }
   }