[or-cvs] r10802: Partial backport of r10563: desc_digest_map holds signed_des (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-12 12:17:09 -0400 (Thu, 12 Jul 2007)
New Revision: 10802

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/src/or/routerlist.c
Log:
 r13703 at catbus:  nickm | 2007-07-12 11:41:38 -0400
 Partial backport of r10563: desc_digest_map holds signed_descriptor_t, not routerinfo_t.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13703] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-07-12 16:17:05 UTC (rev 10801)
+++ tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-07-12 16:17:09 UTC (rev 10802)
@@ -1659,9 +1659,9 @@
     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);
   }