sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 0c19ce7bde.

Fixes #26082

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-05-11 08:58:11 -04:00
parent 9800f4769f
commit 51f65c185e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/control.c
View File

@ -115,7 +115,7 @@ static int disable_log_messages = 0;
/** Macro: true if any event from the bitfield 'e' is interesting. */ /** Macro: true if any event from the bitfield 'e' is interesting. */
#define ANY_EVENT_IS_INTERESTING(e) \ #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? /** 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) control_any_per_second_event_enabled(void)
{ {
return ANY_EVENT_IS_INTERESTING( return ANY_EVENT_IS_INTERESTING(
EVENT_BANDWIDTH_USED | EVENT_MASK_(EVENT_BANDWIDTH_USED) |
EVENT_CELL_STATS | EVENT_MASK_(EVENT_CELL_STATS) |
EVENT_CIRC_BANDWIDTH_USED | EVENT_MASK_(EVENT_CIRC_BANDWIDTH_USED) |
EVENT_CONN_BW | EVENT_MASK_(EVENT_CONN_BW) |
EVENT_STREAM_BANDWIDTH_USED EVENT_MASK_(EVENT_STREAM_BANDWIDTH_USED)
); );
} }