mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

r19231@catbus: nickm | 2008-04-07 12:45:58 -0400

Browse Source 
Update last_listed_as_valid_until for new routers based on v2 networkstatus as well as consensus networkstatus.


svn:r14317
This commit is contained in:
Nick Mathewson 2008-04-08 17:06:38 +00:00
parent e57264fee8
commit 0c9efd6a1e
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/or/networkstatus.c
View File

@ -1688,6 +1688,8 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
networkstatus_t *ns = current_consensus; networkstatus_t *ns = current_consensus;
if (!ns || !smartlist_len(ns->routerstatus_list)) if (!ns || !smartlist_len(ns->routerstatus_list))
return; return;
if (!networkstatus_v2_list)
networkstatus_v2_list = smartlist_create();
routers_sort_by_identity(routers); routers_sort_by_identity(routers);
@ -1704,6 +1706,7 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
router_clear_status_flags(router); router_clear_status_flags(router);
} }
}) { }) {
/* We have a routersatus for this router. */
const char *digest = router->cache_info.identity_digest; const char *digest = router->cache_info.identity_digest;
ds = router_get_trusteddirserver_by_digest(digest); ds = router_get_trusteddirserver_by_digest(digest);
@ -1714,7 +1717,7 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
else else
router->is_named = 0; 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, if (!memcmp(router->cache_info.signed_descriptor_digest,
rs->descriptor_digest, DIGEST_LEN)) { rs->descriptor_digest, DIGEST_LEN)) {
if (ns->valid_until > router->cache_info.last_listed_as_valid_until) if (ns->valid_until > router->cache_info.last_listed_as_valid_until)
@ -1741,6 +1744,23 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
} }
} SMARTLIST_FOREACH_JOIN_END(rs, router); } 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(); router_dir_info_changed();
} }