Commit bd6007d8 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'split_routerlist_dirserv_v2'

parents 1f377e91 b54a5e70

src/app/config/config.c

+4 −1
Original line number Diff line number Diff line
@@ -87,7 +87,9 @@ 
#else

#include "lib/crypt_ops/crypto_openssl_mgt.h"

#endif

#include "feature/dirauth/bwauth.h"

#include "feature/dircache/dirserv.h"

#include "feature/dirauth/guardfraction.h"

#include "feature/relay/dns.h"

#include "core/or/dos.h"

#include "feature/client/entrynodes.h"
@@ -105,7 +107,7 @@ 
#include "feature/stats/rephist.h"

#include "feature/relay/router.h"

#include "lib/sandbox/sandbox.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/dirlist.h"

#include "feature/nodelist/routerset.h"

#include "core/or/scheduler.h"

#include "app/config/statefile.h"
@@ -141,6 +143,7 @@ 
#include "lib/evloop/procmon.h"



#include "feature/dirauth/dirvote.h"

#include "feature/dirauth/recommend_pkg.h"

#include "feature/dirauth/mode.h"



#include "core/or/connection_st.h"

src/core/include.am

+26 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/client/entrynodes.c		\

	src/feature/client/transports.c		\

	src/feature/control/control.c		\

	src/feature/control/fmt_serverstatus.c  \

	src/feature/dirauth/keypin.c		\

	src/feature/dircache/conscache.c	\

	src/feature/dircache/consdiffmgr.c	\
@@ -80,13 +81,17 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/hs/hs_stats.c		\

	src/feature/hs_common/replaycache.c	\

	src/feature/hs_common/shared_random_client.c	\

	src/feature/nodelist/authcert.c		\

	src/feature/nodelist/dirlist.c		\

	src/feature/nodelist/microdesc.c	\

	src/feature/nodelist/networkstatus.c	\

	src/feature/nodelist/nodelist.c		\

	src/feature/nodelist/node_select.c	\

	src/feature/nodelist/parsecommon.c	\

	src/feature/nodelist/routerlist.c	\

	src/feature/nodelist/routerparse.c	\

	src/feature/nodelist/routerset.c	\

	src/feature/nodelist/fmt_routerstatus.c	\

	src/feature/nodelist/torcert.c		\

	src/feature/relay/dns.c			\

	src/feature/relay/ext_orport.c		\
@@ -100,6 +105,16 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/stats/geoip.c		\

	src/feature/stats/rephist.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		\

	src/feature/dirauth/guardfraction.c	\

	src/feature/dirauth/reachability.c	\

	src/feature/dirauth/recommend_pkg.c	\

	src/feature/dirauth/process_descs.c	\

	src/feature/dirauth/voteflags.c



if BUILD_NT_SERVICES

LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c

endif
@@ -219,14 +234,21 @@ noinst_HEADERS += \ 
	src/feature/client/transports.h			\

	src/feature/control/control.h			\

	src/feature/control/control_connection_st.h	\

	src/feature/control/fmt_serverstatus.h		\

	src/feature/dirauth/bwauth.h			\

	src/feature/dirauth/dircollate.h		\

	src/feature/dirauth/dirvote.h			\

	src/feature/dirauth/guardfraction.h		\

	src/feature/dirauth/keypin.h			\

	src/feature/dirauth/mode.h			\

	src/feature/dirauth/ns_detached_signatures_st.h	\

	src/feature/dirauth/reachability.h		\

	src/feature/dirauth/recommend_pkg.h		\

	src/feature/dirauth/process_descs.h		\

	src/feature/dirauth/shared_random.h		\

	src/feature/dirauth/shared_random_state.h	\

	src/feature/dirauth/vote_microdesc_hash_st.h	\

	src/feature/dirauth/voteflags.h			\

	src/feature/dircache/cached_dir_st.h		\

	src/feature/dircache/conscache.h		\

	src/feature/dircache/consdiffmgr.h		\
@@ -256,8 +278,10 @@ noinst_HEADERS += \ 
	src/feature/hs/hsdir_index_st.h			\

	src/feature/hs_common/replaycache.h		\

	src/feature/hs_common/shared_random_client.h	\

	src/feature/nodelist/authcert.h			\

	src/feature/nodelist/authority_cert_st.h	\

	src/feature/nodelist/desc_store_st.h		\

	src/feature/nodelist/dirlist.h			\

	src/feature/nodelist/document_signature_st.h	\

	src/feature/nodelist/extrainfo_st.h		\

	src/feature/nodelist/microdesc.h		\
@@ -268,12 +292,14 @@ noinst_HEADERS += \ 
	src/feature/nodelist/networkstatus_voter_info_st.h	\

	src/feature/nodelist/node_st.h			\

	src/feature/nodelist/nodelist.h			\

	src/feature/nodelist/node_select.h		\

	src/feature/nodelist/parsecommon.h		\

	src/feature/nodelist/routerinfo_st.h		\

	src/feature/nodelist/routerlist.h		\

	src/feature/nodelist/routerlist_st.h		\

	src/feature/nodelist/routerparse.h		\

	src/feature/nodelist/routerset.h		\

	src/feature/nodelist/fmt_routerstatus.h		\

	src/feature/nodelist/routerstatus_st.h		\

	src/feature/nodelist/signed_descriptor_st.h	\

	src/feature/nodelist/torcert.h			\

src/core/mainloop/main.c

+7 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ 
#include "lib/crypt_ops/crypto_rand.h"

#include "feature/dircache/directory.h"

#include "feature/dircache/dirserv.h"

#include "feature/dirauth/bwauth.h"

#include "feature/dirauth/reachability.h"

#include "feature/dirauth/process_descs.h"

#include "feature/relay/dns.h"

#include "feature/client/dnsserv.h"

#include "core/or/dos.h"
@@ -101,6 +104,8 @@ 
#include "feature/stats/rephist.h"

#include "feature/relay/router.h"

#include "feature/relay/routerkeys.h"

#include "feature/nodelist/authcert.h"

#include "feature/nodelist/dirlist.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/routerparse.h"

#include "core/or/scheduler.h"
@@ -3661,7 +3666,9 @@ 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();

  rend_service_authorization_free_all();

  rep_hist_free_all();

src/core/or/channeltls.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include "core/or/relay.h"

#include "feature/stats/rephist.h"

#include "feature/relay/router.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/dirlist.h"

#include "core/or/scheduler.h"

#include "feature/nodelist/torcert.h"

#include "feature/nodelist/networkstatus.h"

src/core/or/circuitbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "feature/rend/rendcommon.h"

#include "feature/stats/rephist.h"

#include "feature/relay/router.h"

#include "feature/nodelist/node_select.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/routerparse.h"

#include "feature/nodelist/routerset.h"
@@ -3007,4 +3008,3 @@ circuit_upgrade_circuits_from_guard_wait(void) 


  smartlist_free(to_upgrade);

}