From: Linus Nordberg <linus@torproject.org>
Date: Tue, 14 Aug 2012 12:03:58 +0000 (+0200)
Subject: Send IPv6 address in NETINFO cells.
X-Git-Tag: tor-0.2.4.1-alpha~38^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9216e2819b563d3e519b131a7ec34b3ddc196e25;p=thirdparty%2Ftor.git

Send IPv6 address in NETINFO cells.

Closes #6364.
---

diff --git a/changes/bug6364 b/changes/bug6364
new file mode 100644
index 0000000000..c0eb453959
--- /dev/null
+++ b/changes/bug6364
@@ -0,0 +1,3 @@
+  o Minor features:
+    - A relay with an IPv6 OR port now sends that address in NETINFO
+      cells. Fix for bug 6364.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 55ea32e57b..da27cba32d 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1988,12 +1988,19 @@ connection_or_send_netinfo(or_connection_t *conn)
   if ((public_server_mode(get_options()) || !conn->is_outgoing) &&
       (me = router_get_my_routerinfo())) {
     tor_addr_t my_addr;
-    *out++ = 1; /* only one address is supported. */
+    *out++ = 1 + !tor_addr_is_null(&me->ipv6_addr);
 
     tor_addr_from_ipv4h(&my_addr, me->addr);
     len = append_address_to_payload(out, &my_addr);
     if (len < 0)
       return -1;
+    out += len;
+
+    if (!tor_addr_is_null(&me->ipv6_addr)) {
+      len = append_address_to_payload(out, &me->ipv6_addr);
+      if (len < 0)
+        return -1;
+    }
   } else {
     *out = 0;
   }