aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-07-23 15:58:30 +0000
committerNick Mathewson <nickm@torproject.org>2008-07-23 15:58:30 +0000
commit2748afe60961596791bceb842dce2385c5b4db7e (patch)
treee3538b4e13a1a62d607faba062cc21f158017f56 /src/or/connection_edge.c
parent15b2b8bd69ff30a85c2364bcc528090b36aa9286 (diff)
downloadtor-2748afe60961596791bceb842dce2385c5b4db7e.tar
tor-2748afe60961596791bceb842dce2385c5b4db7e.tar.gz
r17322@aud-055: nickm | 2008-07-23 16:50:50 +0200
Make circid_t and streamid_t get used instead of uint16_t; it is possible we will soon want to make circid_t change to uint32_t. svn:r16155
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index aee22eb0c..5b1b5b824 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -153,7 +153,7 @@ connection_edge_process_inbuf(edge_connection_t *conn, int package_partial)
* Mark it for close and return 0.
*/
int
-connection_edge_destroy(uint16_t circ_id, edge_connection_t *conn)
+connection_edge_destroy(circid_t circ_id, edge_connection_t *conn)
{
if (!conn->_base.marked_for_close) {
log_info(LD_EDGE,
@@ -1944,11 +1944,11 @@ connection_ap_process_natd(edge_connection_t *conn)
/** Iterate over the two bytes of stream_id until we get one that is not
* already in use; return it. Return 0 if can't get a unique stream_id.
*/
-static uint16_t
+static streamid_t
get_unique_stream_id_by_circ(origin_circuit_t *circ)
{
edge_connection_t *tmpconn;
- uint16_t test_stream_id;
+ streamid_t test_stream_id;
uint32_t attempts=0;
again: