Commit 347f87ae authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'maint-0.4.4'

parents c591a0d2 5a1918d7

changes/bug40083

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/feature/relay/relay_periodic.c

+4 −1
Original line number Diff line number Diff line
@@ -154,6 +154,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. */
@@ -164,7 +167,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