nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert junk accidentally included with "start folding in the changes entries"

Browse Source 
Looks like Roger's debugging code wanted to take a tour of the world
outside his sandbox.

This reverts part of commit 19d3720236.
This commit is contained in:
Nick Mathewson 2013-01-14 14:41:59 -05:00
parent cb24852ec5
commit 47122d1d25
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/connection.c
View File

@ -1245,7 +1245,6 @@ connection_handle_listener_read(connection_t *conn, int new_type)
if (!SOCKET_OK(news)) { /* accept() error */ if (!SOCKET_OK(news)) { /* accept() error */
int e = tor_socket_errno(conn->s); int e = tor_socket_errno(conn->s);
if (ERRNO_IS_ACCEPT_EAGAIN(e)) { if (ERRNO_IS_ACCEPT_EAGAIN(e)) {
log_notice(LD_APP, "he hung up before we could accept(). that's fine.");
return 0; /* he hung up before we could accept(). that's fine. */ return 0; /* he hung up before we could accept(). that's fine. */
} else if (ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e)) { } else if (ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e)) {
warn_too_many_conns(); warn_too_many_conns();
@ -1257,7 +1256,7 @@ connection_handle_listener_read(connection_t *conn, int new_type)
connection_mark_for_close(conn); connection_mark_for_close(conn);
return -1; return -1;
} }
log_notice(LD_NET, log_debug(LD_NET,
"Connection accepted on socket %d (child of fd %d).", "Connection accepted on socket %d (child of fd %d).",
(int)news,(int)conn->s); (int)news,(int)conn->s);

8
src/or/relay.c
View File

@ -1619,14 +1619,6 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial,
conn->base_.s, conn->base_.s,
(int)length, (int)connection_get_inbuf_len(TO_CONN(conn))); (int)length, (int)connection_get_inbuf_len(TO_CONN(conn)));
if (conn->base_.type == CONN_TYPE_AP) {
char *text = tor_memdup(payload, length+1);
text[length] = 0;
log_notice(LD_APP, "Incoming socks text (%d):===\n%s\n===",
conn->base_.s, text);
tor_free(text);
}
if (sending_optimistically && !sending_from_optimistic) { if (sending_optimistically && !sending_from_optimistic) {
/* This is new optimistic data; remember it in case we need to detach and /* This is new optimistic data; remember it in case we need to detach and
retry */ retry */