diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-07-12 16:17:09 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-07-12 16:17:09 +0000 |
| commit | 12a873accec1daf60b8ccfa4a791a9f1cba5713c (patch) | |
| tree | 45c3cef63de600c0abc5589a41843f3728c1aaf2 | |
| parent | b1ab445c605caf7774bf3caa0e93a379f1976b9a (diff) | |
| download | tor-12a873accec1daf60b8ccfa4a791a9f1cba5713c.tar.gz tor-12a873accec1daf60b8ccfa4a791a9f1cba5713c.zip | |
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
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files 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); } |