Commit 6785aa40 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Move routerparse and parsecommon to their own module.

parent b058f64c

src/app/main/main.c

+3 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "feature/dirauth/process_descs.h"

#include "feature/dircache/consdiffmgr.h"

#include "feature/dircache/dirserv.h"

#include "feature/dirparse/routerparse.h"

#include "feature/hibernate/hibernate.h"

#include "feature/hs/hs_cache.h"

#include "feature/nodelist/authcert.h"
@@ -52,7 +53,6 @@ 
#include "feature/nodelist/networkstatus.h"

#include "feature/nodelist/nodelist.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/routerparse.h"

#include "feature/relay/dns.h"

#include "feature/relay/ext_orport.h"

#include "feature/relay/onion_queue.h"
@@ -61,7 +61,6 @@ 
#include "feature/rend/rendcache.h"

#include "feature/rend/rendclient.h"

#include "feature/rend/rendservice.h"

#include "lib/geoip/geoip.h"

#include "feature/stats/geoip_stats.h"

#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"
@@ -70,6 +69,8 @@ 
#include "lib/crypt_ops/crypto_rand.h"

#include "lib/crypt_ops/crypto_s2k.h"

#include "lib/err/backtrace.h"

#include "lib/geoip/geoip.h"



#include "lib/process/waitpid.h"



#include "lib/meminfo/meminfo.h"

src/core/include.am

+4 −4
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/dircommon/directory.c	\

	src/feature/dircommon/fp_pair.c		\

	src/feature/dircommon/voting_schedule.c	\

	src/feature/dirparse/parsecommon.c	\

	src/feature/dirparse/routerparse.c	\

	src/feature/hibernate/hibernate.c	\

	src/feature/hs/hs_cache.c		\

	src/feature/hs/hs_cell.c		\
@@ -98,10 +100,8 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/nodelist/nickname.c		\

	src/feature/nodelist/nodelist.c		\

	src/feature/nodelist/node_select.c	\

	src/feature/nodelist/parsecommon.c	\

	src/feature/nodelist/routerinfo.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		\
@@ -285,6 +285,8 @@ noinst_HEADERS += \ 
	src/feature/dircommon/fp_pair.h			\

	src/feature/dircommon/vote_timing_st.h		\

	src/feature/dircommon/voting_schedule.h		\

	src/feature/dirparse/parsecommon.h		\

	src/feature/dirparse/routerparse.h		\

	src/feature/hibernate/hibernate.h		\

	src/feature/hs/hs_cache.h			\

	src/feature/hs/hs_cell.h			\
@@ -320,12 +322,10 @@ noinst_HEADERS += \ 
	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.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/core/mainloop/connection.c

+2 −2
Original line number Diff line number Diff line
@@ -91,20 +91,20 @@ 
#include "feature/dirauth/authmode.h"

#include "feature/dircache/dirserv.h"

#include "feature/dircommon/directory.h"

#include "feature/dirparse/routerparse.h"

#include "feature/hibernate/hibernate.h"

#include "feature/hs/hs_common.h"

#include "feature/hs/hs_ident.h"

#include "feature/nodelist/nodelist.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/routerparse.h"

#include "feature/relay/dns.h"

#include "feature/relay/ext_orport.h"

#include "feature/relay/routermode.h"

#include "feature/rend/rendclient.h"

#include "feature/rend/rendcommon.h"

#include "lib/geoip/geoip.h"

#include "feature/stats/rephist.h"

#include "lib/crypt_ops/crypto_util.h"

#include "lib/geoip/geoip.h"



#include "lib/sandbox/sandbox.h"

#include "lib/net/buffers_net.h"

src/core/or/circuitbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#include "feature/nodelist/node_select.h"

#include "feature/nodelist/nodelist.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/routerparse.h"

#include "feature/dirparse/routerparse.h"

#include "feature/nodelist/routerset.h"

#include "feature/relay/router.h"

#include "feature/relay/routermode.h"

src/core/or/policies.c

+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
#include "core/or/or.h"

#include "feature/client/bridges.h"

#include "app/config/config.h"

#include "core/or/policies.h"

#include "feature/dirparse/routerparse.h"

#include "feature/nodelist/microdesc.h"

#include "feature/nodelist/networkstatus.h"

#include "feature/nodelist/nodelist.h"

#include "core/or/policies.h"

#include "feature/relay/router.h"

#include "feature/relay/routermode.h"

#include "feature/nodelist/routerparse.h"

#include "lib/geoip/geoip.h"

#include "ht.h"

#include "lib/encoding/confline.h"