diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-05-21 13:45:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-05-21 13:45:21 -0400 |
| commit | 30c06c187a0b649bd2d30edc0b16e2376f74ad9a (patch) | |
| tree | 2d755bb656f36a760084a8b6b09da89d9b171ff7 | |
| parent | a2e72ac04a5eabc17336fb55bd6b3a482448d3a8 (diff) | |
| download | tor-30c06c187a0b649bd2d30edc0b16e2376f74ad9a.tar.gz tor-30c06c187a0b649bd2d30edc0b16e2376f74ad9a.zip | |
Downgrade the unexpected sendme cell warnings for 0.2.4
See discussion on #8093
| -rw-r--r-- | changes/bug8093.part1 | 3 | ||||
| -rw-r--r-- | src/or/relay.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/changes/bug8093.part1 b/changes/bug8093.part1 new file mode 100644 index 0000000000..2450794dd7 --- /dev/null +++ b/changes/bug8093.part1 @@ -0,0 +1,3 @@ + o Minor features: + - Downgrade "unexpected SENDME" warnings to protocol-warn for 0.2.4, + for bug 8093. diff --git a/src/or/relay.c b/src/or/relay.c index 52ff32f0ca..d57ceaacf8 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1494,9 +1494,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, if (layer_hint) { if (layer_hint->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - /*XXXX024: Downgrade this back to LOG_PROTOCOL_WARN after a while*/ - log_fn(LOG_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from exit relay. " + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected sendme cell from exit relay. " "Closing circ."); return -END_CIRC_REASON_TORPROTOCOL; } @@ -1507,9 +1506,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } else { if (circ->package_window + CIRCWINDOW_INCREMENT > CIRCWINDOW_START_MAX) { - /*XXXX024: Downgrade this back to LOG_PROTOCOL_WARN after a while*/ - log_fn(LOG_WARN, LD_PROTOCOL, - "Bug/attack: unexpected sendme cell from client. " + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected sendme cell from client. " "Closing circ (window %d).", circ->package_window); return -END_CIRC_REASON_TORPROTOCOL; |