Merge remote-tracking branch 'dgoulet/ticket32822_045_01'

changes/ticket32822

@@ -0,0 +1,5 @@
+  o Minor features (directory authorities, IPv6):
+    - Make authorities add their IPv6 ORPort (if any) to the trusted dir
+      servers list. Authorities currently add themselves to the trusted dir
+      servers list, but they only add their IPv4 address and ports to the list.
+      Closes ticket 32822.

src/feature/nodelist/dirlist.c

@@ -294,7 +294,7 @@ dir_server_new(int is_authority,
   ent->is_authority = is_authority;
   ent->type = type;
   ent->weight = weight;
-  if (addrport_ipv6) {
+  if (addrport_ipv6 && tor_addr_port_is_valid_ap(addrport_ipv6, 0)) {
     if (tor_addr_family(&addrport_ipv6->addr) != AF_INET6) {
       log_warn(LD_BUG, "Hey, I got a non-ipv6 addr as addrport_ipv6.");
       tor_addr_make_unspec(&ent->ipv6_addr);

src/feature/relay/router.c

@@ -1148,10 +1148,12 @@ init_keys(void)
 
   ds = router_get_trusteddirserver_by_digest(digest);
   if (!ds) {
+    tor_addr_port_t ipv6_orport;
+    router_get_advertised_ipv6_or_ap(options, &ipv6_orport);
     ds = trusted_dir_server_new(options->Nickname, NULL,
                                 router_get_advertised_dir_port(options, 0),
                                 router_get_advertised_or_port(options),
-                                NULL,
+                                &ipv6_orport,
                                 digest,
                                 v3_digest,
                                 type, 0.0);

src/test/conf_examples/dirauth_3/error_no_dirauth

@@ -0,0 +1 @@
+This tor was built with dirauth mode disabled.

src/test/conf_examples/dirauth_3/error_no_dirauth_relay

@@ -0,0 +1 @@
+This tor was built with dirauth mode disabled.

src/test/conf_examples/dirauth_3/expected

@@ -0,0 +1,9 @@
+Address 192.0.2.1
+AuthoritativeDirectory 1
+ContactInfo tor_parse_test@example.net
+DirPort 192.0.2.1:2
+DownloadExtraInfo 1
+Nickname Unnamed
+ORPort 192.0.2.1:1
+ORPort [2001:DB8::1]:3
+V3AuthoritativeDirectory 1

src/test/conf_examples/dirauth_3/expected_log

@@ -0,0 +1 @@
+Read configuration file .*dirauth_3[./]*torrc

src/test/conf_examples/dirauth_3/torrc

@@ -0,0 +1,13 @@
+# Authority with IPv6 address
+
+AuthoritativeDirectory 1
+V3AuthoritativeDirectory 1
+
+ContactInfo tor_parse_test@example.net
+
+Address 192.0.2.1
+
+ORPort 192.0.2.1:1
+DirPort 192.0.2.1:2
+
+ORPort [2001:DB8::1]:3