diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-07-25 09:02:53 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-07-25 09:02:53 -0400 |
| commit | 2a4b156978c8f25c6c5850a393f27fcbfba5466a (patch) | |
| tree | 02704817b75e4b69500bb17668d526f37cf124e9 /src/feature | |
| parent | b2a6b52825cbe3925692bbb00214b0d460333d9a (diff) | |
| parent | 167d873bdec3354a74417473043b2e82b6723177 (diff) | |
| download | tor-2a4b156978c8f25c6c5850a393f27fcbfba5466a.tar.gz tor-2a4b156978c8f25c6c5850a393f27fcbfba5466a.zip | |
Merge branch 'tor-github/pr/1171' into maint-0.4.1
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/control/control_events.c | 2 | ||||
| -rw-r--r-- | src/feature/control/control_events.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index e596a8aee2..9e0966ca54 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1287,7 +1287,7 @@ enable_control_logging(void) /** We got a log message: tell any interested control connections. */ void -control_event_logmsg(int severity, uint32_t domain, const char *msg) +control_event_logmsg(int severity, log_domain_mask_t domain, const char *msg) { int event; diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 0bdbb9cfd2..34986fdb89 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -128,7 +128,8 @@ int control_event_circ_bandwidth_used_for_circ(origin_circuit_t *ocirc); int control_event_conn_bandwidth(connection_t *conn); int control_event_conn_bandwidth_used(void); int control_event_circuit_cell_stats(void); -void control_event_logmsg(int severity, uint32_t domain, const char *msg); +void control_event_logmsg(int severity, log_domain_mask_t domain, + const char *msg); void control_event_logmsg_pending(void); int control_event_descriptors_changed(smartlist_t *routers); int control_event_address_mapped(const char *from, const char *to, |