[tor-commits] [tor/master] Don't put unreachable IPv6 OR port in routerstatus.

[nickm at torproject.org]

commit 6d99c51f15d664ff6b33957b1043c73448a72711
Author: Linus Nordberg <linus at nordberg.se>
Date:   Thu May 10 17:08:22 2012 +0200

    Don't put unreachable IPv6 OR port in routerstatus.
    
    To have only reachable ports in "a" lines.
---
 src/or/dirserv.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 2af4e68..abbc123 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2468,8 +2468,14 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
   strlcpy(rs->nickname, ri->nickname, sizeof(rs->nickname));
   rs->or_port = ri->or_port;
   rs->dir_port = ri->dir_port;
-  tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr);
-  rs->ipv6_orport = ri->ipv6_orport;
+  if (!tor_addr_is_null(&ri->ipv6_addr) &&
+      node->last_reachable6 >= now - REACHABLE_TIMEOUT) {
+    /* There's an IPv6 OR port and it's reachable so copy it to the
+       routerstatus.  FIXME: If we're not on IPv6, copy it regardless
+       of reachability.  */
+    tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr);
+    rs->ipv6_orport = ri->ipv6_orport;
+  }
 }
 
 /** Routerstatus <b>rs</b> is part of a group of routers that are on