[or-cvs] r11984: Only drop routers for not appearing in the consensus if thei (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-16 10:25:14 -0400 (Tue, 16 Oct 2007)
New Revision: 11984

Modified:
   tor/trunk/
   tor/trunk/src/or/routerlist.c
Log:
 r15848 at catbus:  nickm | 2007-10-16 10:17:02 -0400
 Only drop routers for not appearing in the consensus if their purpose is GENERAL.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15848] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-10-16 14:25:13 UTC (rev 11983)
+++ tor/trunk/src/or/routerlist.c	2007-10-16 14:25:14 UTC (rev 11984)
@@ -2667,11 +2667,10 @@
     }
   }
 
-  /*XXXX020 I had suspicions about whether this was correct, but now I
-   * can't remember why. :( -NM */
-  if (consensus && !in_consensus && !authdir_mode(get_options())) {
-    /* If it's not listed in the consensus, then don't consider replacing
-     * the latest router with it. */
+  if (router->purpose == ROUTER_PURPOSE_GENERAL &&
+      consensus && !in_consensus && !authdir_mode(get_options())) {
+    /* If it's a general router not listed in the consensus, then don't
+     * consider replacing the latest router with it. */
     if (!from_cache && should_cache_old_descriptors())
       signed_desc_append_to_journal(&router->cache_info,
                                     router_get_store(routerlist, router));