diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-02-01 22:41:03 +0000 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@torproject.org> | 2023-04-06 15:57:11 +0000 |
| commit | 336a24754d117b46793ce6824e35ff6b7962bf9d (patch) | |
| tree | 3a90d62ddcb498713ef9fb13169a0240b3da553c /src/app | |
| parent | 2f865b4bba1bedc96f17b696916d74c392c83e1b (diff) | |
| download | tor-336a24754d117b46793ce6824e35ff6b7962bf9d.tar.gz tor-336a24754d117b46793ce6824e35ff6b7962bf9d.zip | |
Prop#329 Pool: Handle linking, unlinking, and relaunching conflux circuit legs.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main/shutdown.c | 2 | ||||
| -rw-r--r-- | src/app/main/subsystem_list.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index a6065db5da..b3f1c6d058 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -23,6 +23,7 @@ #include "core/or/circuitlist.h" #include "core/or/circuitmux_ewma.h" #include "core/or/circuitpadding.h" +#include "core/or/conflux_pool.h" #include "core/or/connection_edge.h" #include "core/or/dos.h" #include "core/or/scheduler.h" @@ -120,6 +121,7 @@ tor_free_all(int postfork) rep_hist_free_all(); bwhist_free_all(); circuit_free_all(); + conflux_pool_free_all(); circpad_machines_free(); entry_guards_free_all(); pt_free_all(); diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 0333077164..4a66e21a79 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -14,6 +14,7 @@ #include "lib/cc/torint.h" #include "core/mainloop/mainloop_sys.h" +#include "core/or/conflux_sys.h" #include "core/or/dos_sys.h" #include "core/or/or_sys.h" #include "feature/control/btrack_sys.h" @@ -64,6 +65,7 @@ const subsys_fns_t *tor_subsystems[] = { &sys_process, &sys_mainloop, + &sys_conflux, &sys_or, &sys_dos, |