[or-cvs] r12430: Don't stop fetching descriptors when FetchUselessDescriptors (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-11-07 23:19:51 -0500 (Wed, 07 Nov 2007)
New Revision: 12430

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
Don't stop fetching descriptors when FetchUselessDescriptors is
set, even if we stop asking for circuits. Bugfix on 0.1.2.x;
reported by tup and ioerror.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-08 04:14:02 UTC (rev 12429)
+++ tor/trunk/ChangeLog	2007-11-08 04:19:51 UTC (rev 12430)
@@ -97,6 +97,9 @@
   o Minor bugfixes:
     - Refuse to start if both ORPort and UseBridges are set. Bugfix
       on 0.2.0.x.
+    - Don't stop fetching descriptors when FetchUselessDescriptors is
+      set, even if we stop asking for circuits. Bugfix on 0.1.2.x;
+      reported by tup and ioerror.
     - Better log message on vote from unknown authority.
     - Don't log "Launching 0 request for 0 router".
 

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-11-08 04:14:02 UTC (rev 12429)
+++ tor/trunk/src/or/routerlist.c	2007-11-08 04:19:51 UTC (rev 12430)
@@ -3753,10 +3753,9 @@
   int n_delayed=0, n_have=0, n_would_reject=0, n_wouldnt_use=0,
     n_inprogress=0, n_in_oldrouters=0;
 
-  if (!dirserver) {
-    if (rep_hist_circbuilding_dormant(now))
-      goto done;
-  }
+  if (!dirserver && !options->FetchUselessDescriptors &&
+      rep_hist_circbuilding_dormant(now))
+    goto done;
   if (!consensus)
     goto done;