summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-03-11 16:57:33 -0400
committerNick Mathewson <nickm@torproject.org>2019-03-25 16:35:34 -0400
commitb4f28b9df8188af82a0140b1831ee4b50c6e4f6d (patch)
treeb338752be4ca5142a0d032bf6d633e05f87b4cda /src/app
parent6d1abd37e27761bc3c92c398dbc03711fcf9e5c8 (diff)
downloadtor-b4f28b9df8188af82a0140b1831ee4b50c6e4f6d.tar.gz
tor-b4f28b9df8188af82a0140b1831ee4b50c6e4f6d.zip
pubsub: install libevent events separately from the_dispatcher.
Also, add documentation, and fix a free-on-error bug.
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 7bf9d3fe2b..e0f6352879 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1428,6 +1428,13 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
}
}
+ if (get_options()->command == CMD_RUN_TOR) {
+ tor_mainloop_connect_pubsub_events();
+ /* XXXX For each pubsub channel, its delivery strategy should be set at
+ * this XXXX point, using tor_mainloop_set_delivery_strategy().
+ */
+ }
+
if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) {
sandbox_cfg_t* cfg = sandbox_init_filter();