diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-14 09:34:51 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-24 07:49:39 -0500 |
| commit | 63b7dabdea6c25cba6604af5d9340799636985b3 (patch) | |
| tree | fe84c023f3a5474fbffd6e9005621632f4772499 /src/core/or/orconn_event.c | |
| parent | 2e5d555c0e4adb5ea4739ec58124f61c46bd20aa (diff) | |
| download | tor-63b7dabdea6c25cba6604af5d9340799636985b3.tar.gz tor-63b7dabdea6c25cba6604af5d9340799636985b3.zip | |
Merge ocirc and orconn events into or subsystem.
Pubsub events are not supposed to have their own subsystems; they're
supposed to be part of a parent subsystem.
Diffstat (limited to 'src/core/or/orconn_event.c')
| -rw-r--r-- | src/core/or/orconn_event.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/core/or/orconn_event.c b/src/core/or/orconn_event.c index 7ed6b5fdfa..c30e2dd22f 100644 --- a/src/core/or/orconn_event.c +++ b/src/core/or/orconn_event.c @@ -22,7 +22,7 @@ #define ORCONN_EVENT_PRIVATE #include "core/or/orconn_event.h" -#include "core/or/orconn_event_sys.h" +#include "core/or/or_sys.h" DECLARE_PUBLISH(orconn_state); DECLARE_PUBLISH(orconn_status); @@ -65,7 +65,7 @@ static dispatch_typefns_t orconn_status_fns = { .fmt_fn = orconn_status_fmt, }; -static int +int orconn_add_pubsub(struct pubsub_connector_t *connector) { if (DISPATCH_REGISTER_TYPE(connector, orconn_state, &orconn_state_fns)) @@ -90,10 +90,3 @@ orconn_status_publish(orconn_status_msg_t *msg) { PUBLISH(orconn_status, msg); } - -const subsys_fns_t sys_orconn_event = { - .name = "orconn_event", - .supported = true, - .level = 22, - .add_pubsub = orconn_add_pubsub, -}; |