diff options
author | Roger Dingledine <arma@torproject.org> | 2005-05-03 10:17:38 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2005-05-03 10:17:38 +0000 |
commit | 6ea839265d5c1f9e03442b79f149644e3f9d997c (patch) | |
tree | 59a46dc4dbbfbb501efbd132887dd4c4b22d8da1 | |
parent | 87850c47b06942daf278d9bbb790f306978ebfde (diff) | |
download | tor-6ea839265d5c1f9e03442b79f149644e3f9d997c.tar.gz tor-6ea839265d5c1f9e03442b79f149644e3f9d997c.zip |
remove archaic debugging aid that was probably unsafe
svn:r4176
-rw-r--r-- | src/or/connection_edge.c | 2 | ||||
-rw-r--r-- | src/or/or.h | 1 | ||||
-rw-r--r-- | src/or/relay.c | 12 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 1c86bbcd4d..bb2bb02e2e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -76,7 +76,7 @@ int connection_edge_reached_eof(connection_t *conn) { /* it still has stuff to process. don't let it die yet. */ return 0; } - log_fn(LOG_INFO,"conn (fd %d) reached eof (stream size %d). Closing.", conn->s, (int)conn->stream_size); + log_fn(LOG_INFO,"conn (fd %d) reached eof. Closing.", conn->s); if (!conn->marked_for_close) { /* only mark it if not already marked. it's possible to * get the 'end' right around when the client hangs up on us. */ diff --git a/src/or/or.h b/src/or/or.h index 32c82d70f9..bc3e8c1a72 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -614,7 +614,6 @@ struct connection_t { * querying for? (DIR/AP only) */ /* Used only by edge connections: */ - size_t stream_size; /**< Used for debugging. */ uint16_t stream_id; struct connection_t *next_stream; /**< Points to the next stream at this * edge, if any (Edge only). */ diff --git a/src/or/relay.c b/src/or/relay.c index 631c1ccf49..32e8f6b8f4 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -827,10 +827,6 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } stats_n_data_bytes_received += rh.length; - if (conn->type == CONN_TYPE_AP) { - conn->stream_size += rh.length; - log_fn(LOG_DEBUG,"%d: stream size now %d.", conn->s, (int)conn->stream_size); - } connection_write_to_buf(cell->payload + RELAY_HEADER_SIZE, rh.length, conn); connection_edge_consider_sending_sendme(conn); @@ -843,11 +839,11 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, return 0; } /* XXX add to this log_fn the exit node's nickname? */ - log_fn(LOG_INFO,"%d: end cell (%s) for stream %d. Removing stream. Size %d.", + log_fn(LOG_INFO,"%d: end cell (%s) for stream %d. Removing stream.", conn->s, connection_edge_end_reason_str(rh.length > 0 ? *(char *)(cell->payload+RELAY_HEADER_SIZE) : -1), - conn->stream_id, (int)conn->stream_size); + conn->stream_id); if (conn->socks_request && !conn->socks_request->has_finished) log_fn(LOG_WARN,"Bug: open stream hasn't sent socks answer yet? Closing."); #ifdef HALF_OPEN @@ -1044,10 +1040,6 @@ repeat_connection_edge_package_raw_inbuf: log_fn(LOG_DEBUG,"(%d) Packaging %d bytes (%d waiting).", conn->s, (int)length, (int)buf_datalen(conn->inbuf)); - if (conn->type == CONN_TYPE_EXIT) { - conn->stream_size += length; - log_fn(LOG_DEBUG,"%d: Stream size now %d.", conn->s, (int)conn->stream_size); - } if (connection_edge_send_command(conn, circ, RELAY_COMMAND_DATA, payload, length, conn->cpath_layer) < 0) |