[or-cvs] r12050: Sort out that need_to_mirror is for routerstatuses in v2 net (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-19 14:56:21 -0400 (Fri, 19 Oct 2007)
New Revision: 12050

Modified:
   tor/trunk/
   tor/trunk/doc/TODO
   tor/trunk/src/or/networkstatus.c
   tor/trunk/src/or/or.h
Log:
 r15964 at catbus:  nickm | 2007-10-19 12:43:49 -0400
 Sort out that need_to_mirror is for routerstatuses in v2 networkstatuses only.



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

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-10-19 16:41:32 UTC (rev 12049)
+++ tor/trunk/doc/TODO	2007-10-19 18:56:21 UTC (rev 12050)
@@ -58,7 +58,7 @@
       out and download the ancient history of the universe.
     o List IP addresses in certificates?
     o Make the address in votes be an actual IP address.
-    - Change 'mismatched digest' message to first check timestamps instead.
+    o Change 'mismatched digest' message to first check timestamps instead.
 
   - Proposals:
     . 101: Voting on the Tor Directory System (plus 103)
@@ -78,12 +78,12 @@
         - Code to retry consensus download if we got one we already have.
         - Use if-modified-since on consensus download
         - Use if-modified-since on certificate download
-        - Enable for non-caches
+        o Enable for non-caches
       - Code to use v3 networkstatus documents once clients are
         fetching them
-        - Implement.
+        o Implement.
         - Fix all XXXX020s.
-        - Sort out need_to_mirror
+        o Sort out need_to_mirror
         - Work hard to make sure clients never look at v2 networkstatus docs.
         - Check in old_routers before fetching a router status. You never
           know if we'll flap...

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-10-19 16:41:32 UTC (rev 12049)
+++ tor/trunk/src/or/networkstatus.c	2007-10-19 18:56:21 UTC (rev 12050)
@@ -896,7 +896,6 @@
     if (!memcmp(rs_old->descriptor_digest, rs_new->descriptor_digest,
                 DIGEST_LEN)) {
       /* And the same descriptor too! */
-      rs_new->need_to_mirror = rs_old->need_to_mirror; /*XXXX020 NM ????? */
       memcpy(&rs_new->dl_status, &rs_old->dl_status,sizeof(download_status_t));
     }
   });

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-10-19 16:41:32 UTC (rev 12049)
+++ tor/trunk/src/or/or.h	2007-10-19 18:56:21 UTC (rev 12050)
@@ -1250,7 +1250,7 @@
   /** True if we, as a directory mirror, want to download the corresponding
    * routerinfo from the authority who gave us this routerstatus.  (That is,
    * if we don't have the routerinfo, and if we haven't already tried to get it
-   * from this authority.)
+   * from this authority.)  Applies in v2 networkstatus document only.
    */
   unsigned int need_to_mirror:1;
   unsigned int name_lookup_warned:1; /**< Have we warned the user for referring