diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-03-19 03:55:48 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-03-19 03:55:48 +0000 |
| commit | d1d0813cf386a1fe377e34d64d659784d30d572e (patch) | |
| tree | 53000c36150f79bd64a030da054449f58de5b378 /src/or/main.c | |
| parent | 726e825b09076c44af2fedc5185dbc959b877d3c (diff) | |
| download | tor-d1d0813cf386a1fe377e34d64d659784d30d572e.tar.gz tor-d1d0813cf386a1fe377e34d64d659784d30d572e.zip | |
Allow non-printable characters for exit streams (both for
connecting and for resolving). Now we tolerate applications
that don't follow the RFCs. But continue to block malformed
names at the socks side.
svn:r6193
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c index c961d3414d..b005b32138 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -479,8 +479,8 @@ conn_close_if_marked(int i) log_info(LD_NET, "Conn (addr %s, fd %d, type %s, state %d) marked, but wants " "to flush %d bytes. (Marked at %s:%d)", - 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, (int)conn->outbuf_flushlen, conn->marked_for_close_file, conn->marked_for_close); if (connection_speaks_cells(conn)) { @@ -514,8 +514,8 @@ conn_close_if_marked(int i) "We tried to write %d bytes to addr %s (fd %d, type %s, state %d)" " but timed out. (Marked at %s:%d)", (int)buf_datalen(conn->outbuf), - 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); } @@ -1346,7 +1346,8 @@ dumpstats(int severity) (int)(now - conn->timestamp_created)); if (!connection_is_listener(conn)) { log(severity,LD_GENERAL, - "Conn %d is to '%s:%d'.",i,safe_str(conn->address), conn->port); + "Conn %d is to '%s:%d'.", i, + escaped_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, |