nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make the bwauth.c module dirauth-only.

Browse Source
This commit is contained in:
Nick Mathewson 2019-04-30 12:48:00 -04:00
parent 6f42efaa59
commit 31fb4a7845
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/config/config.c
View File

@ -3556,12 +3556,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
options->V3AuthoritativeDir)) options->V3AuthoritativeDir))
REJECT("AuthoritativeDir is set, but none of " REJECT("AuthoritativeDir is set, but none of "
"(Bridge/V3)AuthoritativeDir is set."); "(Bridge/V3)AuthoritativeDir is set.");
#ifdef HAVE_MODULE_DIRAUTH
/* If we have a v3bandwidthsfile and it's broken, complain on startup */ /* If we have a v3bandwidthsfile and it's broken, complain on startup */
if (options->V3BandwidthsFile && !old_options) { if (options->V3BandwidthsFile && !old_options) {
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL, dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL,
NULL); NULL);
} }
#ifdef HAVE_MODULE_DIRAUTH
/* same for guardfraction file */ /* same for guardfraction file */
if (options->GuardfractionFile && !old_options) { if (options->GuardfractionFile && !old_options) {
dirserv_read_guardfraction_file(options->GuardfractionFile, NULL); dirserv_read_guardfraction_file(options->GuardfractionFile, NULL);

1
src/app/main/shutdown.c
View File

@ -128,7 +128,6 @@ tor_free_all(int postfork)
networkstatus_free_all(); networkstatus_free_all();
addressmap_free_all(); addressmap_free_all();
dirserv_free_all(); dirserv_free_all();
dirserv_clear_measured_bw_cache();
rend_cache_free_all(); rend_cache_free_all();
rend_service_authorization_free_all(); rend_service_authorization_free_all();
rep_hist_free_all(); rep_hist_free_all();

7
src/core/include.am
View File

@ -150,12 +150,6 @@ LIBTOR_APP_A_SOURCES = \
src/feature/stats/rephist.c \ src/feature/stats/rephist.c \
src/feature/stats/predict_ports.c src/feature/stats/predict_ports.c
# These should eventually move into module_dirauth_sources, but for now
# the separation is only in the code location.
LIBTOR_APP_A_SOURCES += \
src/feature/dirauth/bwauth.c
if BUILD_NT_SERVICES if BUILD_NT_SERVICES
LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c
endif endif
@ -172,6 +166,7 @@ LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES)
MODULE_DIRAUTH_SOURCES = \ MODULE_DIRAUTH_SOURCES = \
src/feature/dirauth/authmode.c \ src/feature/dirauth/authmode.c \
src/feature/dirauth/bridgeauth.c \ src/feature/dirauth/bridgeauth.c \
src/feature/dirauth/bwauth.c \
src/feature/dirauth/dirauth_periodic.c \ src/feature/dirauth/dirauth_periodic.c \
src/feature/dirauth/dirauth_sys.c \ src/feature/dirauth/dirauth_sys.c \
src/feature/dirauth/dircollate.c \ src/feature/dirauth/dircollate.c \

2
src/feature/dirauth/dirauth_sys.c
View File

@ -6,6 +6,7 @@
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/dirauth/bwauth.h"
#include "feature/dirauth/dirauth_sys.h" #include "feature/dirauth/dirauth_sys.h"
#include "feature/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "feature/dirauth/dirauth_periodic.h" #include "feature/dirauth/dirauth_periodic.h"
@ -25,6 +26,7 @@ subsys_dirauth_shutdown(void)
{ {
dirserv_free_fingerprint_list(); dirserv_free_fingerprint_list();
dirvote_free_all(); dirvote_free_all();
dirserv_clear_measured_bw_cache();
} }
const struct subsys_fns_t sys_dirauth = { const struct subsys_fns_t sys_dirauth = {