diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-08 10:53:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-08 10:53:19 -0400 |
| commit | fca222f0ce6e7fb354c3a6e0b3950d1985b59f82 (patch) | |
| tree | 2e890fe305e37c547d4f361729427aef4b60c0e7 | |
| parent | aa42f941dc58ff7554e31dc6f15e4d23f639f351 (diff) | |
| download | tor-fca222f0ce6e7fb354c3a6e0b3950d1985b59f82.tar.gz tor-fca222f0ce6e7fb354c3a6e0b3950d1985b59f82.zip | |
be more consistent in using streamid_t
| -rw-r--r-- | src/or/relay.c | 8 | ||||
| -rw-r--r-- | src/or/relay.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index d0986c8d4e..0d51ea4060 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -366,7 +366,7 @@ relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, static int circuit_package_relay_cell(cell_t *cell, circuit_t *circ, cell_direction_t cell_direction, - crypt_path_t *layer_hint, uint16_t on_stream) + crypt_path_t *layer_hint, streamid_t on_stream) { or_connection_t *conn; /* where to send the cell */ @@ -537,7 +537,7 @@ relay_command_to_string(uint8_t command) * return 0. */ int -relay_send_command_from_edge(uint16_t stream_id, circuit_t *circ, +relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, uint8_t relay_command, const char *payload, size_t payload_len, crypt_path_t *cpath_layer) { @@ -2109,7 +2109,7 @@ connection_or_unlink_all_active_circs(or_connection_t *orconn) */ static int set_streams_blocked_on_circ(circuit_t *circ, or_connection_t *orconn, - int block, uint16_t stream_id) + int block, streamid_t stream_id) { edge_connection_t *edge = NULL; int n = 0; @@ -2293,7 +2293,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, void append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn, cell_t *cell, cell_direction_t direction, - uint16_t fromstream) + streamid_t fromstream) { cell_queue_t *queue; int streams_blocked; diff --git a/src/or/relay.h b/src/or/relay.h index 088ef3228a..0ef17b6ffd 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -46,7 +46,7 @@ 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, cell_t *cell, cell_direction_t direction, - uint16_t fromstream); + 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); |