diff options
| -rw-r--r-- | doc/tor.1.txt | 15 | ||||
| -rw-r--r-- | src/or/config.c | 1 | ||||
| -rw-r--r-- | src/or/dirserv.c | 12 | ||||
| -rw-r--r-- | src/or/or.h | 1 |
4 files changed, 9 insertions, 20 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5e76105d2..93bde59d3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1749,17 +1749,10 @@ DIRECTORY AUTHORITY SERVER OPTIONS **AuthDirHasIPv6Connectivity** **0**|**1**|**auto**:: - Authoritative directories only. When set to 0, OR ports with an - IPv6 address are being accepted without reachability testing. - When set to 1, IPv6 OR ports are being tested just like IPv4 OR - ports. When set to auto, Tor tries to find out if the authority - relay has IPv6 connectivity or not. (Default: auto) - -**AuthDirPublishIPv6** **0**|**1**:: - - Authoritative directories only. When set to 0, Tor will not - include IPv6 OR ports in votes. When set to 1, Tor will vote for - IPv6 OR ports. (Default: 0). + Authoritative directories only. When set to 1, IPv6 OR ports are + being tested for reachability and voted on. When set to auto, Tor + tries to find out if the authority relay has IPv6 connectivity or + not. (Default: auto) HIDDEN SERVICE OPTIONS ---------------------- diff --git a/src/or/config.c b/src/or/config.c index f21016d48..8c41c7f53 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -205,7 +205,6 @@ static config_var_t _option_vars[] = { V(AuthDirMaxServersPerAddr, UINT, "2"), V(AuthDirMaxServersPerAuthAddr,UINT, "5"), V(AuthDirHasIPv6Connectivity, AUTOBOOL, "auto"), - V(AuthDirPublishIPv6, BOOL, "0"), VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"), V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f229e5995..086db032a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1017,7 +1017,7 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now) IPv6 OR port since that'd kill all dual stack relays until a majority of the dir auths have IPv6 connectivity. */ answer = (now < node->last_reachable + REACHABLE_TIMEOUT && - (options->AuthDirHasIPv6Connectivity == 0 || + (options->AuthDirHasIPv6Connectivity != 1 || tor_addr_is_null(&router->ipv6_addr) || now < node->last_reachable6 + REACHABLE_TIMEOUT)); } @@ -2495,13 +2495,11 @@ 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 (options->AuthDirPublishIPv6 == 1 && + if (options->AuthDirHasIPv6Connectivity == 1 && !tor_addr_is_null(&ri->ipv6_addr) && - (options->AuthDirHasIPv6Connectivity == 0 || - node->last_reachable6 >= now - REACHABLE_TIMEOUT)) { - /* We're configured for publishing IPv6 OR ports. There's an IPv6 - OR port and it's reachable (or we know that we're not on IPv6) - so copy it to the routerstatus. */ + node->last_reachable6 >= now - REACHABLE_TIMEOUT) { + /* We're configured as having IPv6 connectivity. There's an IPv6 + OR port and it's reachable so copy it to the routerstatus. */ tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); rs->ipv6_orport = ri->ipv6_orport; } diff --git a/src/or/or.h b/src/or/or.h index 4bf99e2ea..0b321fde0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3324,7 +3324,6 @@ typedef struct { * number of servers per IP address shared * with an authority. */ int AuthDirHasIPv6Connectivity; /**< Autoboolean: are we on IPv6? */ - int AuthDirPublishIPv6; /**< Boolean: should we list IPv6 OR ports? */ /** If non-zero, always vote the Fast flag for any relay advertising * this amount of capacity or more. */ |