[or-cvs] r14317: Update last_listed_as_valid_until for new routers based on v (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-04-08 13:06:38 -0400 (Tue, 08 Apr 2008)
New Revision: 14317

Modified:
   tor/trunk/
   tor/trunk/src/or/networkstatus.c
Log:
 r19231@catbus:  nickm | 2008-04-07 12:45:58 -0400
 Update last_listed_as_valid_until for new routers based on v2 networkstatus as well as consensus networkstatus.



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

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2008-04-08 09:01:28 UTC (rev 14316)
+++ tor/trunk/src/or/networkstatus.c	2008-04-08 17:06:38 UTC (rev 14317)
@@ -1688,6 +1688,8 @@
   networkstatus_t *ns = current_consensus;
   if (!ns || !smartlist_len(ns->routerstatus_list))
     return;
+  if (!networkstatus_v2_list)
+    networkstatus_v2_list = smartlist_create();
 
   routers_sort_by_identity(routers);
 
@@ -1704,6 +1706,7 @@
         router_clear_status_flags(router);
     }
   }) {
+    /* We have a routersatus for this router. */
     const char *digest = router->cache_info.identity_digest;
 
     ds = router_get_trusteddirserver_by_digest(digest);
@@ -1714,7 +1717,7 @@
       else
         router->is_named = 0;
     }
-    /*XXXX021 this should always be true! */
+    /* Is it the same descriptor, or only the same identity? */
     if (!memcmp(router->cache_info.signed_descriptor_digest,
                 rs->descriptor_digest, DIGEST_LEN)) {
       if (ns->valid_until > router->cache_info.last_listed_as_valid_until)
@@ -1741,6 +1744,23 @@
     }
   } SMARTLIST_FOREACH_JOIN_END(rs, router);
 
+  /* Now update last_listed_as_valid_until from v2 networkstatuses. */
+  /* XXXX021 If this is slow, we need to rethink the code. */
+  SMARTLIST_FOREACH(networkstatus_v2_list, networkstatus_v2_t *, ns, {
+    time_t live_until = ns->published_on + V2_NETWORKSTATUS_LIFETIME;
+    SMARTLIST_FOREACH_JOIN(ns->entries, routerstatus_t *, rs,
+                         routers, routerinfo_t *, ri,
+                         memcmp(rs->identity_digest,
+                                ri->cache_info.identity_digest, DIGEST_LEN),
+                         STMT_NIL) {
+      if (!memcmp(ri->cache_info.signed_descriptor_digest,
+                  rs->descriptor_digest, DIGEST_LEN)) {
+        if (live_until > ri->cache_info.last_listed_as_valid_until)
+          ri->cache_info.last_listed_as_valid_until = live_until;
+      }
+    } SMARTLIST_FOREACH_JOIN_END(rs, ri);
+  });
+
   router_dir_info_changed();
 }