[tor-commits] [tor/maint-0.2.8] simplify more -- we only call these funcs when bootstrapping

[nickm at torproject.org]

commit d5a96286c2877ab56455ea5183d1df2e39453cde
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Apr 14 02:29:12 2016 -0400

    simplify more -- we only call these funcs when bootstrapping
---
 src/or/networkstatus.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 3b38c07..6b40852 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -121,8 +121,7 @@ static int have_warned_about_new_version = 0;
 static void routerstatus_list_update_named_server_map(void);
 static void update_consensus_bootstrap_multiple_downloads(
                                                   time_t now,
-                                                  const or_options_t *options,
-                                                  int we_are_bootstrapping);
+                                                  const or_options_t *options);
 
 /** Forget that we've warned about anything networkstatus-related, so we will
  * give fresh warnings if the same behavior happens again. */
@@ -869,8 +868,7 @@ update_consensus_networkstatus_downloads(time_t now)
         continue;
 
       /* Make multiple connections for a bootstrap consensus download. */
-      update_consensus_bootstrap_multiple_downloads(now, options,
-                                                    we_are_bootstrapping);
+      update_consensus_bootstrap_multiple_downloads(now, options);
     } else {
       /* Check if we failed downloading a consensus too recently */
       int max_dl_tries = consensus_max_download_tries(options,
@@ -909,12 +907,10 @@ static void
 update_consensus_bootstrap_attempt_downloads(
                                       time_t now,
                                       const or_options_t *options,
-                                      int we_are_bootstrapping,
                                       download_status_t *dls,
                                       download_want_authority_t want_authority)
 {
-  int max_dl_tries = consensus_max_download_tries(options,
-                                                  we_are_bootstrapping);
+  int max_dl_tries = consensus_max_download_tries(options, 1);
   const char *resource = networkstatus_get_flavor_name(
                                                   usable_consensus_flavor());
 
@@ -947,8 +943,7 @@ update_consensus_bootstrap_attempt_downloads(
  */
 static void
 update_consensus_bootstrap_multiple_downloads(time_t now,
-                                              const or_options_t *options,
-                                              int we_are_bootstrapping)
+                                              const or_options_t *options)
 {
   const int usable_flavor = usable_consensus_flavor();
 
@@ -957,12 +952,6 @@ update_consensus_bootstrap_multiple_downloads(time_t now,
     return;
   }
 
-  /* If we've managed to validate a usable consensus, don't make additional
-   * connections. */
-  if (!we_are_bootstrapping) {
-    return;
-  }
-
   /* Launch concurrent consensus download attempt(s) based on the mirror and
    * authority schedules. Try the mirror first - this makes it slightly more
    * likely that we'll connect to the fallback first, and then end the
@@ -981,8 +970,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now,
 
     if (!check_consensus_waiting_for_certs(usable_flavor, now, dls_f)) {
       /* During bootstrap, DL_WANT_ANY_DIRSERVER means "use fallbacks". */
-      update_consensus_bootstrap_attempt_downloads(now, options,
-                                                   we_are_bootstrapping, dls_f,
+      update_consensus_bootstrap_attempt_downloads(now, options, dls_f,
                                                    DL_WANT_ANY_DIRSERVER);
     }
   }
@@ -992,8 +980,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now,
     &consensus_bootstrap_dl_status[CONSENSUS_BOOTSTRAP_SOURCE_AUTHORITY];
 
   if (!check_consensus_waiting_for_certs(usable_flavor, now, dls_a)) {
-    update_consensus_bootstrap_attempt_downloads(now, options,
-                                                 we_are_bootstrapping, dls_a,
+    update_consensus_bootstrap_attempt_downloads(now, options, dls_a,
                                                  DL_WANT_AUTHORITY);
   }
 }