diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-15 11:43:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:48:17 -0500 |
| commit | 773bcf56290674cdc157f6e39894d31b366f8c50 (patch) | |
| tree | 550b3336f71ae55ea335192c84cd88d87c702f2e /src/core | |
| parent | a1bc471dd477864105cc13e8ab69ebd05619ea9b (diff) | |
| download | tor-773bcf56290674cdc157f6e39894d31b366f8c50.tar.gz tor-773bcf56290674cdc157f6e39894d31b366f8c50.zip | |
Move dirclient-related functions out of dirserv, and reenable them
I had incorrectly identified these functions as dircache-only, when
in fact they apply to everyone who acts a directory client.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/include.am | 2 | ||||
| -rw-r--r-- | src/core/mainloop/mainloop.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/include.am b/src/core/include.am index 1861f6cd41..f332b3758b 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -92,6 +92,7 @@ LIBTOR_APP_A_SOURCES = \ src/feature/control/fmt_serverstatus.c \ src/feature/control/getinfo_geoip.c \ src/feature/dirclient/dirclient.c \ + src/feature/dirclient/dirclient_modes.c \ src/feature/dirclient/dlstatus.c \ src/feature/dircommon/consdiff.c \ src/feature/dircommon/directory.c \ @@ -391,6 +392,7 @@ noinst_HEADERS += \ src/feature/dircache/dirserv.h \ src/feature/dirclient/dir_server_st.h \ src/feature/dirclient/dirclient.h \ + src/feature/dirclient/dirclient_modes.h \ src/feature/dirclient/dlstatus.h \ src/feature/dirclient/download_status_st.h \ src/feature/dircommon/consdiff.h \ diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index aac60dcd90..230bf4a25f 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -77,7 +77,7 @@ #include "feature/control/control_events.h" #include "feature/dirauth/authmode.h" #include "feature/dircache/consdiffmgr.h" -#include "feature/dircache/dirserv.h" +#include "feature/dirclient/dirclient_modes.h" #include "feature/dircommon/directory.h" #include "feature/hibernate/hibernate.h" #include "feature/hs/hs_cache.h" |