diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-08-25 14:30:01 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-08 03:05:26 -0700 |
| commit | e136f7ccb4e671e33b6c92a48df819082291f5c1 (patch) | |
| tree | 58dbe2e07da551675233ecde2155f480cc0576bc /src/or/connection.c | |
| parent | 4768c0efe3e9471cc367c3740d1a4ba0ab79626c (diff) | |
| download | tor-e136f7ccb4e671e33b6c92a48df819082291f5c1.tar.gz tor-e136f7ccb4e671e33b6c92a48df819082291f5c1.zip | |
Convert relay.c/relay.h to channel_t
Note: this is a squashed commit; see branch bug6465_rebased_v2 of user/andrea/tor.git for full history of the following 10 commits:
Convert relay.c/relay.h to channel_t
Updating the timestamp if n_flushed > 0 at the end of channel_flush_from_first_active_circuit() was redundant since channel_write_cell() et al. do it themselves.
Get rid of now-unnecessary time parameter in channel_flush_from_first_active_circuit()
Get rid of now-unnecessary time parameter in channel_flush_from_first_active_circuit() in connection_or.c
Add non-inlined external call for channeltls.c to free a packed_cell_t
Appease make check-spaces in relay.c
Replace channel_get_write_queue_len() with sufficient and easier to implement channel_has_queued_writes() in relay.c
Rename channel_touched_by_client() and client_used field for consistency with other timestamps in relay.c
Don't double-free packed cells in relay.c (channel_t Tor now bootstraps and works as a client)
Rearrange channel_t struct to use a union distinguishing listener from cell-bearing channels in relay.c
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 8e9c70191d..db234f1cb1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -265,9 +265,6 @@ or_connection_new(int socket_family) or_conn->timestamp_last_added_nonpadding = time(NULL); - or_conn->active_circuit_pqueue = smartlist_new(); - or_conn->active_circuit_pqueue_last_recalibrated = cell_ewma_get_tick(); - return or_conn; } @@ -508,7 +505,6 @@ _connection_free(connection_t *conn) or_conn->tls = NULL; or_handshake_state_free(or_conn->handshake_state); or_conn->handshake_state = NULL; - smartlist_free(or_conn->active_circuit_pqueue); tor_free(or_conn->nickname); } if (conn->type == CONN_TYPE_AP) { |