tor

commit 6e83a520776e503974e4020a9ff011eb6bef9d39
parent f280c171e261dfe6fe9f39f715b4a40254982d58
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue,  8 Dec 2020 14:51:43 -0500

Merge branch 'maint-0.4.5'

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

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/changes/ticket40205 b/changes/ticket40205
@@ -0,0 +1,5 @@
+  o Minor bugfixes (relay, logging, reachability):
+    - When launching bandwidth testing circuit, don't log notice that we are
+      doing a reachability test. Furthermore, avoid to trigger a
+      "CHECKING_REACHABILITY" control event. Fixes bug 40205; bugfix on
+      0.4.5.1-alpha.
diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c
@@ -274,7 +274,12 @@ router_do_orport_reachability_checks(const routerinfo_t *me,
              !orport_reachable ? "reachability" : "bandwidth",
              family_name, fmt_addrport_ap(ap));
 
-    inform_testing_reachability(&ap->addr, ap->port, false);
+    if (!orport_reachable) {
+      /* Only log if we are actually doing a reachability test to learn if our
+       * ORPort is reachable. Else, this prints a log notice if we are simply
+       * opening a bandwidth testing circuit even do we are reachable. */
+      inform_testing_reachability(&ap->addr, ap->port, false);
+    }
 
     circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei,
                                   CIRCLAUNCH_NEED_CAPACITY|