Browse Source

control: Mask the event(s) before using ANY_EVENT_IS_INTERESTING()

Before this commit, the control events were never triggered. It was introduced
with commit 0c19ce7bdece5906e035e71d3fb682632c8bb9cb.

Fixes #26082

Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet 6 years ago
parent
commit
51f65c185e
1 changed files with 6 additions and 6 deletions
  1. 6 6
      src/or/control.c

+ 6 - 6
src/or/control.c

@@ -115,7 +115,7 @@ static int disable_log_messages = 0;
 
 /** Macro: true if any event from the bitfield 'e' is interesting. */
 #define ANY_EVENT_IS_INTERESTING(e) \
-  EVENT_IS_INTERESTING(e)
+  (!! (global_event_mask & (e)))
 
 /** If we're using cookie-type authentication, how long should our cookies be?
  */
@@ -375,11 +375,11 @@ int
 control_any_per_second_event_enabled(void)
 {
   return ANY_EVENT_IS_INTERESTING(
-      EVENT_BANDWIDTH_USED |
-      EVENT_CELL_STATS |
-      EVENT_CIRC_BANDWIDTH_USED |
-      EVENT_CONN_BW |
-      EVENT_STREAM_BANDWIDTH_USED
+      EVENT_MASK_(EVENT_BANDWIDTH_USED) |
+      EVENT_MASK_(EVENT_CELL_STATS) |
+      EVENT_MASK_(EVENT_CIRC_BANDWIDTH_USED) |
+      EVENT_MASK_(EVENT_CONN_BW) |
+      EVENT_MASK_(EVENT_STREAM_BANDWIDTH_USED)
   );
 }