aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2009-09-28 15:08:32 +0200
committerSebastian Hahn <sebastian@torproject.org>2009-12-12 02:26:11 +0100
commitf25864743368e7962bfffc0e57763b13157429e3 (patch)
treee59141569cd791c18593a94e5a7a7f74eda786ba /src/or/main.c
parent4afdb79051f7b1caba49877fb57be60bda9d4514 (diff)
downloadtor-f25864743368e7962bfffc0e57763b13157429e3.tar.gz
tor-f25864743368e7962bfffc0e57763b13157429e3.zip
Allow SafeLogging to exclude client related information
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 537abcc832..4b51b5248c 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -616,8 +616,8 @@ conn_close_if_marked(int i)
"something is wrong with theirs. "
"(fd %d, type %s, state %d, marked at %s:%d).",
(int)buf_datalen(conn->outbuf),
- escaped_safe_str(conn->address), conn->s,
- conn_type_to_string(conn->type), conn->state,
+ escaped_safe_str(conn->address),
+ conn->s, conn_type_to_string(conn->type), conn->state,
conn->marked_for_close_file,
conn->marked_for_close);
}
@@ -1678,7 +1678,8 @@ dumpstats(int severity)
if (!connection_is_listener(conn)) {
log(severity,LD_GENERAL,
"Conn %d is to %s:%d.", i,
- safe_str(conn->address), conn->port);
+ safe_str(conn->address),
+ conn->port);
log(severity,LD_GENERAL,
"Conn %d: %d bytes waiting on inbuf (len %d, last read %d secs ago)",
i,