diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:40:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:40:10 -0500 |
| commit | 920208776052d2130557359a0a8077406c60dd21 (patch) | |
| tree | 49daf7edfca0ac68f9f03a04d10ca874f3206976 /src/or/relay.h | |
| parent | 428f8a375b8846edd1a056ce66f00fe08117a4ba (diff) | |
| parent | cd1f708a7f44ab305c9fcda0060f55f075b98362 (diff) | |
| download | tor-920208776052d2130557359a0a8077406c60dd21.tar.gz tor-920208776052d2130557359a0a8077406c60dd21.zip | |
Merge branch 'bug24666_squashed_025' into maint-0.2.5
Diffstat (limited to 'src/or/relay.h')
| -rw-r--r-- | src/or/relay.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/relay.h b/src/or/relay.h index 969c6fb61d..9d160b7b94 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -63,6 +63,13 @@ void cell_queue_append_packed_copy(circuit_t *circ, cell_queue_t *queue, void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, cell_t *cell, cell_direction_t direction, streamid_t fromstream); + +void destroy_cell_queue_init(destroy_cell_queue_t *queue); +void destroy_cell_queue_clear(destroy_cell_queue_t *queue); +void destroy_cell_queue_append(destroy_cell_queue_t *queue, + circid_t circid, + uint8_t reason); + void channel_unlink_all_circuits(channel_t *chan, smartlist_t *detached_out); int channel_flush_from_first_active_circuit(channel_t *chan, int max); void assert_circuit_mux_okay(channel_t *chan); @@ -101,6 +108,7 @@ STATIC int connection_edge_process_resolved_cell(edge_connection_t *conn, const relay_header_t *rh); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); +STATIC destroy_cell_t *destroy_cell_queue_pop(destroy_cell_queue_t *queue); STATIC size_t cell_queues_get_total_allocation(void); STATIC int cell_queues_check_size(void); #endif |