aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-04-25 09:24:56 -0400
committerDavid Goulet <dgoulet@torproject.org>2017-04-25 09:27:34 -0400
commit368b0913293dec9b392bce288753f5d90c130431 (patch)
treeec41d8c3f1d9622f51839553430a2871184b1a6f
parent91dd4a00f7d4891e24187a849933547128aeeb9f (diff)
downloadtor-368b0913293dec9b392bce288753f5d90c130431.tar.gz
tor-368b0913293dec9b392bce288753f5d90c130431.zip
relay: Change LD_BUG log to LD_PROTOCOL_WARN
That log statement can be triggered if somebody on the Internet behaves badly which is possible with buggy implementation for instance. Fixes #21293 Signed-off-by: David Goulet <dgoulet@torproject.org>
-rw-r--r--changes/bug212935
-rw-r--r--src/or/relay.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug21293 b/changes/bug21293
new file mode 100644
index 0000000000..23a7547951
--- /dev/null
+++ b/changes/bug21293
@@ -0,0 +1,5 @@
+ o Minor bugfixes (cell, logging):
+ - Downgrade a log statement from bug to protocol warning because there is
+ at least one use case where it can be triggered by a buggy tor
+ implementation on the Internet for instance. Fixes bug 21293; bugfix on
+ tor-0.1.1.14-alpha.
diff --git a/src/or/relay.c b/src/or/relay.c
index 8524080939..1842012ed7 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -226,7 +226,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
return 0;
if (relay_crypt(circ, cell, cell_direction, &layer_hint, &recognized) < 0) {
- log_warn(LD_BUG,"relay crypt failed. Dropping connection.");
+ log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+ "relay crypt failed. Dropping connection.");
return -END_CIRC_REASON_INTERNAL;
}