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

Merge branch 'bug13762_quiet_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2015-02-19 09:40:41 -05:00
commit 85f97941df
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug13762_quiet Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (directory authority):
- Do not attempt to download extrainfo documents which we will be
unable to validate with a matching server descriptor. Fixes bug
13762; bugfix on 0.2.0.1-alpha.

43
src/or/routerlist.c
View File

@ -4705,7 +4705,34 @@ update_extrainfo_downloads(time_t now)
++n_pending; ++n_pending;
continue; continue;
} }
if (router_get_by_extrainfo_digest(d) != sd) {
const signed_descriptor_t *sd2 = router_get_by_extrainfo_digest(d);
if (sd2 != sd) {
if (sd2 != NULL) {
char d1[HEX_DIGEST_LEN+1], d2[HEX_DIGEST_LEN+1];
char d3[HEX_DIGEST_LEN+1], d4[HEX_DIGEST_LEN+1];
base16_encode(d1, sizeof(d1), sd->identity_digest, DIGEST_LEN);
base16_encode(d2, sizeof(d2), sd2->identity_digest, DIGEST_LEN);
base16_encode(d3, sizeof(d3), d, DIGEST_LEN);
base16_encode(d4, sizeof(d3), sd2->extra_info_digest, DIGEST_LEN);
log_info(LD_DIR, "Found an entry in %s with mismatched "
"router_get_by_extrainfo_digest() value. This has ID %s "
"but the entry in the map has ID %s. This has EI digest "
"%s and the entry in the map has EI digest %s.",
old_routers?"old_routers":"routers",
d1, d2, d3, d4);
} else {
char d1[HEX_DIGEST_LEN+1], d2[HEX_DIGEST_LEN+1];
base16_encode(d1, sizeof(d1), sd->identity_digest, DIGEST_LEN);
base16_encode(d2, sizeof(d2), d, DIGEST_LEN);
log_info(LD_DIR, "Found an entry in %s with NULL "
"router_get_by_extrainfo_digest() value. This has ID %s "
"and EI digest %s.",
old_routers?"old_routers":"routers",
d1, d2);
}
++n_bogus[old_routers]; ++n_bogus[old_routers];
continue; continue;
} }
@ -4715,16 +4742,10 @@ update_extrainfo_downloads(time_t now)
digestmap_free(pending, NULL); digestmap_free(pending, NULL);
log_info(LD_DIR, "Extrainfo download status: %d router with no ei, %d " log_info(LD_DIR, "Extrainfo download status: %d router with no ei, %d "
"with present ei, %d delaying, %d pending, %d downloadable.", "with present ei, %d delaying, %d pending, %d downloadable, %d "
n_no_ei, n_have, n_delay, n_pending, smartlist_len(wanted)); "bogus in routers, %d bogus in old_routers",
n_no_ei, n_have, n_delay, n_pending, smartlist_len(wanted),
if (n_bogus[0] || n_bogus[1]) { n_bogus[0], n_bogus[1]);
static ratelim_t bogus_ei_warning = RATELIM_INIT(1800);
log_fn_ratelim(&bogus_ei_warning, LOG_WARN, LD_BUG,
"While downloading extrainfo documents, I found %d "
"inconsistencies in routers and %d inconsistencies in "
"old_routers.", n_bogus[0], n_bogus[1]);
}
smartlist_shuffle(wanted); smartlist_shuffle(wanted);