nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include IPv6 OR ports in status documents only if we're a bridge authority.

Browse Source
This commit is contained in:
Linus Nordberg 2012-05-10 18:48:30 +02:00 committed by Linus Nordberg
parent 6d99c51f15
commit 7c80a4502c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/dirserv.c
View File

@ -2468,11 +2468,13 @@ 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;
if (!tor_addr_is_null(&ri->ipv6_addr) &&
if (authdir_mode_bridge(options) &&
!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. */
/* 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. */
tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr);
rs->ipv6_orport = ri->ipv6_orport;
}