From 12a873accec1daf60b8ccfa4a791a9f1cba5713c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 12 Jul 2007 16:17:09 +0000 Subject: [PATCH] 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 --- src/or/routerlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5322cf1aca..9af9520844 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -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); } -- 2.11.4.GIT