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

Log a better message if a router we're re-adding is expired.

Browse Source 
Addresses ticket 20020.
This commit is contained in:
Nick Mathewson 2017-11-16 08:35:06 -05:00
parent 8ff60b5288
commit 93dbce4ddd
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket20020 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (logging):
- Improve a warning message that happens when we fail to re-parse
an old router because of an expired certificate. Closes ticket
20020.

13
src/or/routerlist.c
View File

@ -5199,8 +5199,19 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote,
}
r = router_add_to_routerlist(ri, &msg, 1, 0);
if (WRA_WAS_OUTDATED(r)) {
log_warn(LD_DIR, "Couldn't add re-parsed router: %s",
log_warn(LD_DIR, "Couldn't add re-parsed router: %s. This isn't "
"usually a big deal, but you should make sure that your "
"clock and timezone are set correctly.",
msg?msg:"???");
if (r == ROUTER_CERTS_EXPIRED) {
char time_cons[ISO_TIME_LEN+1];
char time_cert[ISO_TIME_LEN+1];
format_iso_time(time_cons, consensus->valid_after);
format_iso_time(time_cert, ri->cert_expiration_time);
log_warn(LD_DIR, " (I'm looking at a consensus from %s; This "
"router's certificates began expiring at %s.)",
time_cons, time_cert);
}
}
} SMARTLIST_FOREACH_END(sd);
routerlist_assert_ok(rl);