[or-cvs] r9599: Note a problematic warning. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-02-17 18:49:50 -0500 (Sat, 17 Feb 2007)
New Revision: 9599

Modified:
   tor/trunk/
   tor/trunk/src/or/routerlist.c
Log:
 r11844 at catbus:  nickm | 2007-02-17 16:53:42 -0500
 Note a problematic warning.



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

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-02-17 02:38:58 UTC (rev 9598)
+++ tor/trunk/src/or/routerlist.c	2007-02-17 23:49:50 UTC (rev 9599)
@@ -1909,6 +1909,14 @@
   } else if (from_fetch) {
     /* Only check the descriptor digest against the network statuses when
      * we are receiving in response to a fetch. */
+    /* XXXX012 This warning seems to happen fairly regularly when we download
+     * router information based on an old networkstatus, then discard the
+     * networkstatus between requesting the routers and getting the reply.
+     * That's no good at all.  I think we should switch to a behavior where we
+     * don't download a descriptor unless it's in a _recent_ networkstatus;
+     * also, we should drop this warning in (hopefully less likely) case where
+     * we decide we don't want a descriptor after we start downloading
+     * it. -NM */
     if (!signed_desc_digest_is_recognized(&router->cache_info)) {
       log_warn(LD_DIR, "Dropping unrecognized descriptor for router '%s'",
                router->nickname);
@@ -1992,7 +2000,7 @@
     }
   }
 
-  /* We haven't seen a router with this name before.  Add it to the end of
+  /* We haven't seen a router with this idntity before.  Add it to the end of
    * the list. */
   routerlist_insert(routerlist, router);
   if (!from_cache)