[tor-commits] [tor/master] control: Mask the event(s) before using ANY_EVENT_IS_INTERESTING()

[nickm at torproject.org]

commit 51f65c185ed88576ab15b66babcbdf3a6553ef71
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri May 11 08:58:11 2018 -0400

    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 at torproject.org>
---
 src/or/control.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/or/control.c b/src/or/control.c
index 237a8572d..6f87f5ab5 100644
--- a/src/or/control.c
+++ b/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)
   );
 }