summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-04-30 11:31:03 -0400
committerNick Mathewson <nickm@torproject.org>2019-04-30 15:00:07 -0400
commit857bfc70330f9e808c99310f1efbc3fb5738c4fb (patch)
treee82cf42a394a4f1bcde68465f28bd06f181abc87
parentaab02459243ef282849cd5015f3102a907ed1c17 (diff)
downloadtor-857bfc70330f9e808c99310f1efbc3fb5738c4fb.tar.gz
tor-857bfc70330f9e808c99310f1efbc3fb5738c4fb.zip
Make the process_descs.c module dirauth-only.
-rw-r--r--src/app/main/shutdown.c2
-rw-r--r--src/core/include.am2
-rw-r--r--src/feature/dirauth/dirauth_sys.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c
index 9239a0cf0f..fd9512ce4b 100644
--- a/src/app/main/shutdown.c
+++ b/src/app/main/shutdown.c
@@ -39,7 +39,6 @@
#include "feature/dirauth/bwauth.h"
#include "feature/dirauth/dirvote.h"
#include "feature/dirauth/keypin.h"
-#include "feature/dirauth/process_descs.h"
#include "feature/dirauth/shared_random.h"
#include "feature/dircache/consdiffmgr.h"
#include "feature/dircache/dirserv.h"
@@ -128,7 +127,6 @@ tor_free_all(int postfork)
routerlist_free_all();
networkstatus_free_all();
addressmap_free_all();
- dirserv_free_fingerprint_list();
dirserv_free_all();
dirserv_clear_measured_bw_cache();
rend_cache_free_all();
diff --git a/src/core/include.am b/src/core/include.am
index f3ba10a3df..02b90ba180 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -156,7 +156,6 @@ LIBTOR_APP_A_SOURCES += \
src/feature/dirauth/bwauth.c \
src/feature/dirauth/guardfraction.c \
src/feature/dirauth/reachability.c \
- src/feature/dirauth/process_descs.c \
src/feature/dirauth/voteflags.c
if BUILD_NT_SERVICES
@@ -179,6 +178,7 @@ MODULE_DIRAUTH_SOURCES = \
src/feature/dirauth/dircollate.c \
src/feature/dirauth/dirvote.c \
src/feature/dirauth/dsigs_parse.c \
+ src/feature/dirauth/process_descs.c \
src/feature/dirauth/recommend_pkg.c \
src/feature/dirauth/shared_random.c \
src/feature/dirauth/shared_random_state.c
diff --git a/src/feature/dirauth/dirauth_sys.c b/src/feature/dirauth/dirauth_sys.c
index bb482f2685..b87fa5dc29 100644
--- a/src/feature/dirauth/dirauth_sys.c
+++ b/src/feature/dirauth/dirauth_sys.c
@@ -9,6 +9,8 @@
#include "feature/dirauth/dirauth_sys.h"
#include "feature/dirauth/dirvote.h"
#include "feature/dirauth/dirauth_periodic.h"
+#include "feature/dirauth/process_descs.h"
+
#include "lib/subsys/subsys.h"
static int
@@ -21,6 +23,7 @@ subsys_dirauth_initialize(void)
static void
subsys_dirauth_shutdown(void)
{
+ dirserv_free_fingerprint_list();
dirvote_free_all();
}