1 files changed, 66 insertions, 74 deletions

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f4c4d4889..8f3477a4a 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -98,7 +98,8 @@ static smartlist_t *trusted_dir_servers = NULL;
  * and all fallback directory servers. */
 static smartlist_t *fallback_dir_servers = NULL;
 
-/** List of for a given authority, and download status for latest certificate.
+/** List of certificates for a single authority, and download status for
+ * latest certificate.
  */
 struct cert_list_t {
   /*
@@ -130,16 +131,6 @@ static smartlist_t *warned_nicknames = NULL;
  * download is low. */
 static time_t last_descriptor_download_attempted = 0;
 
-/** When we last computed the weights to use for bandwidths on directory
- * requests, what were the total weighted bandwidth, and our share of that
- * bandwidth?  Used to determine what fraction of directory requests we should
- * expect to see.
- *
- * @{ */
-static uint64_t sl_last_total_weighted_bw = 0,
-  sl_last_weighted_bw_of_me = 0;
-/**@}*/
-
 /** Return the number of directory authorities whose type matches some bit set
  * in <b>type</b>  */
 int
@@ -631,6 +622,37 @@ authority_cert_dl_failed(const char *id_digest,
   }
 }
 
+static const char *BAD_SIGNING_KEYS[] = {
+  "09CD84F751FD6E955E0F8ADB497D5401470D697E", // Expires 2015-01-11 16:26:31
+  "0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26
+  "57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09
+  "87326329007AF781F587AF5B594E540B2B6C7630", // Expires 2014-07-17 11:10:09
+  "98CC82342DE8D298CF99D3F1A396475901E0D38E", // Expires 2014-11-10 13:18:56
+  "9904B52336713A5ADCB13E4FB14DC919E0D45571", // Expires 2014-04-20 20:01:01
+  "9DCD8E3F1DD1597E2AD476BBA28A1A89F3095227", // Expires 2015-01-16 03:52:30
+  "A61682F34B9BB9694AC98491FE1ABBFE61923941", // Expires 2014-06-11 09:25:09
+  "B59F6E99C575113650C99F1C425BA7B20A8C071D", // Expires 2014-07-31 13:22:10
+  "D27178388FA75B96D37FA36E0B015227DDDBDA51", // Expires 2014-08-04 04:01:57
+  NULL,
+};
+
+/** DOCDOC */
+int
+authority_cert_is_blacklisted(const authority_cert_t *cert)
+{
+  char hex_digest[HEX_DIGEST_LEN+1];
+  int i;
+  base16_encode(hex_digest, sizeof(hex_digest),
+                cert->signing_key_digest, sizeof(cert->signing_key_digest));
+
+  for (i = 0; BAD_SIGNING_KEYS[i]; ++i) {
+    if (!strcasecmp(hex_digest, BAD_SIGNING_KEYS[i])) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
 /** Return true iff when we've been getting enough failures when trying to
  * download the certificate with ID digest <b>id_digest</b> that we're willing
  * to start bugging the user about it. */
@@ -679,7 +701,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now)
   char id_digest_str[2*DIGEST_LEN+1];
   char sk_digest_str[2*DIGEST_LEN+1];
 
-  if (should_delay_dir_fetches(get_options()))
+  if (should_delay_dir_fetches(get_options(), NULL))
     return;
 
   pending_cert = fp_pair_map_new();
@@ -1074,8 +1096,11 @@ router_rebuild_store(int flags, desc_store_t *store)
 
   /* Our mmap is now invalid. */
   if (store->mmap) {
-    tor_munmap_file(store->mmap);
+    int res = tor_munmap_file(store->mmap);
     store->mmap = NULL;
+    if (res != 0) {
+      log_warn(LD_FS, "Unable to munmap route store in %s", fname);
+    }
   }
 
   if (replace_file(fname_tmp, fname)<0) {
@@ -1149,9 +1174,16 @@ router_reload_router_list_impl(desc_store_t *store)
 
   fname = get_datadir_fname(store->fname_base);
 
-  if (store->mmap) /* get rid of it first */
-    tor_munmap_file(store->mmap);
-  store->mmap = NULL;
+  if (store->mmap) {
+    /* get rid of it first */
+    int res = tor_munmap_file(store->mmap);
+    store->mmap = NULL;
+    if (res != 0) {
+      log_warn(LD_FS, "Failed to munmap %s", fname);
+      tor_free(fname);
+      return -1;
+    }
+  }
 
   store->mmap = tor_mmap_file(fname);
   if (store->mmap) {
@@ -1268,38 +1300,6 @@ router_pick_directory_server(dirinfo_type_t type, int flags)
   return choice;
 }
 
-/** Try to determine which fraction ofv3 directory requests aimed at
- * caches will be sent to us. Set
- * *<b>v3_share_out</b> to the fraction of v3 protocol shares we
- * expect to see.  Return 0 on success, negative on failure. */
-/* XXXX This function is unused. */
-int
-router_get_my_share_of_directory_requests(double *v3_share_out)
-{
-  const routerinfo_t *me = router_get_my_routerinfo();
-  const routerstatus_t *rs;
-  const int pds_flags = PDS_ALLOW_SELF|PDS_IGNORE_FASCISTFIREWALL;
-  *v3_share_out = 0.0;
-  if (!me)
-    return -1;
-  rs = router_get_consensus_status_by_id(me->cache_info.identity_digest);
-  if (!rs)
-    return -1;
-
-  /* Calling for side effect */
-  /* XXXX This is a bit of a kludge */
-  {
-    sl_last_total_weighted_bw = 0;
-    router_pick_directory_server(V3_DIRINFO, pds_flags);
-    if (sl_last_total_weighted_bw != 0) {
-      *v3_share_out = U64_TO_DBL(sl_last_weighted_bw_of_me) /
-        U64_TO_DBL(sl_last_total_weighted_bw);
-    }
-  }
-
-  return 0;
-}
-
 /** Return the dir_server_t for the directory authority whose identity
  * key hashes to <b>digest</b>, or NULL if no such authority is known.
  */
@@ -1933,8 +1933,7 @@ smartlist_choose_node_by_bandwidth_weights(const smartlist_t *sl,
   if (compute_weighted_bandwidths(sl, rule, &bandwidths) < 0)
     return NULL;
 
-  scale_array_elements_to_u64(bandwidths, smartlist_len(sl),
-                              &sl_last_total_weighted_bw);
+  scale_array_elements_to_u64(bandwidths, smartlist_len(sl), NULL);
 
   {
     int idx = choose_array_element_by_weight(bandwidths,
@@ -2043,7 +2042,7 @@ compute_weighted_bandwidths(const smartlist_t *sl,
 
   // Cycle through smartlist and total the bandwidth.
   SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) {
-    int is_exit = 0, is_guard = 0, is_dir = 0, this_bw = 0, is_me = 0;
+    int is_exit = 0, is_guard = 0, is_dir = 0, this_bw = 0;
     double weight = 1;
     is_exit = node->is_exit && ! node->is_bad_exit;
     is_guard = node->is_possible_guard;
@@ -2066,7 +2065,6 @@ compute_weighted_bandwidths(const smartlist_t *sl,
       /* We can't use this one. */
       continue;
     }
-    is_me = router_digest_is_me(node->identity);
 
     if (is_guard && is_exit) {
       weight = (is_dir ? Wdb*Wd : Wd);
@@ -2085,8 +2083,6 @@ compute_weighted_bandwidths(const smartlist_t *sl,
       weight = 0.0;
 
     bandwidths[node_sl_idx].dbl = weight*this_bw + 0.5;
-    if (is_me)
-      sl_last_weighted_bw_of_me = (uint64_t) bandwidths[node_sl_idx].dbl;
   } SMARTLIST_FOREACH_END(node);
 
   log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "
@@ -2168,7 +2164,6 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl,
   bitarray_t *fast_bits;
   bitarray_t *exit_bits;
   bitarray_t *guard_bits;
-  int me_idx = -1;
 
   // This function does not support WEIGHT_FOR_DIR
   // or WEIGHT_FOR_MID
@@ -2202,9 +2197,6 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl,
     uint32_t this_bw = 0;
     i = node_sl_idx;
 
-    if (router_digest_is_me(node->identity))
-      me_idx = node_sl_idx;
-
     is_exit = node->is_exit;
     is_guard = node->is_possible_guard;
     if (node->rs) {
@@ -2308,7 +2300,6 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl,
     if (guard_weight <= 0.0)
       guard_weight = 0.0;
 
-    sl_last_weighted_bw_of_me = 0;
     for (i=0; i < (unsigned)smartlist_len(sl); i++) {
       tor_assert(bandwidths[i].dbl >= 0.0);
 
@@ -2320,9 +2311,6 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl,
         bandwidths[i].dbl *= guard_weight;
       else if (is_exit)
         bandwidths[i].dbl *= exit_weight;
-
-      if (i == (unsigned) me_idx)
-        sl_last_weighted_bw_of_me = (uint64_t) bandwidths[i].dbl;
     }
   }
 
@@ -2341,8 +2329,7 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl,
             guard_weight, (int)(rule == WEIGHT_FOR_GUARD));
 #endif
 
-  scale_array_elements_to_u64(bandwidths, smartlist_len(sl),
-                              &sl_last_total_weighted_bw);
+  scale_array_elements_to_u64(bandwidths, smartlist_len(sl), NULL);
 
   {
     int idx = choose_array_element_by_weight(bandwidths,
@@ -2753,7 +2740,6 @@ routerinfo_free(routerinfo_t *router)
     return;
 
   tor_free(router->cache_info.signed_descriptor_body);
-  tor_free(router->address);
   tor_free(router->nickname);
   tor_free(router->platform);
   tor_free(router->contact_info);
@@ -2839,10 +2825,18 @@ routerlist_free(routerlist_t *rl)
                     signed_descriptor_free(sd));
   smartlist_free(rl->routers);
   smartlist_free(rl->old_routers);
-  if (routerlist->desc_store.mmap)
-    tor_munmap_file(routerlist->desc_store.mmap);
-  if (routerlist->extrainfo_store.mmap)
-    tor_munmap_file(routerlist->extrainfo_store.mmap);
+  if (rl->desc_store.mmap) {
+    int res = tor_munmap_file(routerlist->desc_store.mmap);
+    if (res != 0) {
+      log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap");
+    }
+  }
+  if (rl->extrainfo_store.mmap) {
+    int res = tor_munmap_file(routerlist->extrainfo_store.mmap);
+    if (res != 0) {
+      log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap");
+    }
+  }
   tor_free(rl);
 
   router_dir_info_changed();
@@ -3459,7 +3453,6 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
         signed_desc_append_to_journal(&router->cache_info,
                                       &routerlist->desc_store);
       }
-      directory_set_dirty();
       *msg = authdir_believes_valid ? "Valid server updated" :
         ("Invalid server updated. (This dirserver is marking your "
          "server as unapproved.)");
@@ -3481,7 +3474,6 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
     signed_desc_append_to_journal(&router->cache_info,
                                   &routerlist->desc_store);
   }
-  directory_set_dirty();
   return ROUTER_ADDED_SUCCESSFULLY;
 }
 
@@ -4637,7 +4629,7 @@ void
 update_router_descriptor_downloads(time_t now)
 {
   const or_options_t *options = get_options();
-  if (should_delay_dir_fetches(options))
+  if (should_delay_dir_fetches(options, NULL))
     return;
   if (!we_fetch_router_descriptors(options))
     return;
@@ -4658,7 +4650,7 @@ update_extrainfo_downloads(time_t now)
   int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0;
   if (! options->DownloadExtraInfo)
     return;
-  if (should_delay_dir_fetches(options))
+  if (should_delay_dir_fetches(options, NULL))
     return;
   if (!router_have_minimum_dir_info())
     return;
@@ -4764,7 +4756,7 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
   }
 
   /* If any key fields differ, they're different. */
-  if (strcasecmp(r1->address, r2->address) ||
+  if (r1->addr != r2->addr ||
       strcasecmp(r1->nickname, r2->nickname) ||
       r1->or_port != r2->or_port ||
       !tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) ||