[or-cvs] [tor/release-0.2.2 112/162] Move controller event for socks warning into log_unsafe_socks_warning

[arma at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Mon, 15 Nov 2010 15:41:21 -0500
Subject: Move controller event for socks warning into log_unsafe_socks_warning
Commit: cbad9f45206343908040a8fafe05aa5c7c1208d7

---
 src/or/buffers.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 3825dd6..658a924 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1308,7 +1308,8 @@ fetch_from_buf_http(buf_t *buf,
  * protocol <b>socks_protocol</b> on port <b>port</b>.  Don't warn more than
  * once per SOCKS_WARN_INTERVAL, unless <b>safe_socks</b> is set. */
 static void
-log_unsafe_socks_warning(int socks_protocol, uint16_t port, int safe_socks)
+log_unsafe_socks_warning(int socks_protocol, const char *address,
+                         uint16_t port, int safe_socks)
 {
   static ratelim_t socks_ratelim = RATELIM_INIT(SOCKS_WARN_INTERVAL);
 
@@ -1330,6 +1331,9 @@ log_unsafe_socks_warning(int socks_protocol, uint16_t port, int safe_socks)
              m ? m : "");
     tor_free(m);
   }
+  control_event_client_status(LOG_WARN,
+                              "DANGEROUS_SOCKS PROTOCOL=SOCKS%d ADDRESS=%s:%d",
+                              socks_protocol, address, (int)port);
 }
 
 /** There is a (possibly incomplete) socks handshake on <b>buf</b>, of one
@@ -1450,10 +1454,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
           buf_remove_from_front(buf, 6+addrlen);
           if (req->command != SOCKS_COMMAND_RESOLVE_PTR &&
               !addressmap_have_mapping(req->address,0)) {
-            log_unsafe_socks_warning(5, req->port, safe_socks);
-            control_event_client_status(LOG_WARN,
-                          "DANGEROUS_SOCKS PROTOCOL=SOCKS5 ADDRESS=%s:%d",
-                          req->address, req->port);
+            log_unsafe_socks_warning(5, req->address, req->port, safe_socks);
             if (safe_socks)
               return -1;
           }
@@ -1554,7 +1555,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
       startaddr = NULL;
       if (socks4_prot != socks4a &&
           !addressmap_have_mapping(tmpbuf,0)) {
-        log_unsafe_socks_warning(4, req->port, safe_socks);
+        log_unsafe_socks_warning(4, tmpbuf, req->port, safe_socks);
 
         if (safe_socks)
           return -1;
-- 
1.7.1