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/relay.h | |
| 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/relay.h')
| -rw-r--r-- | src/or/relay.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/relay.h b/src/or/relay.h index a41465521a..7f96d59d15 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -41,6 +41,9 @@ void free_cell_pool(void); void clean_cell_pool(void); void dump_cell_pool_usage(int severity); +/* For channeltls.c */ +void packed_cell_free(packed_cell_t *cell); + void cell_queue_clear(cell_queue_t *queue); void cell_queue_append(cell_queue_t *queue, packed_cell_t *cell); void cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell); @@ -49,9 +52,8 @@ void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, cell_t *cell, cell_direction_t direction, streamid_t fromstream); void channel_unlink_all_active_circs(channel_t *chan); -int channel_flush_from_first_active_circuit(channel_t *conn, - int max, time_t now); -void assert_active_circuits_ok(or_connection_t *orconn); +int channel_flush_from_first_active_circuit(channel_t *chan, int max); +void assert_active_circuits_ok(channel_t *chan); void make_circuit_inactive_on_chan(circuit_t *circ, channel_t *chan); void make_circuit_active_on_chan(circuit_t *circ, channel_t *chan); |