tor

commit dc4f3a219fd5c30f669f10fc72a666d2c17d6cfb
parent c370b4a049bd99e45b2dcfd4b0824901234f8b17
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 25 Jun 2020 10:13:04 -0400

Merge branch 'tor-github/pr/1948'

Diffstat:
A
changes/feature34068
 | 
3
+++
M
src/feature/relay/selftest.c
 | 
7
++++---

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/feature34068 b/changes/feature34068
@@ -0,0 +1,3 @@
+  o Minor features (controller, IPv6):
+    - Tor relays now try to report to the controller when they are launching
+      an IPv6 self-test. Closes ticket 34068.
diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c
@@ -353,9 +353,7 @@ inform_testing_reachability(void)
    * start reachability tests, or fail to log after we actually started
    * reachability tests.
    *
-   * After we separate the IPv4 and IPv6 reachability flags in #34067, tor
-   * will test any IPv6 address that it discovers after launching reachability
-   * checks. We'll deal with late disabled IPv6 ORPorts and IPv4 DirPorts, and
+   * We'll deal with late disabled IPv6 ORPorts and IPv4 DirPorts, and
    * extra or skipped log messages in #34137.
    */
   const routerinfo_t *me = router_get_my_routerinfo();
@@ -374,6 +372,9 @@ inform_testing_reachability(void)
   if (has_ipv6) {
     strlcpy(ipv6_or_buf, fmt_addrport(&me->ipv6_addr, me->ipv6_orport),
             sizeof(ipv6_or_buf));
+    control_event_server_status(LOG_NOTICE,
+                                "CHECKING_REACHABILITY ORADDRESS=%s",
+                                ipv6_or_buf);
     /* We'll add an IPv6 control event in #34068. */
   }
   /* IPv4 DirPort (there are no advertised IPv6 DirPorts) */