[tor-commits] [tor/release-0.2.9] rend: stop warning when clients send multiple rend establish cells

[nickm@xxxxxxxxxxxxxx]

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Wed Jan 9 18:00:34 2019 +1000

    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(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 000000000..e100a8c2e
--- /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 441d5043c..08b2e8923 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;
   }
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits