[tor-commits] [tor/release-0.4.5] relay: Avoid log reachability test for bandwidth test circuit

[dgoulet at torproject.org]

commit e74f168bb4df0b06d4f224421570e160cfcdb7a9
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Dec 8 11:58:10 2020 -0500

    relay: Avoid log reachability test for bandwidth test circuit
    
    Fixes #40205
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 changes/ticket40205          | 5 +++++
 src/feature/relay/selftest.c | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/changes/ticket40205 b/changes/ticket40205
new file mode 100644
index 0000000000..e21c7fab7c
--- /dev/null
+++ 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
index b711c94eb6..86b1533be1 100644
--- 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|