aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.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/connection.c
parent4afdb79051f7b1caba49877fb57be60bda9d4514 (diff)
downloadtor-f25864743368e7962bfffc0e57763b13157429e3.tar.gz
tor-f25864743368e7962bfffc0e57763b13157429e3.zip
Allow SafeLogging to exclude client related information
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 0600d9711f..74d2bf26ab 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1262,7 +1262,8 @@ connection_connect(connection_t *conn, const char *address,
dest_addr_len = tor_addr_to_sockaddr(addr, port, dest_addr, sizeof(addrbuf));
tor_assert(dest_addr_len > 0);
- log_debug(LD_NET,"Connecting to %s:%u.",escaped_safe_str(address),port);
+ log_debug(LD_NET, "Connecting to %s:%u.",
+ escaped_safe_str(address), port);
if (connect(s, dest_addr, dest_addr_len) < 0) {
int e = tor_socket_errno(s);
@@ -1270,7 +1271,8 @@ connection_connect(connection_t *conn, const char *address,
/* yuck. kill it. */
*socket_error = e;
log_info(LD_NET,
- "connect() to %s:%u failed: %s",escaped_safe_str(address),
+ "connect() to %s:%u failed: %s",
+ escaped_safe_str(address),
port, tor_socket_strerror(e));
tor_close_socket(s);
return -1;
@@ -1284,7 +1286,8 @@ connection_connect(connection_t *conn, const char *address,
/* it succeeded. we're connected. */
log_fn(inprogress?LOG_DEBUG:LOG_INFO, LD_NET,
- "Connection to %s:%u %s (sock %d).",escaped_safe_str(address),
+ "Connection to %s:%u %s (sock %d).",
+ escaped_safe_str(address),
port, inprogress?"in progress":"established", s);
conn->s = s;
if (connection_add(conn) < 0) /* no space, forget it */