From 89a0b77740f2a1179badcaa71d1e104cedb6ddde Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 9 Jan 2019 18:00:34 +1000 Subject: rend: stop warning when clients send multiple rend establish cells Stop logging "Tried to establish rendezvous on non-OR circuit..." as a warning. Instead, log it as a protocol warning, because there is nothing that relay operators can do to fix it. Fixes bug 29029; bugfix on 0.2.5.7-rc. --- changes/bug29029 | 5 +++++ src/or/rendmid.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changes/bug29029 diff --git a/changes/bug29029 b/changes/bug29029 new file mode 100644 index 0000000000..e100a8c2ed --- /dev/null +++ b/changes/bug29029 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, onion services): + - Stop logging "Tried to establish rendezvous on non-OR circuit..." as + a warning. Instead, log it as a protocol warning, because there is + nothing that relay operators can do to fix it. Fixes bug 29029; + bugfix on 0.2.5.7-rc. diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 441d5043ce..08b2e8923a 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, (unsigned)circ->p_circ_id); if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) { - log_warn(LD_PROTOCOL, - "Tried to establish rendezvous on non-OR circuit with purpose %s", - circuit_purpose_to_string(circ->base_.purpose)); + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Tried to establish rendezvous on non-OR circuit with purpose %s", + circuit_purpose_to_string(circ->base_.purpose)); goto err; } -- cgit v1.2.3-54-g00ecf