commit bee1e46bd179b4085f47f3f3fc34db94e67e1c72 Author: Linus Nordberg <linus@torproject.org> Date: Mon Sep 17 20:21:22 2012 +0200 Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set. This affects both directory authorities and bridge authoritites. --- changes/bug6880 | 3 +++ src/or/dirserv.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug6880 b/changes/bug6880 new file mode 100644 index 0000000..c08a2d4 --- /dev/null +++ b/changes/bug6880 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't do reachability testing over IPv6 unless + AuthDirPublishIPv6 is set. Fix for bug 6880. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a8f2fb9..d355690 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3415,7 +3415,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) router->cache_info.identity_digest); /* Possible IPv6. */ - if (!tor_addr_is_null(&router->ipv6_addr)) { + if (get_options()->AuthDirHasIPv6Connectivity == 1 && + !tor_addr_is_null(&router->ipv6_addr)) { char addrstr[TOR_ADDR_BUF_LEN]; log_debug(LD_OR, "Testing reachability of %s at %s:%u.", router->nickname,