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

Add a macro to simplify control_update_global_event_mask().

This commit is contained in:
Nick Mathewson 2018-05-07 16:35:52 -04:00
parent 61d5ce83a1
commit 79b38081e9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/control.c
View File

@ -288,10 +288,13 @@ control_update_global_event_mask(void)
* we want to hear...*/ * we want to hear...*/
control_adjust_event_log_severity(); control_adjust_event_log_severity();
/* Macro: true if ev was false before and is true now. */
#define NEWLY_ENABLED(ev) \
(! (old_mask & (ev)) && (new_mask & (ev)))
/* ...then, if we've started logging stream or circ bw, clear the /* ...then, if we've started logging stream or circ bw, clear the
* appropriate fields. */ * appropriate fields. */
if (! (old_mask & EVENT_STREAM_BANDWIDTH_USED) && if (NEWLY_ENABLED(EVENT_STREAM_BANDWIDTH_USED)) {
(new_mask & EVENT_STREAM_BANDWIDTH_USED)) {
SMARTLIST_FOREACH(conns, connection_t *, conn, SMARTLIST_FOREACH(conns, connection_t *, conn,
{ {
if (conn->type == CONN_TYPE_AP) { if (conn->type == CONN_TYPE_AP) {
@ -300,10 +303,10 @@ control_update_global_event_mask(void)
} }
}); });
} }
if (! (old_mask & EVENT_CIRC_BANDWIDTH_USED) && if (NEWLY_ENABLED(EVENT_CIRC_BANDWIDTH_USED)) {
(new_mask & EVENT_CIRC_BANDWIDTH_USED)) {
clear_circ_bw_fields(); clear_circ_bw_fields();
} }
#undef NEWLY_ENABLED
} }
/** Adjust the log severities that result in control_event_logmsg being called /** Adjust the log severities that result in control_event_logmsg being called