Home Explore Help
Sign In
piros
/
tor
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Move routerparse and parsecommon to their own module.

Nick Mathewson 5 years ago
parent
b058f64cc0
commit
6785aa4010
51 changed files with 60 additions and 59 deletions
Split View Show Diff Stats
  1. 3 2
      src/app/main/main.c
  2. 4 4
      src/core/include.am
  3. 2 2
      src/core/mainloop/connection.c
  4. 1 1
      src/core/or/circuitbuild.c
  5. 2 2
      src/core/or/policies.c
  6. 1 1
      src/core/or/protover.c
  7. 1 1
      src/core/or/relay.c
  8. 2 2
      src/feature/client/entrynodes.c
  9. 1 1
      src/feature/control/control.c
  10. 1 1
      src/feature/dirauth/bwauth.c
  11. 2 2
      src/feature/dirauth/dirvote.c
  12. 1 1
      src/feature/dirauth/guardfraction.c
  13. 1 1
      src/feature/dirauth/process_descs.c
  14. 1 1
      src/feature/dircache/consdiffmgr.c
  15. 1 1
      src/feature/dircommon/consdiff.c
  16. 1 1
      src/feature/dirparse/parsecommon.c
  17. 0 0
      src/feature/dirparse/parsecommon.h
  18. 2 2
      src/feature/dirparse/routerparse.c
  19. 0 0
      src/feature/dirparse/routerparse.h
  20. 1 1
      src/feature/hs/hs_descriptor.c
  21. 2 2
      src/feature/nodelist/authcert.c
  22. 1 1
      src/feature/nodelist/microdesc.c
  23. 1 1
      src/feature/nodelist/networkstatus.c
  24. 1 1
      src/feature/nodelist/nodelist.c
  25. 1 1
      src/feature/nodelist/routerlist.c
  26. 1 1
      src/feature/nodelist/routerset.c
  27. 1 1
      src/feature/relay/router.c
  28. 1 1
      src/feature/rend/rendcache.c
  29. 1 1
      src/feature/rend/rendcommon.c
  30. 1 1
      src/feature/rend/rendservice.c
  31. 1 1
      src/test/fuzz/fuzz_consensus.c
  32. 1 1
      src/test/fuzz/fuzz_descriptor.c
  33. 1 1
      src/test/fuzz/fuzz_extrainfo.c
  34. 1 1
      src/test/fuzz/fuzz_hsdescv2.c
  35. 1 1
      src/test/fuzz/fuzz_hsdescv3.c
  36. 1 1
      src/test/fuzz/fuzz_iptsv2.c
  37. 1 1
      src/test/fuzz/fuzz_microdesc.c
  38. 1 1
      src/test/fuzz/fuzz_vrs.c
  39. 1 1
      src/test/test.c
  40. 1 1
      src/test/test_consdiffmgr.c
  41. 1 1
      src/test/test_dir.c
  42. 1 1
      src/test/test_dir_common.h
  43. 1 1
      src/test/test_dir_handle_get.c
  44. 1 1
      src/test/test_entrynodes.c
  45. 1 1
      src/test/test_guardfraction.c
  46. 1 1
      src/test/test_hs_service.c
  47. 1 1
      src/test/test_microdesc.c
  48. 1 1
      src/test/test_policy.c
  49. 1 1
      src/test/test_routerlist.c
  50. 1 1
      src/test/test_routerset.c
  51. 1 1
      src/test/test_shared_random.c

+ 3 - 2
src/app/main/main.c
View File 

@@ -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"

+ 4 - 4
src/core/include.am
View File 

@@ -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		\

+ 2 - 2
src/core/mainloop/connection.c
View File 

@@ -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"

+ 1 - 1
src/core/or/circuitbuild.c
View File 

@@ -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"

+ 2 - 2
src/core/or/policies.c
View File 

@@ -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"

+ 1 - 1
src/core/or/protover.c
View File 

@@ -25,7 +25,7 @@
 
 
 #include "core/or/or.h"
 
 #include "core/or/protover.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "lib/tls/tortls.h"
 
 
 #ifndef HAVE_RUST

+ 1 - 1
src/core/or/relay.c
View File 

@@ -79,7 +79,7 @@
 
 #include "feature/rend/rendcommon.h"
 
 #include "feature/nodelist/describe.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "core/or/scheduler.h"
 
 #include "feature/stats/rephist.h"

+ 2 - 2
src/feature/client/entrynodes.c
View File 

@@ -130,13 +130,13 @@
 
 #include "feature/client/transports.h"
 
 #include "feature/control/control.h"
 
 #include "feature/dircommon/directory.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/describe.h"
 
 #include "feature/nodelist/microdesc.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "feature/nodelist/nickname.h"
 
-#include "feature/nodelist/node_select.h"
 
 #include "feature/nodelist/nodelist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/nodelist/node_select.h"
 
 #include "feature/nodelist/routerset.h"
 
 #include "feature/relay/router.h"
 
 #include "lib/crypt_ops/crypto_rand.h"

+ 1 - 1
src/feature/control/control.c
View File 

@@ -65,6 +65,7 @@
 
 #include "feature/dirclient/dirclient.h"
 
 #include "feature/dirclient/dlstatus.h"
 
 #include "feature/dircommon/directory.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/hibernate/hibernate.h"
 
 #include "feature/hs/hs_cache.h"
 
 #include "feature/hs/hs_common.h"
 
@@ -77,7 +78,6 @@
 
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/nodelist/routerinfo.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
 #include "feature/relay/router.h"
 
 #include "feature/relay/routermode.h"
 
 #include "feature/relay/selftest.h"

+ 1 - 1
src/feature/dirauth/bwauth.c
View File 

@@ -15,7 +15,7 @@
 
 #include "app/config/config.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 
 #include "feature/nodelist/routerinfo_st.h"
 
 #include "feature/nodelist/vote_routerstatus_st.h"

+ 2 - 2
src/feature/dirauth/dirvote.c
View File 

@@ -17,7 +17,7 @@
 
 #include "feature/nodelist/microdesc.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "feature/nodelist/nodelist.h"
 
-#include "feature/nodelist/parsecommon.h"
 
+#include "feature/dirparse/parsecommon.h"
 
 #include "core/or/policies.h"
 
 #include "core/or/protover.h"
 
 #include "core/or/tor_version_st.h"
 
@@ -27,7 +27,7 @@
 
 #include "feature/nodelist/authcert.h"
 
 #include "feature/nodelist/dirlist.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/fmt_routerstatus.h"
 
 #include "feature/client/entrynodes.h" /* needed for guardfraction methods */
 
 #include "feature/nodelist/torcert.h"

+ 1 - 1
src/feature/dirauth/guardfraction.c
View File 

@@ -12,7 +12,7 @@
 
 #include "core/or/or.h"
 
 #include "feature/dirauth/guardfraction.h"
 
 #include "feature/nodelist/networkstatus.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 
 #include "feature/nodelist/vote_routerstatus_st.h"

+ 1 - 1
src/feature/dirauth/process_descs.c
View File 

@@ -26,7 +26,7 @@
 
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/nodelist/routerinfo.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/torcert.h"
 
 #include "feature/relay/router.h"

+ 1 - 1
src/feature/dircache/consdiffmgr.c
View File 

@@ -20,7 +20,7 @@
 
 #include "feature/dircache/consdiffmgr.h"
 
 #include "core/mainloop/cpuworker.h"
 
 #include "feature/nodelist/networkstatus.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "lib/evloop/compat_libevent.h"
 
 #include "lib/evloop/workqueue.h"
 
 #include "lib/compress/compress.h"

+ 1 - 1
src/feature/dircommon/consdiff.c
View File 

@@ -41,7 +41,7 @@
 
 #include "core/or/or.h"
 
 #include "feature/dircommon/consdiff.h"
 
 #include "lib/memarea/memarea.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 
 static const char* ns_diff_version = "network-status-diff-version 1";
 
 static const char* hash_token = "hash";

+ 1 - 1
src/feature/nodelist/parsecommon.c → src/feature/dirparse/parsecommon.c
View File 

@@ -6,7 +6,7 @@
 
  * \brief Common code to parse and validate various type of descriptors.
 
  **/
 
 
-#include "feature/nodelist/parsecommon.h"
 
+#include "feature/dirparse/parsecommon.h"
 
 #include "lib/log/log.h"
 
 #include "lib/log/util_bug.h"
 
 #include "lib/encoding/binascii.h"

+ 0 - 0
src/feature/nodelist/parsecommon.h → src/feature/dirparse/parsecommon.h
View File


+ 2 - 2
src/feature/nodelist/routerparse.c → src/feature/dirparse/routerparse.c
View File 

@@ -63,16 +63,16 @@
 
 #include "feature/client/entrynodes.h"
 
 #include "feature/dirauth/shared_random.h"
 
 #include "feature/dircommon/voting_schedule.h"
 
+#include "feature/dirparse/parsecommon.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/hs_common/shared_random_client.h"
 
 #include "feature/nodelist/authcert.h"
 
 #include "feature/nodelist/describe.h"
 
 #include "feature/nodelist/microdesc.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "feature/nodelist/nickname.h"
 
-#include "feature/nodelist/parsecommon.h"
 
 #include "feature/nodelist/routerinfo.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
 #include "feature/nodelist/torcert.h"
 
 #include "feature/relay/router.h"
 
 #include "feature/relay/routerkeys.h"

+ 0 - 0
src/feature/nodelist/routerparse.h → src/feature/dirparse/routerparse.h
View File


+ 1 - 1
src/feature/hs/hs_descriptor.c
View File 

@@ -61,7 +61,7 @@
 
 #include "core/or/circuitbuild.h"
 
 #include "lib/crypt_ops/crypto_rand.h"
 
 #include "lib/crypt_ops/crypto_util.h"
 
-#include "feature/nodelist/parsecommon.h"
 
+#include "feature/dirparse/parsecommon.h"
 
 #include "feature/rend/rendcache.h"
 
 #include "feature/hs/hs_cache.h"
 
 #include "feature/hs/hs_config.h"

+ 2 - 2
src/feature/nodelist/authcert.c
View File 

@@ -24,17 +24,17 @@
 
 #include "core/or/policies.h"
 
 #include "feature/client/bridges.h"
 
 #include "feature/dirauth/authmode.h"
 
-#include "feature/dircommon/directory.h"
 
 #include "feature/dirclient/dirclient.h"
 
 #include "feature/dirclient/dlstatus.h"
 
+#include "feature/dircommon/directory.h"
 
 #include "feature/dircommon/fp_pair.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/authcert.h"
 
 #include "feature/nodelist/dirlist.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "feature/nodelist/node_select.h"
 
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
 #include "feature/relay/routermode.h"
 
 
 #include "core/or/connection_st.h"

+ 1 - 1
src/feature/nodelist/microdesc.c
View File 

@@ -25,7 +25,7 @@
 
 #include "feature/relay/router.h"
 
 #include "feature/nodelist/dirlist.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 
 #include "feature/nodelist/microdesc_st.h"
 
 #include "feature/nodelist/networkstatus_st.h"

+ 1 - 1
src/feature/nodelist/networkstatus.c
View File 

@@ -64,6 +64,7 @@
 
 #include "feature/dirclient/dlstatus.h"
 
 #include "feature/dircommon/directory.h"
 
 #include "feature/dircommon/voting_schedule.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/hibernate/hibernate.h"
 
 #include "feature/nodelist/authcert.h"
 
 #include "feature/nodelist/dirlist.h"
 
@@ -74,7 +75,6 @@
 
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/nodelist/routerinfo.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
 #include "feature/nodelist/torcert.h"
 
 #include "feature/relay/routermode.h"
 
 #include "lib/crypt_ops/crypto_rand.h"

+ 1 - 1
src/feature/nodelist/nodelist.c
View File 

@@ -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/nodelist/torcert.h"
 
 #include "feature/rend/rendservice.h"

+ 1 - 1
src/feature/nodelist/routerlist.c
View File 

@@ -84,7 +84,7 @@
 
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/nodelist/routerinfo.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/routerset.h"
 
 #include "feature/nodelist/torcert.h"
 
 #include "feature/relay/routermode.h"

+ 1 - 1
src/feature/nodelist/routerset.c
View File 

@@ -30,9 +30,9 @@ n * Copyright (c) 2001-2004, Roger Dingledine.
 
 #include "core/or/or.h"
 
 #include "core/or/policies.h"
 
 #include "feature/client/bridges.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/nickname.h"
 
 #include "feature/nodelist/nodelist.h"
 
-#include "feature/nodelist/routerparse.h"
 
 #include "feature/nodelist/routerset.h"
 
 #include "lib/geoip/geoip.h"

+ 1 - 1
src/feature/relay/router.c
View File 

@@ -21,6 +21,7 @@
 
 #include "feature/dircache/dirserv.h"
 
 #include "feature/dirclient/dirclient.h"
 
 #include "feature/dircommon/directory.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/hibernate/hibernate.h"
 
 #include "feature/keymgt/loadkey.h"
 
 #include "feature/nodelist/authcert.h"
 
@@ -29,7 +30,6 @@
 
 #include "feature/nodelist/nickname.h"
 
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
 #include "feature/nodelist/torcert.h"
 
 #include "feature/relay/dns.h"
 
 #include "feature/relay/router.h"

+ 1 - 1
src/feature/rend/rendcache.c
View File 

@@ -12,7 +12,7 @@
 
 #include "app/config/config.h"
 
 #include "feature/stats/rephist.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/rend/rendcommon.h"
 
 
 #include "core/or/extend_info_st.h"

+ 1 - 1
src/feature/rend/rendcommon.c
View File 

@@ -30,7 +30,7 @@
 
 #include "feature/hs_common/replaycache.h"
 
 #include "feature/relay/router.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 
 #include "core/or/cpath_build_state_st.h"
 
 #include "core/or/crypt_path_st.h"

+ 1 - 1
src/feature/rend/rendservice.c
View File 

@@ -22,6 +22,7 @@
 
 #include "feature/control/control.h"
 
 #include "feature/dirclient/dirclient.h"
 
 #include "feature/dircommon/directory.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/hs/hs_common.h"
 
 #include "feature/hs/hs_config.h"
 
 #include "feature/hs_common/replaycache.h"
 
@@ -31,7 +32,6 @@
 
 #include "feature/nodelist/nickname.h"
 
 #include "feature/nodelist/node_select.h"
 
 #include "feature/nodelist/nodelist.h"
 
-#include "feature/nodelist/routerparse.h"
 
 #include "feature/nodelist/routerset.h"
 
 #include "feature/rend/rendclient.h"
 
 #include "feature/rend/rendcommon.h"

+ 1 - 1
src/test/fuzz/fuzz_consensus.c
View File 

@@ -2,7 +2,7 @@
 
 /* See LICENSE for licensing information */
 
 #define ROUTERPARSE_PRIVATE
 
 #include "core/or/or.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "lib/crypt_ops/crypto_ed25519.h"
 
 #include "feature/nodelist/networkstatus_st.h"

+ 1 - 1
src/test/fuzz/fuzz_descriptor.c
View File 

@@ -2,7 +2,7 @@
 
 /* See LICENSE for licensing information */
 
 #define ROUTERPARSE_PRIVATE
 
 #include "core/or/or.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/routerlist.h"
 
 #include "feature/nodelist/torcert.h"
 
 #include "feature/keymgt/loadkey.h"

+ 1 - 1
src/test/fuzz/fuzz_extrainfo.c
View File 

@@ -2,7 +2,7 @@
 
 /* See LICENSE for licensing information */
 
 #define ROUTERPARSE_PRIVATE
 
 #include "core/or/or.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/routerlist.h"
 
 #include "feature/relay/routerkeys.h"
 
 #include "test/fuzz/fuzzing.h"

+ 1 - 1
src/test/fuzz/fuzz_hsdescv2.c
View File 

@@ -2,7 +2,7 @@
 
 /* See LICENSE for licensing information */
 
 #define ROUTERPARSE_PRIVATE
 
 #include "core/or/or.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/rend/rendcommon.h"
 
 #include "lib/crypt_ops/crypto_ed25519.h"
 
 #include "test/fuzz/fuzzing.h"

+ 1 - 1
src/test/fuzz/fuzz_hsdescv3.c
View File 

@@ -8,7 +8,7 @@
 
 #include "trunnel/ed25519_cert.h" /* Trunnel interface. */
 
 #include "lib/crypt_ops/crypto_ed25519.h"
 
 #include "feature/hs/hs_descriptor.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 
 #include "test/fuzz/fuzzing.h"

+ 1 - 1
src/test/fuzz/fuzz_iptsv2.c
View File 

@@ -2,7 +2,7 @@
 
 /* See LICENSE for licensing information */
 
 #define ROUTERPARSE_PRIVATE
 
 #include "core/or/or.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/rend/rendcommon.h"
 
 #include "lib/crypt_ops/crypto_ed25519.h"

+ 1 - 1
src/test/fuzz/fuzz_microdesc.c
View File 

@@ -2,7 +2,7 @@
 
 /* See LICENSE for licensing information */
 
 #define ROUTERPARSE_PRIVATE
 
 #include "core/or/or.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/microdesc.h"
 
 #include "lib/crypt_ops/crypto_ed25519.h"

+ 1 - 1
src/test/fuzz/fuzz_vrs.c
View File 

@@ -3,7 +3,7 @@
 
 #define ROUTERPARSE_PRIVATE
 
 #define NETWORKSTATUS_PRIVATE
 
 #include "core/or/or.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "lib/memarea/memarea.h"
 
 #include "feature/nodelist/microdesc.h"
 
 #include "feature/nodelist/networkstatus.h"

+ 1 - 1
src/test/test.c
View File 

@@ -54,7 +54,7 @@
 
 #include "core/crypto/onion_tap.h"
 
 #include "core/or/policies.h"
 
 #include "feature/stats/rephist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "app/config/statefile.h"
 
 #include "lib/crypt_ops/crypto_curve25519.h"

+ 1 - 1
src/test/test_consdiffmgr.c
View File 

@@ -11,7 +11,7 @@
 
 #include "core/mainloop/cpuworker.h"
 
 #include "lib/crypt_ops/crypto_rand.h"
 
 #include "feature/nodelist/networkstatus.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "lib/evloop/workqueue.h"
 
 #include "lib/compress/compress.h"
 
 #include "lib/encoding/confline.h"

+ 1 - 1
src/test/test_dir.c
View File 

@@ -51,7 +51,7 @@
 
 #include "feature/nodelist/nickname.h"
 
 #include "feature/nodelist/node_select.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/routerset.h"
 
 #include "feature/nodelist/torcert.h"
 
 #include "feature/relay/router.h"

+ 1 - 1
src/test/test_dir_common.h
View File 

@@ -5,7 +5,7 @@
 
 
 #include "core/or/or.h"
 
 #include "feature/nodelist/networkstatus.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 
 #define TEST_DIR_ROUTER_ID_1 3
 
 #define TEST_DIR_ROUTER_ID_2 5

+ 1 - 1
src/test/test_dir_handle_get.c
View File 

@@ -29,7 +29,7 @@
 
 #include "test/test_helpers.h"
 
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/client/entrynodes.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "core/proto/proto_http.h"
 
 #include "lib/geoip/geoip.h"

+ 1 - 1
src/test/test_entrynodes.c
View File 

@@ -26,7 +26,7 @@
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "core/or/policies.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/routerset.h"
 
 #include "app/config/statefile.h"

+ 1 - 1
src/test/test_guardfraction.c
View File 

@@ -10,7 +10,7 @@
 
 #include "app/config/config.h"
 
 #include "feature/dirauth/guardfraction.h"
 
 #include "feature/client/entrynodes.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 
 #include "feature/nodelist/networkstatus_st.h"

+ 1 - 1
src/test/test_hs_service.c
View File 

@@ -43,7 +43,7 @@
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "feature/nodelist/nodelist.h"
 
 #include "core/or/relay.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/hs/hs_common.h"
 
 #include "feature/hs/hs_config.h"
 
 #include "feature/hs/hs_ident.h"

+ 1 - 1
src/test/test_microdesc.c
View File 

@@ -10,7 +10,7 @@
 
 #include "feature/nodelist/microdesc.h"
 
 #include "feature/nodelist/networkstatus.h"
 
 #include "feature/nodelist/routerlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/nodelist/torcert.h"
 
 
 #include "feature/nodelist/microdesc_st.h"

+ 1 - 1
src/test/test_policy.c
View File 

@@ -5,7 +5,7 @@
 
 #define CONFIG_PRIVATE
 
 #include "app/config/config.h"
 
 #include "feature/relay/router.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #define POLICIES_PRIVATE
 
 #include "core/or/policies.h"
 
 #include "lib/encoding/confline.h"

+ 1 - 1
src/test/test_routerlist.c
View File 

@@ -33,7 +33,7 @@
 
 #include "feature/nodelist/node_select.h"
 
 #include "feature/nodelist/routerlist.h"
 
 #include "feature/nodelist/routerset.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/dirauth/shared_random.h"
 
 #include "app/config/statefile.h"

+ 1 - 1
src/test/test_routerset.c
View File 

@@ -6,7 +6,7 @@
 
 #include "core/or/or.h"
 
 #include "lib/geoip/geoip.h"
 
 #include "feature/nodelist/routerset.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "core/or/policies.h"
 
 #include "feature/nodelist/nodelist.h"

+ 1 - 1
src/test/test_shared_random.c
View File 

@@ -19,7 +19,7 @@
 
 #include "feature/relay/routerkeys.h"
 
 #include "feature/nodelist/authcert.h"
 
 #include "feature/nodelist/dirlist.h"
 
-#include "feature/nodelist/routerparse.h"
 
+#include "feature/dirparse/routerparse.h"
 
 #include "feature/hs_common/shared_random_client.h"
 
 #include "feature/dircommon/voting_schedule.h"