[or-cvs] [tor/master] If somebody tries to overflow my dirport, don't log his IP by default.

[arma@xxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Sat, 21 Nov 2009 23:09:24 -0500
Subject: If somebody tries to overflow my dirport, don't log his IP by default.
Commit: fdd58f3bd5daa4a8982244d0b956fcfebfd91b6d

aka Fix an instance where a Tor directory mirror might accidentally
log the IP address of a misbehaving Tor client. Bugfix on
0.1.0.1-rc.
---
 ChangeLog          |    3 +++
 src/or/directory.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b55d76..1e19a20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ Changes in version 0.2.2.7-alpha - 2009-??-??
       with a different memory value than we use for overwriting a freed
       internal circuit structure. Should help with debugging. Suggested
       by bug 1055.
+    - Fix an instance where a Tor directory mirror might accidentally
+      log the IP address of a misbehaving Tor client. Bugfix on
+      0.1.0.1-rc.
 
 
 Changes in version 0.2.2.6-alpha - 2009-11-19
diff --git a/src/or/directory.c b/src/or/directory.c
index 1d3c43e..427f5d8 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3242,8 +3242,8 @@ directory_handle_command(dir_connection_t *conn)
                               &body, &body_len, MAX_DIR_UL_SIZE, 0)) {
     case -1: /* overflow */
       log_warn(LD_DIRSERV,
-               "Invalid input from address '%s'. Closing.",
-               conn->_base.address);
+               "Request too large from address '%s' to DirPort. Closing.",
+               safe_str(conn->_base.address));
       return -1;
     case 0:
       log_debug(LD_DIRSERV,"command not all here yet.");
-- 
1.5.6.5