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

prop250: Silence a logging message.

Browse Source 
LOG_NOTICE is a bit too much for that one.
This commit is contained in:
George Kadianakis 2016-05-24 13:58:20 +03:00 committed by David Goulet
parent f6f4668b1d
commit ebbff31740
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/shared_random.c
View File

@ -438,7 +438,7 @@ generate_srv(const char *hashed_reveals, uint8_t reveal_num,
/* Debugging. */ /* Debugging. */
char srv_hash_encoded[SR_SRV_VALUE_BASE64_LEN + 1]; char srv_hash_encoded[SR_SRV_VALUE_BASE64_LEN + 1];
sr_srv_encode(srv_hash_encoded, sizeof(srv_hash_encoded), srv); 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; return srv;
} }
@ -617,7 +617,15 @@ should_keep_commit(const sr_commit_t *commit, const char *voter_key,
case SR_PHASE_COMMIT: case SR_PHASE_COMMIT:
/* Already having a commit for an authority so ignore this one. */ /* Already having a commit for an authority so ignore this one. */
if (saved_commit) { 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; goto ignore;
} }

6
src/or/shared_random_state.c
View File

@ -720,7 +720,7 @@ disk_state_load_from_disk_impl(const char *fname)
state_set(parsed_state); state_set(parsed_state);
disk_state_set(disk_state); disk_state_set(disk_state);
tor_free(content); 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; return 0;
error: error:
@ -1121,8 +1121,8 @@ sr_state_update(time_t valid_after)
{ /* Debugging. */ { /* Debugging. */
char tbuf[ISO_TIME_LEN + 1]; char tbuf[ISO_TIME_LEN + 1];
format_iso_time(tbuf, valid_after); format_iso_time(tbuf, valid_after);
log_info(LD_DIR, "SR: State prepared for new voting period (%s). " log_info(LD_DIR, "SR: State prepared for upcoming voting period (%s). "
"Current phase is %s (%d commit & %d reveal rounds).", "Upcoming phase is %s (counters: %d commit & %d reveal rounds).",
tbuf, get_phase_str(sr_state->phase), tbuf, get_phase_str(sr_state->phase),
sr_state->n_commit_rounds, sr_state->n_reveal_rounds); sr_state->n_commit_rounds, sr_state->n_reveal_rounds);
} }