[or-cvs] r14969: changing v2 network status doesn't require us to recompute a (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-05 05:01:18 -0400 (Thu, 05 Jun 2008)
New Revision: 14969

Modified:
   tor/trunk/src/or/networkstatus.c
Log:
changing v2 network status doesn't require us to recompute
anything about whether enough v3 dir info is here.


Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2008-06-05 08:20:23 UTC (rev 14968)
+++ tor/trunk/src/or/networkstatus.c	2008-06-05 09:01:18 UTC (rev 14969)
@@ -719,7 +719,6 @@
              "downloaded from":"generated for"),
            trusted_dir->description, published);
   networkstatus_v2_list_has_changed = 1;
-  router_dir_info_changed();
 
   smartlist_sort(networkstatus_v2_list,
                  _compare_networkstatus_v2_published_on);
@@ -757,7 +756,6 @@
       dirserv_set_cached_networkstatus_v2(NULL, ns->identity_digest, 0);
     }
     networkstatus_v2_free(ns);
-    router_dir_info_changed();
   }
 
   /* And now go through the directory cache for any cached untrusted
@@ -1538,11 +1536,11 @@
   if (!consensus || dir_version < 3) /* nothing more we should do */
     return;
 
-  /* More routers may be up or down now: we need to recalc whether there's
-   * enough directory info. */
-  router_dir_info_changed();
-
+  /* calls router_dir_info_changed() when it's done -- more routers
+   * might be up or down now, which might affect whether there's enough
+   * directory info. */
   routers_update_status_from_consensus_networkstatus(rl->routers, 0);
+
   SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ri,
                     ri->cache_info.routerlist_index = ri_sl_idx);
   if (rl->old_routers)