tor

commit 08de260682ad32a6410f9d26d58020882d1dd859
parent 4e684c8695e4654d841644fe9c13e70eabd191b9
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  4 Aug 2020 13:10:16 -0400

Merge branch 'bug40083_035' into bug40083_042

Fixes conflicts due to code movement.

Diffstat:
A
changes/bug40083
 | 
5
+++++
M
src/feature/relay/relay_periodic.c
 | 
5
++++-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/bug40083 b/changes/bug40083
@@ -0,0 +1,5 @@
+  o Minor bugfixes (relay, self-testing):
+    - When starting up as a relay, if we haven't been able to verify that
+      we're reachable, only launch reachability tests at most once a minute.
+      Previously, we had been launching tests up to once a second, which
+      was needlessly noisy. Fixes bug 40083; bugfix on 0.2.8.1-alpha.
diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c
@@ -150,6 +150,9 @@ check_for_reachability_bw_callback(time_t now, const or_options_t *options)
 {
   /* XXXX This whole thing was stuck in the middle of what is now
    * XXXX check_descriptor_callback.  I'm not sure it's right. */
+  /** How often should we consider launching reachability tests in our first
+   * TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT seconds? */
+#define EARLY_CHECK_REACHABILITY_INTERVAL (60)
 
   /* also, check religiously for reachability, if it's within the first
    * 20 minutes of our uptime. */
@@ -160,7 +163,7 @@ check_for_reachability_bw_callback(time_t now, const or_options_t *options)
       router_do_reachability_checks(1, dirport_reachability_count==0);
       if (++dirport_reachability_count > 5)
         dirport_reachability_count = 0;
-      return 1;
+      return EARLY_CHECK_REACHABILITY_INTERVAL;
     } else {
       /* If we haven't checked for 12 hours and our bandwidth estimate is
        * low, do another bandwidth test. This is especially important for