diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-11-01 12:15:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-02 10:33:57 -0400 |
| commit | 0386280487fce78b73e060234f515b850af9c589 (patch) | |
| tree | 74f543e348d5529ab44a6c05e450b03d4d9f6cc3 | |
| parent | cb42c62c9e87d4699add69087ba25d1454758bb0 (diff) | |
| download | tor-0386280487fce78b73e060234f515b850af9c589.tar.gz tor-0386280487fce78b73e060234f515b850af9c589.zip | |
nodelist: Downgrade warning to protocol warning
The node_get_ed25519_id() warning can actually be triggered by a relay flagged
with NoEdConsensus so instead of triggering a warning on all relays of the
network, downgrade it to protocol warning.
Fixes #24025
Signed-off-by: David Goulet <dgoulet@torproject.org>
| -rw-r--r-- | changes/bug24025 | 5 | ||||
| -rw-r--r-- | src/or/nodelist.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug24025 b/changes/bug24025 new file mode 100644 index 0000000000..1d7841af53 --- /dev/null +++ b/changes/bug24025 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, relay): + - Downgrade a warning to a protocol warning in the case the ed25519 key is + not consistent between the descriptor and micro descriptor of a relay. + This can happen for instance if the relay has been flagged + NoEdConsensus. Fixes bug 24025; bugfix on 0.3.2.1-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f5a2cddf48..f2e979be8b 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -924,7 +924,10 @@ node_get_ed25519_id(const node_t *node) if (ed25519_pubkey_eq(ri_pk, md_pk)) { return ri_pk; } else { - log_warn(LD_GENERAL, "Inconsistent ed25519 identities in the nodelist"); + /* This can happen if the relay gets flagged NoEdConsensus which will be + * triggered on all relays of the network. Thus a protocol warning. */ + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Inconsistent ed25519 identities in the nodelist"); return NULL; } } else if (ri_pk) { |