aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-21 10:54:05 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-21 10:54:05 -0500
commitb8a3602b2a7114f2027d4a3af27520b109762efd (patch)
treedf95deb87231b22a49d9db3623c64f71b52ae598 /src/or/relay.h
parentbcc96c77de52ae7a8e73a6b139756e17f25e148d (diff)
parent84adb9fcca3d4e1954c1dd215a3e765c689d82b3 (diff)
downloadtor-b8a3602b2a7114f2027d4a3af27520b109762efd.tar.gz
tor-b8a3602b2a7114f2027d4a3af27520b109762efd.zip
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/relay.h')
-rw-r--r--src/or/relay.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/relay.h b/src/or/relay.h
index 95b8beb3b5..daf789c855 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -65,6 +65,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);
MOCK_DECL(int, channel_flush_from_first_active_circuit,
(channel_t *chan, int max));
@@ -106,6 +113,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 /* defined(RELAY_PRIVATE) */