diff options
| author | teor <teor@torproject.org> | 2019-01-09 18:00:34 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-01-10 07:59:59 +1000 |
| commit | 89a0b77740f2a1179badcaa71d1e104cedb6ddde (patch) | |
| tree | b73faa0822e6daea3aa494e13e3842258fd4f809 | |
| parent | 445d6750f79c266c0e21e7a31e6d5f872f8a4ec8 (diff) | |
| download | tor-89a0b77740f2a1179badcaa71d1e104cedb6ddde.tar.gz tor-89a0b77740f2a1179badcaa71d1e104cedb6ddde.zip | |
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.
| -rw-r--r-- | changes/bug29029 | 5 | ||||
| -rw-r--r-- | src/or/rendmid.c | 6 |
2 files changed, 8 insertions, 3 deletions
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; } |