parent
c590ddd188
commit
4833d1a30a
|
@ -1534,7 +1534,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
|
||||||
if ((r=networkstatus_set_current_consensus(body, 0))<0) {
|
if ((r=networkstatus_set_current_consensus(body, 0))<0) {
|
||||||
log_fn(r<-1?LOG_WARN:LOG_INFO, LD_DIR,
|
log_fn(r<-1?LOG_WARN:LOG_INFO, LD_DIR,
|
||||||
"Unable to load consensus directory downloaded from "
|
"Unable to load consensus directory downloaded from "
|
||||||
"server '%s:%d'", conn->_base.address, conn->_base.port);
|
"server '%s:%d'. I'll try again soon.",
|
||||||
|
conn->_base.address, conn->_base.port);
|
||||||
tor_free(body); tor_free(headers); tor_free(reason);
|
tor_free(body); tor_free(headers); tor_free(reason);
|
||||||
networkstatus_consensus_download_failed(0);
|
networkstatus_consensus_download_failed(0);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -452,10 +452,10 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
|
||||||
});
|
});
|
||||||
SMARTLIST_FOREACH(missing_authorities, trusted_dir_server_t *, ds,
|
SMARTLIST_FOREACH(missing_authorities, trusted_dir_server_t *, ds,
|
||||||
{
|
{
|
||||||
log(severity, LD_DIR, "Consensus does not include configured "
|
log_info(LD_DIR, "Consensus does not include configured "
|
||||||
"authority '%s' at %s:%d (identity %s)",
|
"authority '%s' at %s:%d (identity %s)",
|
||||||
ds->nickname, ds->address, (int)ds->dir_port,
|
ds->nickname, ds->address, (int)ds->dir_port,
|
||||||
hex_str(ds->v3_identity_digest, DIGEST_LEN));
|
hex_str(ds->v3_identity_digest, DIGEST_LEN));
|
||||||
});
|
});
|
||||||
log(severity, LD_DIR,
|
log(severity, LD_DIR,
|
||||||
"%d unknown, %d missing key, %d good, %d bad, %d no signature, "
|
"%d unknown, %d missing key, %d good, %d bad, %d no signature, "
|
||||||
|
@ -1403,10 +1403,8 @@ networkstatus_set_current_consensus(const char *consensus, unsigned flags)
|
||||||
if (r == -1) {
|
if (r == -1) {
|
||||||
/* Okay, so it _might_ be signed enough if we get more certificates. */
|
/* Okay, so it _might_ be signed enough if we get more certificates. */
|
||||||
if (!was_waiting_for_certs) {
|
if (!was_waiting_for_certs) {
|
||||||
/* XXX020 eventually downgrade this log severity, or make it so
|
log_info(LD_DIR,
|
||||||
* users know why they're being told. */
|
"Not enough certificates to check networkstatus consensus");
|
||||||
log_notice(LD_DIR, "Not enough certificates to check networkstatus "
|
|
||||||
"consensus");
|
|
||||||
}
|
}
|
||||||
if (!current_consensus ||
|
if (!current_consensus ||
|
||||||
c->valid_after > current_consensus->valid_after) {
|
c->valid_after > current_consensus->valid_after) {
|
||||||
|
|
Loading…
Reference in New Issue