nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

r13364@catbus: nickm | 2007-06-11 20:15:53 -0400

Browse Source 
Stop assuming that desc_by_eid_map works: in fact, it kinda doesn't.  Add a big comment explaining why.


svn:r10567
This commit is contained in:
Nick Mathewson 2007-06-12 00:15:55 +00:00
parent 399890307d
commit a21381affa
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/or/routerlist.c
View File

@ -5158,11 +5158,30 @@ routerlist_assert_ok(routerlist_t *rl)
r->cache_info.signed_descriptor_digest); r->cache_info.signed_descriptor_digest);
tor_assert(&(r->cache_info) == sd2); tor_assert(&(r->cache_info) == sd2);
tor_assert(r->routerlist_index == r_sl_idx); tor_assert(r->routerlist_index == r_sl_idx);
#if 0
/* XXXX020.
*
* Hoo boy. We need to fix this one, and the fix is a bit tricky, so
* commenting this out is just a band-aid.
*
* The problem is that, although well-behaved router descriptors
* should never have the same value for their extra_info_digest, it's
* possible for ill-behaved routers to claim whatever they like there.
*
* The real answer is to trash desc_by_eid_map and instead have
* something that indicates for a given extra-info digest we want,
* what its download status is. We'll do that as a part of routerlist
* refactoring once consensus directories are in. For now,
* this rep violation is probably harmless: an adversary can make us
* reset our retry count for an extrainfo, but that's not the end
* of the world.
*/
if (!tor_digest_is_zero(r->cache_info.extra_info_digest)) { if (!tor_digest_is_zero(r->cache_info.extra_info_digest)) {
signed_descriptor_t *sd3 = signed_descriptor_t *sd3 =
sdmap_get(rl->desc_by_eid_map, r->cache_info.extra_info_digest); sdmap_get(rl->desc_by_eid_map, r->cache_info.extra_info_digest);
tor_assert(sd3 == &(r->cache_info)); tor_assert(sd3 == &(r->cache_info));
} }
#endif
}); });
SMARTLIST_FOREACH(rl->old_routers, signed_descriptor_t *, sd, SMARTLIST_FOREACH(rl->old_routers, signed_descriptor_t *, sd,
{ {
@ -5170,11 +5189,14 @@ routerlist_assert_ok(routerlist_t *rl)
tor_assert(sd != &(r2->cache_info)); tor_assert(sd != &(r2->cache_info));
sd2 = sdmap_get(rl->desc_digest_map, sd->signed_descriptor_digest); sd2 = sdmap_get(rl->desc_digest_map, sd->signed_descriptor_digest);
tor_assert(sd == sd2); tor_assert(sd == sd2);
#if 0
/* XXXX020 see above. */
if (!tor_digest_is_zero(sd->extra_info_digest)) { if (!tor_digest_is_zero(sd->extra_info_digest)) {
signed_descriptor_t *sd3 = signed_descriptor_t *sd3 =
sdmap_get(rl->desc_by_eid_map, sd->extra_info_digest); sdmap_get(rl->desc_by_eid_map, sd->extra_info_digest);
tor_assert(sd3 == sd); tor_assert(sd3 == sd);
} }
#endif
}); });
iter = digestmap_iter_init((digestmap_t*)rl->identity_map); iter = digestmap_iter_init((digestmap_t*)rl->identity_map);
@ -5221,9 +5243,11 @@ routerlist_assert_ok(routerlist_t *rl)
d, DIGEST_LEN)); d, DIGEST_LEN));
sd = sdmap_get(rl->desc_by_eid_map, sd = sdmap_get(rl->desc_by_eid_map,
ei->cache_info.signed_descriptor_digest); ei->cache_info.signed_descriptor_digest);
tor_assert(sd); // tor_assert(sd); // XXXX020 see above
tor_assert(!memcmp(ei->cache_info.signed_descriptor_digest, if (sd) {
sd->extra_info_digest, DIGEST_LEN)); tor_assert(!memcmp(ei->cache_info.signed_descriptor_digest,
sd->extra_info_digest, DIGEST_LEN));
}
iter = digestmap_iter_next((digestmap_t*)rl->extra_info_map, iter); iter = digestmap_iter_next((digestmap_t*)rl->extra_info_map, iter);
} }
} }