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.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/core/or/or_sys.c b/src/core/or/or_sys.c
index 394b7945e1..126f5448cf 100644
--- a/src/core/or/or_sys.c
+++ b/src/core/or/or_sys.c
@@ -34,10 +34,22 @@ subsys_or_shutdown(void)
   policies_free_all();
 }
 
+static int
+subsys_or_add_pubsub(struct pubsub_connector_t *connector)
+{
+  int rv = 0;
+  if (orconn_add_pubsub(connector) < 0)
+    rv = -1;
+  if (ocirc_add_pubsub(connector) < 0)
+    rv = -1;
+  return rv;
+}
+
 const struct subsys_fns_t sys_or = {
   .name = "or",
   .supported = true,
   .level = 20,
   .initialize = subsys_or_initialize,
   .shutdown = subsys_or_shutdown,
+  .add_pubsub = subsys_or_add_pubsub,
 };