[or-cvs] r9389: Backport: when we do not have enough networkstatuses to laun (in tor/branches/tor-0_1_1-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-01-22 15:57:29 -0500 (Mon, 22 Jan 2007)
New Revision: 9389

Modified:
   tor/branches/tor-0_1_1-patches/
   tor/branches/tor-0_1_1-patches/ChangeLog
   tor/branches/tor-0_1_1-patches/src/or/routerlist.c
Log:
 r9724 at catbus:  nickm | 2007-01-22 15:56:20 -0500
 Backport: when we do not have enough networkstatuses to launch router requests, do not launch router requests.



Property changes on: tor/branches/tor-0_1_1-patches
___________________________________________________________________
 svk:merge ticket from /tor/011 [r9724] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_1-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_1-patches/ChangeLog	2007-01-22 20:57:26 UTC (rev 9388)
+++ tor/branches/tor-0_1_1-patches/ChangeLog	2007-01-22 20:57:29 UTC (rev 9389)
@@ -1,3 +1,11 @@
+Changes in version 0.1.1.27 - 2007-??-??
+  o Minor bugfixes
+    - Don't launch requests for descriptors unless we have networkstatuses
+      from enough authorities.  This delays the first download slightly under
+      pathological circumstances, but can prevent us from downloading a bunch
+      of descriptors we don't need.
+
+
 Changes in version 0.1.1.26 - 2006-12-14
   o Security bugfixes:
     - Stop sending the HttpProxyAuthenticator string to directory

Modified: tor/branches/tor-0_1_1-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/routerlist.c	2007-01-22 20:57:26 UTC (rev 9388)
+++ tor/branches/tor-0_1_1-patches/src/or/routerlist.c	2007-01-22 20:57:29 UTC (rev 9389)
@@ -3452,6 +3452,7 @@
   if (networkstatus_list && smartlist_len(networkstatus_list) < 2) {
     log_info(LD_DIR,
              "Not enough networkstatus documents to launch requests.");
+    return;
   }
 
   downloadable = router_list_client_downloadable();