Merge branch 'tor-gitlab/mr/455'

This commit is contained in:
David Goulet 2021-10-14 08:40:38 -04:00
commit 4dfc5de509
2 changed files with 7 additions and 1 deletions

6
changes/bug40400 Normal file
View File

@ -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.

View File

@ -563,7 +563,7 @@ command_process_relay_cell(cell_t *cell, channel_t *chan)
} }
if ((reason = circuit_receive_relay_cell(cell, circ, direction)) < 0) { 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.", "(%s) failed. Closing.",
direction==CELL_DIRECTION_OUT?"forward":"backward"); direction==CELL_DIRECTION_OUT?"forward":"backward");
/* Always emit a bandwidth event for closed circs */ /* Always emit a bandwidth event for closed circs */