diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-08 15:15:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-08 15:16:02 -0400 |
| commit | d229025fefa6faa228d9154e391293d9d5b320d3 (patch) | |
| tree | cf63fafc6a235832ba9c29daef53e8b75a67da28 /src/or/control.h | |
| parent | f551a053e35a937da2e01d382639e79f1e6d2369 (diff) | |
| download | tor-d229025fefa6faa228d9154e391293d9d5b320d3.tar.gz tor-d229025fefa6faa228d9154e391293d9d5b320d3.zip | |
Expand the event_mask field in controller conns to 64 bits
Back in 078d6bcd, we added an event number 0x20, but we didn't make
the event_mask field big enough to compensate.
Patch by "teor". Fixes 13085; bugfix on 0.2.5.1-alpha.
Diffstat (limited to 'src/or/control.h')
| -rw-r--r-- | src/or/control.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/control.h b/src/or/control.h index 68a6c244d0..494f04b3bd 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -156,8 +156,8 @@ void control_free_all(void); #define EVENT_TRANSPORT_LAUNCHED 0x0020 #define EVENT_HS_DESC 0x0021 #define EVENT_MAX_ 0x0021 -/* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a - * different structure. */ +/* If EVENT_MAX_ ever hits 0x003F, we need to make the mask into a + * different structure, as it can only handle a maximum left shift of 1<<63. */ /* Used only by control.c and test.c */ STATIC size_t write_escaped_data(const char *data, size_t len, char **out); |