diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-15 16:23:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-15 16:23:43 -0500 |
| commit | d6634001c9063323643e3ddfe8905c250a6d60d7 (patch) | |
| tree | 7efa13432f31719ec5b4446f4ed00d0d4d34cd51 /src/or/cpuworker.c | |
| parent | 5fcc5dfa779fcdc84cb7249749b7fbb782f15a10 (diff) | |
| parent | 076654ce8423d2b8ab7285b22c13d4002942bd8b (diff) | |
| download | tor-d6634001c9063323643e3ddfe8905c250a6d60d7.tar.gz tor-d6634001c9063323643e3ddfe8905c250a6d60d7.zip | |
Merge remote-tracking branch 'public/wide_circ_ids'
Conflicts:
src/or/channel.h
src/or/connection_or.c
src/or/cpuworker.c
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 444f17cd41..af5f91a623 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -31,7 +31,7 @@ #define MIN_CPUWORKERS 1 /** The tag specifies which circuit this onionskin was from. */ -#define TAG_LEN 10 +#define TAG_LEN 12 /** How many cpuworkers we have running right now. */ static int num_cpuworkers=0; @@ -72,7 +72,7 @@ tag_pack(uint8_t *tag, uint64_t chan_id, circid_t circ_id) /*XXXX RETHINK THIS WHOLE MESS !!!! !NM NM NM NM*/ /*XXXX DOUBLEPLUSTHIS!!!! AS AS AS AS*/ set_uint64(tag, chan_id); - set_uint16(tag+8, circ_id); + set_uint32(tag+8, circ_id); } /** Unpack <b>tag</b> into addr, port, and circ_id. @@ -81,7 +81,7 @@ static void tag_unpack(const uint8_t *tag, uint64_t *chan_id, circid_t *circ_id) { *chan_id = get_uint64(tag); - *circ_id = get_uint16(tag+8); + *circ_id = get_uint32(tag+8); } /** Magic numbers to make sure our cpuworker_requests don't grow any |