[tor-commits] [tor/main] Downgrade a PROTOCOL_WARN log message.

dgoulet at torproject.org dgoulet at torproject.org
Thu Oct 14 12:41:04 UTC 2021


commit 3da455de0025f2d7a6ef97dcae849fefe3ba35fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 13 16:51:46 2021 -0400

    Downgrade a PROTOCOL_WARN log message.
    
    This one happens every time we get a failure from
    circuit_receive_relay_cell -- but for all the relevant failing cases
    in that function, we already log in that function.
    
    This resolves one case of #40400.  Two cases remain.
---
 changes/bug40400      | 6 ++++++
 src/core/or/command.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug40400 b/changes/bug40400
new file mode 100644
index 0000000000..2ac5cf5dce
--- /dev/null
+++ b/changes/bug40400
@@ -0,0 +1,6 @@
+  o Minor bugfixes (usability):
+    - Do not log "circuit_receive_relay_cell failed" at LOG_PROTOCOL_WARN;
+      instead log it at DEBUG. In every case where we would want to log
+      this as a protocol warning, we are already logging another warning
+      from inside circuit_receive_relay_cell. Fixes part of bug 40400;
+      bugfix on 0.1.1.9.
diff --git a/src/core/or/command.c b/src/core/or/command.c
index 622217a78e..40eb1554c0 100644
--- a/src/core/or/command.c
+++ b/src/core/or/command.c
@@ -563,7 +563,7 @@ command_process_relay_cell(cell_t *cell, channel_t *chan)
   }
 
   if ((reason = circuit_receive_relay_cell(cell, circ, direction)) < 0) {
-    log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,"circuit_receive_relay_cell "
+    log_fn(LOG_DEBUG,LD_PROTOCOL,"circuit_receive_relay_cell "
            "(%s) failed. Closing.",
            direction==CELL_DIRECTION_OUT?"forward":"backward");
     /* Always emit a bandwidth event for closed circs */





More information about the tor-commits mailing list