Commit d5be9009 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

forward-port the severity fixes 


svn:r14442
parent c0477150

src/or/directory.c

+2 −1
Original line number Diff line number Diff line
@@ -1534,7 +1534,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) 
    if ((r=networkstatus_set_current_consensus(body, 0))<0) {

      log_fn(r<-1?LOG_WARN:LOG_INFO, LD_DIR,

             "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);

      networkstatus_consensus_download_failed(0);

      return -1;

src/or/networkstatus.c

+6 −8
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, 
      });

    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)",

                 ds->nickname, ds->address, (int)ds->dir_port,

                 hex_str(ds->v3_identity_digest, DIGEST_LEN));
@@ -1391,10 +1391,8 @@ networkstatus_set_current_consensus(const char *consensus, unsigned flags) 
    if (r == -1) {

      /* Okay, so it _might_ be signed enough if we get more certificates. */

      if (!was_waiting_for_certs) {

        /* XXX020 eventually downgrade this log severity, or make it so

         * users know why they're being told. */

        log_notice(LD_DIR, "Not enough certificates to check networkstatus "

                   "consensus");

        log_info(LD_DIR,

                 "Not enough certificates to check networkstatus consensus");

      }

      if (!current_consensus ||

          c->valid_after > current_consensus->valid_after) {