commit ebbff3174059f0c1d0fb51a39f97de453ea055f4 Author: George Kadianakis desnacked@riseup.net Date: Tue May 24 13:58:20 2016 +0300

prop250: Silence a logging message.

LOG_NOTICE is a bit too much for that one. --- src/or/shared_random.c | 12 ++++++++++-- src/or/shared_random_state.c | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/or/shared_random.c b/src/or/shared_random.c index 7da6daf..599273f 100644 --- a/src/or/shared_random.c +++ b/src/or/shared_random.c @@ -438,7 +438,7 @@ generate_srv(const char *hashed_reveals, uint8_t reveal_num, /* Debugging. */ char srv_hash_encoded[SR_SRV_VALUE_BASE64_LEN + 1]; sr_srv_encode(srv_hash_encoded, sizeof(srv_hash_encoded), srv); - log_debug(LD_DIR, "SR: Generated SRV: %s", srv_hash_encoded); + log_info(LD_DIR, "SR: Generated SRV: %s", srv_hash_encoded); } return srv; } @@ -617,7 +617,15 @@ should_keep_commit(const sr_commit_t *commit, const char *voter_key, case SR_PHASE_COMMIT: /* Already having a commit for an authority so ignore this one. */ if (saved_commit) { - log_debug(LD_DIR, "SR: Ignoring known commit during COMMIT phase."); + /* Receiving known commits should happen naturally since commit phase + lasts multiple rounds. However if the commitment value changes + during commit phase, it might be a bug so log more loudly. */ + if (!commitments_are_the_same(commit, saved_commit)) { + log_info(LD_DIR, "SR: Received altered commit from %s in commit phase.", + sr_commit_get_rsa_fpr(commit)); + } else { + log_debug(LD_DIR, "SR: Ignoring known commit during commit phase."); + } goto ignore; }

diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 705c586..87126f5 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -720,7 +720,7 @@ disk_state_load_from_disk_impl(const char *fname) state_set(parsed_state); disk_state_set(disk_state); tor_free(content); - log_notice(LD_DIR, "SR: State loaded successfully from file %s", fname); + log_info(LD_DIR, "SR: State loaded successfully from file %s", fname); return 0;

error: @@ -1121,8 +1121,8 @@ sr_state_update(time_t valid_after) { /* Debugging. */ char tbuf[ISO_TIME_LEN + 1]; format_iso_time(tbuf, valid_after); - log_info(LD_DIR, "SR: State prepared for new voting period (%s). " - "Current phase is %s (%d commit & %d reveal rounds).", + log_info(LD_DIR, "SR: State prepared for upcoming voting period (%s). " + "Upcoming phase is %s (counters: %d commit & %d reveal rounds).", tbuf, get_phase_str(sr_state->phase), sr_state->n_commit_rounds, sr_state->n_reveal_rounds); }