diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-08-08 06:02:47 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-08 03:04:58 -0700 |
| commit | 32337502f11e6c84e4db8591f5f81c4fc6d1da58 (patch) | |
| tree | f707ae06db7501613b9bc5975a4c9b0fc0c04923 /src/or/relay.h | |
| parent | 15303c32ec9d84aff8de5ed9df28e779c36c6e5c (diff) | |
| download | tor-32337502f11e6c84e4db8591f5f81c4fc6d1da58.tar.gz tor-32337502f11e6c84e4db8591f5f81c4fc6d1da58.zip | |
Use channel_t rather than or_connection_t for circuits
Diffstat (limited to 'src/or/relay.h')
| -rw-r--r-- | src/or/relay.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/relay.h b/src/or/relay.h index 41675e2106..a41465521a 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -45,15 +45,15 @@ 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); -void append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn, +void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, cell_t *cell, cell_direction_t direction, streamid_t fromstream); -void connection_or_unlink_all_active_circs(or_connection_t *conn); -int connection_or_flush_from_first_active_circuit(or_connection_t *conn, - int max, time_t now); +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); -void make_circuit_inactive_on_conn(circuit_t *circ, or_connection_t *conn); -void make_circuit_active_on_conn(circuit_t *circ, or_connection_t *conn); +void make_circuit_inactive_on_chan(circuit_t *circ, channel_t *chan); +void make_circuit_active_on_chan(circuit_t *circ, channel_t *chan); 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, @@ -62,7 +62,7 @@ const uint8_t *decode_address_from_payload(tor_addr_t *addr_out, unsigned cell_ewma_get_tick(void); void cell_ewma_set_scale_factor(const or_options_t *options, const networkstatus_t *consensus); -void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn); +void circuit_clear_cell_queue(circuit_t *circ, channel_t *chan); #ifdef RELAY_PRIVATE int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, |