Add config option AuthDirPublishIPv6.

Test for config option AuthDirPublishIPv6 == 1 rather than for running
as a bridge authority when deciding whether to care or not about IPv6
OR ports in descriptors.

Implements enhancement #6406.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7020d5b2a3..d12ed8a811 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2468,14 +2468,13 @@ 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 (authdir_mode_bridge(options) &&
+  if (options->AuthDirPublishIPv6 == 1 &&
       !tor_addr_is_null(&ri->ipv6_addr) &&
       (options->AuthDirHasIPv6Connectivity == 0 ||
        node->last_reachable6 >= now - REACHABLE_TIMEOUT)) {
-    /* We're a bridge authority (we're not ready for IPv6 relays in
-       the consensus quite yet).  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.  */
+    /* 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.  */
     tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr);
     rs->ipv6_orport = ri->ipv6_orport;
   }