commit 69312c7a8430479847ceae5f0db44f19bcd0a6f4 Author: Nick Mathewson nickm@torproject.org Date: Sun Aug 25 10:38:20 2013 -0400
Widen event_mask_t to 64 bits --- src/or/control.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/or/control.c b/src/or/control.c index 37bbab4..7bab440 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -84,7 +84,8 @@ #define EVENT_CONF_CHANGED 0x0019 #define EVENT_TRANSPORT_LAUNCHED 0x0020 #define EVENT_MAX_ 0x0020 -/* If EVENT_MAX_ ever hits 0x0020, we need to make the mask wider. */ +/* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a + * different structure. */
/** Bitfield: The bit 1<<e is set if <b>any</b> open control * connection is interested in events of type <b>e</b>. We use this @@ -92,7 +93,7 @@ * has interest in without having to walk over the global connection * list to find out. **/ -typedef uint32_t event_mask_t; +typedef uint64_t event_mask_t;
/** An event mask of all the events that any controller is interested in * receiving. */ @@ -104,7 +105,7 @@ static int disable_log_messages = 0; /** Macro: true if any control connection is interested in events of type * <b>e</b>. */ #define EVENT_IS_INTERESTING(e) \ - (global_event_mask & (1<<(e))) + (!! (global_event_mask & (((uint64_t)1)<<(e))))
/** If we're using cookie-type authentication, how long should our cookies be? */