diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-05-15 23:23:18 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-05-15 23:23:18 +0300 |
| commit | 338cfb31798267dc8260415ef55ddceb042367bd (patch) | |
| tree | 9150b19e54cda807f1850109146aa1d2477eb8aa /src/app | |
| parent | 39a14421b1f50b4bea8c42e4f76a67b648bfa8e0 (diff) | |
| parent | 3c2648bbda53f74a4e960ad149600c3a2b12305c (diff) | |
| download | tor-338cfb31798267dc8260415ef55ddceb042367bd.tar.gz tor-338cfb31798267dc8260415ef55ddceb042367bd.zip | |
Merge branch 'tor-github/pr/1002'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main/shutdown.c | 15 | ||||
| -rw-r--r-- | src/app/main/subsystem_list.c | 7 |
2 files changed, 6 insertions, 16 deletions
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index c302ce455c..1871717ad5 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -25,10 +25,7 @@ #include "core/or/circuitpadding.h" #include "core/or/connection_edge.h" #include "core/or/dos.h" -#include "core/or/policies.h" -#include "core/or/protover.h" #include "core/or/scheduler.h" -#include "core/or/versions.h" #include "feature/client/addressmap.h" #include "feature/client/bridges.h" #include "feature/client/entrynodes.h" @@ -47,17 +44,13 @@ #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h" -#include "feature/relay/dns.h" #include "feature/relay/ext_orport.h" -#include "feature/relay/onion_queue.h" -#include "feature/relay/routerkeys.h" #include "feature/rend/rendcache.h" #include "feature/rend/rendclient.h" #include "feature/stats/geoip_stats.h" #include "feature/stats/rephist.h" #include "lib/evloop/compat_libevent.h" #include "lib/geoip/geoip.h" -#include "src/feature/relay/router.h" void evdns_shutdown(int); @@ -127,8 +120,6 @@ tor_free_all(int postfork) rend_cache_free_all(); rend_service_authorization_free_all(); rep_hist_free_all(); - dns_free_all(); - clear_pending_onions(); circuit_free_all(); circpad_machines_free(); entry_guards_free_all(); @@ -141,23 +132,17 @@ tor_free_all(int postfork) nodelist_free_all(); microdesc_free_all(); routerparse_free_all(); - ext_orport_free_all(); control_free_all(); - protover_free_all(); bridges_free_all(); consdiffmgr_free_all(); hs_free_all(); dos_free_all(); circuitmux_ewma_free_all(); accounting_free_all(); - protover_summary_cache_free_all(); if (!postfork) { config_free_all(); or_state_free_all(); - router_free_all(); - routerkeys_free_all(); - policies_free_all(); } if (!postfork) { #ifndef _WIN32 diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 00effe01aa..f595796232 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -10,19 +10,21 @@ #include "core/mainloop/mainloop_sys.h" #include "core/or/ocirc_event_sys.h" +#include "core/or/or_sys.h" #include "core/or/orconn_event_sys.h" #include "feature/control/btrack_sys.h" +#include "feature/relay/relay_sys.h" #include "lib/compress/compress_sys.h" #include "lib/crypt_ops/crypto_sys.h" #include "lib/err/torerr_sys.h" #include "lib/log/log_sys.h" #include "lib/net/network_sys.h" +#include "lib/process/process_sys.h" #include "lib/process/winprocess_sys.h" #include "lib/thread/thread_sys.h" #include "lib/time/time_sys.h" #include "lib/tls/tortls_sys.h" #include "lib/wallclock/wallclock_sys.h" -#include "lib/process/process_sys.h" #include "feature/dirauth/dirauth_sys.h" @@ -49,6 +51,9 @@ const subsys_fns_t *tor_subsystems[] = { &sys_btrack, /* -30 */ &sys_mainloop, /* 5 */ + &sys_or, /* 20 */ + + &sys_relay, /* 50 */ #ifdef HAVE_MODULE_DIRAUTH &sys_dirauth, /* 70 */ |