diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-01-14 13:34:59 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-01-14 13:34:59 -0500 |
| commit | 19d37202362c0298ae2f3954b0065ccfcef0dbda (patch) | |
| tree | 64f9a5b05b72d3ada50cd0d789ca7beac6aa5bfe /src/or | |
| parent | c9242f4fd4c0ae783946db77b9ecc6214d41bd72 (diff) | |
| download | tor-19d37202362c0298ae2f3954b0065ccfcef0dbda.tar tor-19d37202362c0298ae2f3954b0065ccfcef0dbda.tar.gz | |
start folding in the changes entries
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 3 | ||||
| -rw-r--r-- | src/or/relay.c | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 740462e7c..42ff7e1a0 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1245,6 +1245,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) if (!SOCKET_OK(news)) { /* accept() error */ int e = tor_socket_errno(conn->s); 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. */ } else if (ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e)) { warn_too_many_conns(); @@ -1256,7 +1257,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) connection_mark_for_close(conn); return -1; } - log_debug(LD_NET, + log_notice(LD_NET, "Connection accepted on socket %d (child of fd %d).", (int)news,(int)conn->s); diff --git a/src/or/relay.c b/src/or/relay.c index a942e4465..874aade21 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1619,6 +1619,14 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, conn->base_.s, (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) { /* This is new optimistic data; remember it in case we need to detach and retry */ |