[or-cvs] r17886: {tor} Fix an xxx021: do not remove routerinfos as too old and unli (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2009-01-04 14:47:12 -0500 (Sun, 04 Jan 2009)
New Revision: 17886

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
Fix an xxx021: do not remove routerinfos as too old and unlisted unless we have a consensus.  Backport candidate.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-01-04 19:30:32 UTC (rev 17885)
+++ tor/trunk/ChangeLog	2009-01-04 19:47:12 UTC (rev 17886)
@@ -29,6 +29,8 @@
     - If we are retrying something slowly over and over, do not
       automatically give up after the 254th failure.  Bugfix on
       0.2.1.9-alpha.
+    - Do not remove routers as too old if we do not have any consensus
+      document.  Bugfix on 0.2.0.7-alpha.
 
   o Deprecated and removed features:
     - The old "tor --version --version" command, which would spit out the

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2009-01-04 19:30:32 UTC (rev 17885)
+++ tor/trunk/src/or/routerlist.c	2009-01-04 19:47:12 UTC (rev 17886)
@@ -3232,6 +3232,7 @@
   int caches = directory_caches_dir_info(get_options());
   const networkstatus_t *consensus = networkstatus_get_latest_consensus();
   const smartlist_t *networkstatus_v2_list = networkstatus_get_v2_list();
+  int have_enough_v2;
 
   trusted_dirs_remove_old_certs();
 
@@ -3286,14 +3287,17 @@
           digestset_add(retain, rs->descriptor_digest));
   }
 
-  /* If we have nearly as many networkstatuses as we want, we should consider
-   * pruning current routers that are too old and that nobody recommends.  (If
-   * we don't have enough networkstatuses, then we should get more before we
-   * decide to kill routers.) */
-  /* XXX021 we don't check if we have a v3 consensus, do we? should we? -RD */
-  if (!caches ||
-      (networkstatus_v2_list &&
-       smartlist_len(networkstatus_v2_list) > get_n_v2_authorities() / 2)) {
+  /* If we have a consensus, and nearly as many v2 networkstatuses as we want,
+   * we should consider pruning current routers that are too old and that
+   * nobody recommends.  (If we don't have a consensus or enough v2
+   * networkstatuses, then we should get more before we decide to kill
+   * routers.) */
+  /* we set this to true iff we don't care about v2 info, or we have enough. */
+  have_enough_v2 = !caches ||
+    (networkstatus_v2_list &&
+     smartlist_len(networkstatus_v2_list) > get_n_v2_authorities() / 2);
+
+  if (have_enough_v2 && consensus) {
     cutoff = now - ROUTER_MAX_AGE;
     /* Remove too-old unrecommended members of routerlist->routers. */
     for (i = 0; i < smartlist_len(routerlist->routers); ++i) {