diff options
| author | Andrea Shepard <andrea@torproject.org> | 2012-09-21 14:46:22 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-10 00:40:06 -0700 |
| commit | b208539b8047a12fb2f1f794c9932fddd577dfdb (patch) | |
| tree | 1957c7d570f9bb2020324661b39acfe23de85609 /src/or/relay.h | |
| parent | c684076fc7f685d6e0cd97f426d1474749f1da8b (diff) | |
| download | tor-b208539b8047a12fb2f1f794c9932fddd577dfdb.tar.gz tor-b208539b8047a12fb2f1f794c9932fddd577dfdb.zip | |
Use circuitmux_t in channels and when relaying cells
Diffstat (limited to 'src/or/relay.h')
| -rw-r--r-- | src/or/relay.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/relay.h b/src/or/relay.h index 7f96d59d15..ef5074bbe4 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -51,11 +51,10 @@ void cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell); 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); +void channel_unlink_all_circuits(channel_t *chan); 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); +void assert_circuit_mux_okay(channel_t *chan); +void update_circuit_on_cmux(circuit_t *circ, cell_direction_t direction); int append_address_to_payload(uint8_t *payload_out, const tor_addr_t *addr); const uint8_t *decode_address_from_payload(tor_addr_t *addr_out, |