diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2009-09-28 15:08:32 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2009-12-12 02:26:11 +0100 |
| commit | f25864743368e7962bfffc0e57763b13157429e3 (patch) | |
| tree | e59141569cd791c18593a94e5a7a7f74eda786ba /src/or/connection_or.c | |
| parent | 4afdb79051f7b1caba49877fb57be60bda9d4514 (diff) | |
| download | tor-f25864743368e7962bfffc0e57763b13157429e3.tar.gz tor-f25864743368e7962bfffc0e57763b13157429e3.zip | |
Allow SafeLogging to exclude client related information
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index bbd64393c3..ba962f69de 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -774,7 +774,8 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) { conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING; conn->tls = tor_tls_new(conn->_base.s, receiving); - tor_tls_set_logged_address(conn->tls, escaped_safe_str(conn->_base.address)); + tor_tls_set_logged_address(conn->tls, // XXX client and relay? + escaped_safe_str_relay(conn->_base.address)); if (!conn->tls) { log_warn(LD_BUG,"tor_tls_new failed. Closing."); return -1; @@ -914,7 +915,8 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn, or_options_t *options = get_options(); int severity = server_mode(options) ? LOG_PROTOCOL_WARN : LOG_WARN; const char *safe_address = - started_here ? conn->_base.address : safe_str(conn->_base.address); + started_here ? conn->_base.address : + safe_str(conn->_base.address); const char *conn_type = started_here ? "outgoing" : "incoming"; int has_cert = 0, has_identity=0; |