diff options
| author | Linus Nordberg <linus@torproject.org> | 2012-09-17 20:21:22 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2012-09-17 22:01:58 +0200 |
| commit | bee1e46bd179b4085f47f3f3fc34db94e67e1c72 (patch) | |
| tree | e40a9e11c74a050e7464dc86451fcd31a9f57462 | |
| parent | 5977da6c60bcde2dee97e443984da3e9a5808bb9 (diff) | |
| download | tor-bee1e46bd179b4085f47f3f3fc34db94e67e1c72.tar tor-bee1e46bd179b4085f47f3f3fc34db94e67e1c72.tar.gz | |
Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set.
This affects both directory authorities and bridge authoritites.
| -rw-r--r-- | changes/bug6880 | 3 | ||||
| -rw-r--r-- | 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 000000000..c08a2d40d --- /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 a8f2fb9de..d3556901a 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, |