diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-07-23 15:58:30 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-07-23 15:58:30 +0000 |
| commit | 2748afe60961596791bceb842dce2385c5b4db7e (patch) | |
| tree | e3538b4e13a1a62d607faba062cc21f158017f56 /src/or/cpuworker.c | |
| parent | 15b2b8bd69ff30a85c2364bcc528090b36aa9286 (diff) | |
| download | tor-2748afe60961596791bceb842dce2385c5b4db7e.tar.gz tor-2748afe60961596791bceb842dce2385c5b4db7e.zip | |
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/cpuworker.c')
| -rw-r--r-- | src/or/cpuworker.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 50446f190f..e56d2787f3 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -63,7 +63,7 @@ connection_cpu_finished_flushing(connection_t *conn) /** Pack addr,port,and circ_id; set *tag to the result. (See note on * cpuworker_main for wire format.) */ static void -tag_pack(char *tag, uint32_t addr, uint16_t port, uint16_t circ_id) +tag_pack(char *tag, uint32_t addr, uint16_t port, circid_t circ_id) { *(uint32_t *)tag = addr; *(uint16_t *)(tag+4) = port; @@ -73,7 +73,7 @@ tag_pack(char *tag, uint32_t addr, uint16_t port, uint16_t circ_id) /** Unpack <b>tag</b> into addr, port, and circ_id. */ static void -tag_unpack(const char *tag, uint32_t *addr, uint16_t *port, uint16_t *circ_id) +tag_unpack(const char *tag, uint32_t *addr, uint16_t *port, circid_t *circ_id) { struct in_addr in; char addrbuf[INET_NTOA_BUF_LEN]; @@ -137,7 +137,7 @@ connection_cpu_process_inbuf(connection_t *conn) char buf[LEN_ONION_RESPONSE]; uint32_t addr; uint16_t port; - uint16_t circ_id; + circid_t circ_id; or_connection_t *p_conn; circuit_t *circ; |