[or-cvs] r8513: router_set_networkstatus() gets a list of status documents w (in tor/trunk: . src/or)

[weasel@xxxxxxxx]

Author: weasel
Date: 2006-09-28 18:58:58 -0400 (Thu, 28 Sep 2006)
New Revision: 8513

Modified:
   tor/trunk/
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/routerlist.c
Log:
 r9770@danube:  weasel | 2006-09-15 07:20:05 +0200
 router_set_networkstatus() gets a list of status documents we asked for from
 connection_dir_client_reached_eof().  However, as a cache we (sometimes?) just
 ask for "all".  router_set_networkstatus() would freak out over that, meaning
 it would log a warning and drop the status document instead of caching it
 as it is supposed to.  Now we let router_set_networkstatus() know if the
 data comes from an all-request so it can do the right thing.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /local/or/tor/trunk [r9770] on 17f730b7-d419-0410-b50f-85ee4b70197a

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2006-09-28 22:58:06 UTC (rev 8512)
+++ tor/trunk/src/or/directory.c	2006-09-28 22:58:58 UTC (rev 8513)
@@ -1025,8 +1025,8 @@
     } else {
       /* Can we even end up here? -- weasel*/
       source = NS_FROM_DIR_BY_FP;
-      log_warn(LD_BUG, "we received a networkstatus but we didn't ask"
-                       "for it by fp/ or ask for all.");
+      log_warn(LD_BUG, "we received a networkstatus but we did neither ask"
+                       "for it by fp/ nor did we ask for all.");
     }
     cp = body;
     while (*cp) {

Modified: tor/trunk/src/or/or.h
===================================================================

Modified: tor/trunk/src/or/routerlist.c
===================================================================