From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 21 May 2013 18:00:30 +0000 (-0400)
Subject: Restore 8093 log messages to WARN severity, but rate limit
X-Git-Tag: tor-0.2.5.1-alpha~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5820a1bf1447299d4dc0c0f1d7daf4b29863b8b;p=thirdparty%2Ftor.git

Restore 8093 log messages to WARN severity, but rate limit

See #8093 for discussion
---

diff --git a/changes/bug8093.part2 b/changes/bug8093.part2
new file mode 100644
index 0000000000..263c7e8b86
--- /dev/null
+++ b/changes/bug8093.part2
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Return the "unexpected sendme" warnings to a warn severity, but make
+      them rate limited. Related to ticket #8093.
diff --git a/src/or/relay.c b/src/or/relay.c
index d57ceaacf8..cef138e721 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1494,7 +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) {
-            log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+            static struct ratelim_t exit_warn_ratelim = RATELIM_INIT(600);
+            log_fn_ratelim(&exit_warn_ratelim, LOG_WARN, LD_PROTOCOL,
                    "Unexpected sendme cell from exit relay. "
                    "Closing circ.");
             return -END_CIRC_REASON_TORPROTOCOL;
@@ -1506,7 +1507,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
         } else {
           if (circ->package_window + CIRCWINDOW_INCREMENT >
                 CIRCWINDOW_START_MAX) {
-            log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+            static struct ratelim_t client_warn_ratelim = RATELIM_INIT(600);
+            log_fn_ratelim(&client_warn_ratelim, LOG_WARN, LD_PROTOCOL,
                    "Unexpected sendme cell from client. "
                    "Closing circ (window %d).",
                    circ->package_window);