r15964@catbus: nickm | 2007-10-19 12:43:49 -0400

 Sort out that need_to_mirror is for routerstatuses in v2 networkstatuses only.

svn:r12050

diff --git a/doc/TODO b/doc/TODO
index b9e3a35e9b1b4701723e72e19d0c0e43613656f9..4102edec4687d70c3911dfd5bdb9b89a0adec51e 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -58,7 +58,7 @@ Things we'd like to do in 0.2.0.x:
       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 @@ Things we'd like to do in 0.2.0.x:
         - 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...

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index b1afddfb8ae4f68d33a338e463fae404b287e2f9..154d82676914219b347d10eb1f2b85819325799f 100644 (file)
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -896,7 +896,6 @@ networkstatus_copy_old_consensus_info(networkstatus_vote_t *new_c,
     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));
     }
   });

diff --git a/src/or/or.h b/src/or/or.h
index 91c64ea89b2570d7ca52b84678d08bc9647a20db..bbf18bdb5b87335d40aea1ba2017c68c80e48964 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1250,7 +1250,7 @@ typedef struct routerstatus_t {
   /** 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