diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-17 16:05:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-17 16:05:09 -0400 |
| commit | 5dfec9f8335d0fa954ff5423a41e3e249547fd8d (patch) | |
| tree | d2b30c0fea6353df57f85cd5ee2b3e8a8cced116 | |
| parent | 1e5cd1c7d6f45456c5e7c1b288e5e02e7c02b377 (diff) | |
| parent | bee1e46bd179b4085f47f3f3fc34db94e67e1c72 (diff) | |
| download | tor-5dfec9f8335d0fa954ff5423a41e3e249547fd8d.tar.gz tor-5dfec9f8335d0fa954ff5423a41e3e249547fd8d.zip | |
Merge remote-tracking branch 'linus/bug6880'
| -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 0000000000..c08a2d40de --- /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 9ca4c54f75..468515eb22 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3416,7 +3416,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, |