mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Likely fix for bug 309: when we calculate offsets after rebuilding the descriptor cache, do not reset the offset pointer half-way through.

Browse source 
svn:r6693
This commit is contained in:
Nick Mathewson 2006-06-27 15:52:51 +00:00
parent 3117a41d1b
commit d3784ff1df
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/routerlist.c
View file

@ -221,6 +221,7 @@ router_rebuild_store(int force)
smartlist_t *chunk_list = NULL;
char *fname = NULL;
int r = -1, i;
off_t offset = 0;
if (!force && !router_should_rebuild_store())
return 0;
@ -230,6 +231,8 @@ router_rebuild_store(int force)
/* Don't save deadweight. */
routerlist_remove_old_routers();
log_info(LD_DIR, "Rebuilding router descriptor cache");
options = get_options();
fname_len = strlen(options->DataDirectory)+32;
fname = tor_malloc(fname_len);
@ -279,19 +282,19 @@ router_rebuild_store(int force)
log_warn(LD_FS, "Unable to mmap new descriptor file at '%s'.",fname);
}
offset = 0;
for (i = 0; i < 2; ++i) {
smartlist_t *lst = (i == 0) ? routerlist->old_routers :
routerlist->routers;
off_t offset = 0;
SMARTLIST_FOREACH(lst, void *, ptr,
{
signed_descriptor_t *sd = (i==0) ?
((signed_descriptor_t*)ptr): &((routerinfo_t*)ptr)->cache_info;
sd->saved_location = SAVED_IN_CACHE;
sd->saved_offset = offset;
if (routerlist->mmap_descriptors)
sd->signed_descriptor_body = NULL;
if (routerlist->mmap_descriptors) {
tor_free(sd->signed_descriptor_body); // sets it to null
}
offset += sd->signed_descriptor_len;
});
}