Add configure option AuthDirHasIPv6Connectivity.

Implements enhancement 5974.
This commit is contained in:
Linus Nordberg
2012-05-28 14:41:04 +02:00
committed by Linus Nordberg
parent cdef2b181a
commit 044da1bf0f
5 changed files with 18 additions and 3 deletions
+4 -3
View File
@@ -2470,11 +2470,12 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
rs->dir_port = ri->dir_port;
if (authdir_mode_bridge(options) &&
!tor_addr_is_null(&ri->ipv6_addr) &&
node->last_reachable6 >= now - REACHABLE_TIMEOUT) {
(options->AuthDirHasIPv6Connectivity == 0 ||
node->last_reachable6 >= now - REACHABLE_TIMEOUT)) {
/* We're a bridge authority (we're not ready for IPv6 relays in
the consensus quite yet). 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. */
reachable (or we know that we're not on IPv6) so copy it to the
routerstatus. */
tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr);
rs->ipv6_orport = ri->ipv6_orport;
}