aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/connection_edge.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-09-18 15:42:40 -0400
committerNick Mathewson <nickm@torproject.org>2019-09-18 15:42:40 -0400
commitbf4a27c0eae79baff7f0ed4ebe12bda5e2ba06b6 (patch)
tree7929e5ef6d45a5d6af5bc9890b53736a5f77bf0c /src/core/or/connection_edge.c
parent02840169d860384257042bdf6d7601c2bf48b47b (diff)
parentf0e4120996d3a96252200ea5302dcde3af6e0bc0 (diff)
downloadtor-bf4a27c0eae79baff7f0ed4ebe12bda5e2ba06b6.tar.gz
tor-bf4a27c0eae79baff7f0ed4ebe12bda5e2ba06b6.zip
Merge branch 'bug31466_029' into bug31466_035_tmp
Diffstat (limited to 'src/core/or/connection_edge.c')
-rw-r--r--src/core/or/connection_edge.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 7cc67d7f5e..90991107dc 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -1598,8 +1598,10 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
* disallowed when they're coming straight from the client, but you're
* allowed to have them in MapAddress commands and so forth. */
if (!strcmpend(socks->address, ".exit")) {
- log_warn(LD_APP, "The \".exit\" notation is disabled in Tor due to "
- "security risks.");
+ static ratelim_t exit_warning_limit = RATELIM_INIT(60*15);
+ log_fn_ratelim(&exit_warning_limit, LOG_WARN, LD_APP,
+ "The \".exit\" notation is disabled in Tor due to "
+ "security risks.");
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
escaped(socks->address));
out->end_reason = END_STREAM_REASON_TORPROTOCOL;