r13703@catbus: nickm | 2007-07-12 11:41:38 -0400

Partial backport of r10563: desc_digest_map holds signed_descriptor_t, not routerinfo_t.


svn:r10802
This commit is contained in:
Nick Mathewson 2007-07-12 16:17:09 +00:00
parent b1ab445c60
commit 12a873acce
1 changed files with 2 additions and 2 deletions

View File

@ -1659,9 +1659,9 @@ routerlist_remove(routerlist_t *rl, routerinfo_t *ri, int idx, int make_old)
smartlist_add(rl->old_routers, sd);
digestmap_set(rl->desc_digest_map, sd->signed_descriptor_digest, sd);
} else {
ri_tmp = digestmap_remove(rl->desc_digest_map,
signed_descriptor_t *sd_tmp = digestmap_remove(rl->desc_digest_map,
ri->cache_info.signed_descriptor_digest);
tor_assert(ri_tmp == ri);
tor_assert(sd_tmp == &ri->cache_info);
router_bytes_dropped += ri->cache_info.signed_descriptor_len;
routerinfo_free(ri);
}