nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve problem found by weasel: the v1 directory was including

Browse Source 
servers as much as 48 hours old, because that's how the new
routerlist->routers works. Now only include them if they're
20 hours old or less.


svn:r6230
This commit is contained in:
Roger Dingledine 2006-03-22 21:32:42 +00:00
parent 58307cd8de
commit 20e66a799b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/dirserv.c
View File

@ -799,11 +799,12 @@ dirserv_dump_directory_to_string(char **dir_out,
char *recommended_versions; char *recommended_versions;
char digest[DIGEST_LEN]; char digest[DIGEST_LEN];
char published[ISO_TIME_LEN+1]; char published[ISO_TIME_LEN+1];
time_t published_on;
char *buf = NULL; char *buf = NULL;
size_t buf_len; size_t buf_len;
size_t identity_pkey_len; size_t identity_pkey_len;
routerlist_t *rl = router_get_routerlist(); routerlist_t *rl = router_get_routerlist();
time_t now = time(NULL);
time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH;
tor_assert(dir_out); tor_assert(dir_out);
*dir_out = NULL; *dir_out = NULL;
@ -820,13 +821,13 @@ dirserv_dump_directory_to_string(char **dir_out,
recommended_versions = recommended_versions =
format_versions_list(get_options()->RecommendedVersions); format_versions_list(get_options()->RecommendedVersions);
published_on = time(NULL); format_iso_time(published, now);
format_iso_time(published, published_on);
buf_len = 2048+strlen(recommended_versions)+ buf_len = 2048+strlen(recommended_versions)+
strlen(router_status); strlen(router_status);
SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ri, SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ri,
buf_len += ri->cache_info.signed_descriptor_len+1); if (ri->cache_info.published_on >= cutoff)
buf_len += ri->cache_info.signed_descriptor_len+1);
buf = tor_malloc(buf_len); buf = tor_malloc(buf_len);
/* We'll be comparing against buf_len throughout the rest of the /* We'll be comparing against buf_len throughout the rest of the
function, though strictly speaking we shouldn't be able to exceed function, though strictly speaking we shouldn't be able to exceed
@ -851,6 +852,8 @@ dirserv_dump_directory_to_string(char **dir_out,
{ {
size_t len = ri->cache_info.signed_descriptor_len; size_t len = ri->cache_info.signed_descriptor_len;
const char *body; const char *body;
if (ri->cache_info.published_on < cutoff)
continue;
if (cp+len+1 >= buf+buf_len) if (cp+len+1 >= buf+buf_len)
goto truncated; goto truncated;
body = signed_descriptor_get_body(&ri->cache_info); body = signed_descriptor_get_body(&ri->cache_info);