nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'linus/bug6880'

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-17 16:05:09 -04:00
commit 5dfec9f833
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug6880 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Don't do reachability testing over IPv6 unless
AuthDirPublishIPv6 is set. Fix for bug 6880.

3
src/or/dirserv.c
View File

@ -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,