Move routerparse and parsecommon to their own module.

23 files changed, 25 insertions, 25 deletions

diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 8ad16af6d6..230b517158 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -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"
diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index d02ecbac80..418ce2e7a8 100644
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -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"
diff --git a/src/feature/dirauth/bwauth.c b/src/feature/dirauth/bwauth.c
index 90497a3b7c..ec23f629c5 100644
--- a/src/feature/dirauth/bwauth.c
+++ b/src/feature/dirauth/bwauth.c
@@ -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"
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index edb0ad2aea..badb6dc4eb 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -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"
diff --git a/src/feature/dirauth/guardfraction.c b/src/feature/dirauth/guardfraction.c
index 60ba316cfe..812cb7df2c 100644
--- a/src/feature/dirauth/guardfraction.c
+++ b/src/feature/dirauth/guardfraction.c
@@ -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"
 
diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c
index 823a1b8791..94c456a775 100644
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -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"
 
diff --git a/src/feature/dircache/consdiffmgr.c b/src/feature/dircache/consdiffmgr.c
index 304b64f3b6..7dc56f4f14 100644
--- a/src/feature/dircache/consdiffmgr.c
+++ b/src/feature/dircache/consdiffmgr.c
@@ -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"
diff --git a/src/feature/dircommon/consdiff.c b/src/feature/dircommon/consdiff.c
index 1823dc07fb..944ddd552b 100644
--- a/src/feature/dircommon/consdiff.c
+++ b/src/feature/dircommon/consdiff.c
@@ -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";
diff --git a/src/feature/nodelist/parsecommon.c b/src/feature/dirparse/parsecommon.c
index e05657aca0..ab815f585d 100644
--- a/src/feature/nodelist/parsecommon.c
+++ b/src/feature/dirparse/parsecommon.c
@@ -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"
diff --git a/src/feature/nodelist/parsecommon.h b/src/feature/dirparse/parsecommon.h
index d0f3810c0b..d0f3810c0b 100644
--- a/src/feature/nodelist/parsecommon.h
+++ b/src/feature/dirparse/parsecommon.h
diff --git a/src/feature/nodelist/routerparse.c b/src/feature/dirparse/routerparse.c
index c12f411e87..ea5ac6f000 100644
--- a/src/feature/nodelist/routerparse.c
+++ b/src/feature/dirparse/routerparse.c
@@ -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"
diff --git a/src/feature/nodelist/routerparse.h b/src/feature/dirparse/routerparse.h
index 87c2a75aa5..87c2a75aa5 100644
--- a/src/feature/nodelist/routerparse.h
+++ b/src/feature/dirparse/routerparse.h
diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c
index b9a0c0ef1f..8515314b38 100644
--- a/src/feature/hs/hs_descriptor.c
+++ b/src/feature/hs/hs_descriptor.c
@@ -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"
diff --git a/src/feature/nodelist/authcert.c b/src/feature/nodelist/authcert.c
index 2624ed5eef..1d23770168 100644
--- a/src/feature/nodelist/authcert.c
+++ b/src/feature/nodelist/authcert.c
@@ -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"
diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
index 96696b603a..85bc59812b 100644
--- a/src/feature/nodelist/microdesc.c
+++ b/src/feature/nodelist/microdesc.c
@@ -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"
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index 67b5a1d046..e20d543dba 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -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"
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index 90ca579b7d..29150d931e 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -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"
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
index 20956d8cca..a8c9003e68 100644
--- a/src/feature/nodelist/routerlist.c
+++ b/src/feature/nodelist/routerlist.c
@@ -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"
diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c
index cb07a436d1..59d6da97b1 100644
--- a/src/feature/nodelist/routerset.c
+++ b/src/feature/nodelist/routerset.c
@@ -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"
 
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index fdaadb205b..318cb41ec6 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -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"
diff --git a/src/feature/rend/rendcache.c b/src/feature/rend/rendcache.c
index 7af5063ba5..9197a53bda 100644
--- a/src/feature/rend/rendcache.c
+++ b/src/feature/rend/rendcache.c
@@ -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"
diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c
index b48ba87cbc..57d753fe41 100644
--- a/src/feature/rend/rendcommon.c
+++ b/src/feature/rend/rendcommon.c
@@ -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"
diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c
index 057ca2d0c7..bcd123f371 100644
--- a/src/feature/rend/rendservice.c
+++ b/src/feature/rend/rendservice.c
@@ -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"