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 remote-tracking branch 'arma/bug24555'

Browse Source
This commit is contained in:
Nick Mathewson 2018-01-08 10:45:40 -05:00
commit d637468128
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/routerlist.c
View File

@ -5207,14 +5207,14 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote,
SMARTLIST_FOREACH_BEGIN(no_longer_old, signed_descriptor_t *, sd) {
const char *msg;
was_router_added_t r;
time_t tmp_cert_expiration_time;
routerinfo_t *ri = routerlist_reparse_old(rl, sd);
if (!ri) {
log_warn(LD_BUG, "Failed to re-parse a router.");
continue;
}
/* need to compute this now, since add_to_routerlist may free. */
char time_cert_expires[ISO_TIME_LEN+1];
format_iso_time(time_cert_expires, ri->cert_expiration_time);
/* need to remember for below, since add_to_routerlist may free. */
tmp_cert_expiration_time = ri->cert_expiration_time;
r = router_add_to_routerlist(ri, &msg, 1, 0);
if (WRA_WAS_OUTDATED(r)) {
@ -5224,7 +5224,9 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote,
msg?msg:"???");
if (r == ROUTER_CERTS_EXPIRED) {
char time_cons[ISO_TIME_LEN+1];
char time_cert_expires[ISO_TIME_LEN+1];
format_iso_time(time_cons, consensus->valid_after);
format_iso_time(time_cert_expires, tmp_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_expires);