]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
use the new function here too
authorRoger Dingledine <arma@torproject.org>
Wed, 13 Apr 2016 05:30:29 +0000 (01:30 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 9 May 2016 18:40:54 +0000 (14:40 -0400)
src/or/networkstatus.c

index e90603e16b1876098a98758f70aeb8913a59c1ec..4a9b36771b0d1089044308289f6fb6f355b10786 100644 (file)
@@ -865,21 +865,8 @@ update_consensus_networkstatus_downloads(time_t now)
         && i == usable_consensus_flavor()) {
 
       /* Check if we're already downloading a usable consensus */
-      int consens_conn_count =
-        connection_dir_count_by_purpose_and_resource(
-                                                   DIR_PURPOSE_FETCH_CONSENSUS,
-                                                   resource);
-      int connect_consens_conn_count =
-        connection_dir_count_by_purpose_resource_and_state(
-                                                   DIR_PURPOSE_FETCH_CONSENSUS,
-                                                   resource,
-                                                   DIR_CONN_STATE_CONNECTING);
-
-      /* If not all connections are "connecting", then some are
-       * downloading. We want to have at most one downloading at a time. */
-      if (connect_consens_conn_count < consens_conn_count) {
+      if (networkstatus_consensus_is_already_downloading(resource))
         continue;
-      }
 
       /* Make multiple connections for a bootstrap consensus download. */
       update_consensus_bootstrap_multiple_downloads(now, options,