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/command.c | |
| parent | 5fcc5dfa779fcdc84cb7249749b7fbb782f15a10 (diff) | |
| parent | 076654ce8423d2b8ab7285b22c13d4002942bd8b (diff) | |
| download | tor-d6634001c9063323643e3ddfe8905c250a6d60d7.tar tor-d6634001c9063323643e3ddfe8905c250a6d60d7.tar.gz | |
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/command.c')
| -rw-r--r-- | src/or/command.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/command.c b/src/or/command.c index 09313b48a..dfe4f6591 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -231,7 +231,10 @@ command_process_create_cell(cell_t *cell, channel_t *chan) /* If the high bit of the circuit ID is not as expected, close the * circ. */ - id_is_high = cell->circ_id & (1<<15); + if (chan->wide_circ_ids) + id_is_high = cell->circ_id & (1u<<31); + else + id_is_high = cell->circ_id & (1u<<15); if ((id_is_high && chan->circ_id_type == CIRC_ID_TYPE_HIGHER) || (!id_is_high && |