From 6785aa4010c141ab8792e41745acc2267ce46ca4 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 30 Sep 2018 17:53:58 -0500 Subject: [PATCH] Move routerparse and parsecommon to their own module. --- src/app/main/main.c | 5 +++-- src/core/include.am | 8 ++++---- src/core/mainloop/connection.c | 4 ++-- src/core/or/circuitbuild.c | 2 +- src/core/or/policies.c | 4 ++-- src/core/or/protover.c | 2 +- src/core/or/relay.c | 2 +- src/feature/client/entrynodes.c | 4 ++-- src/feature/control/control.c | 2 +- src/feature/dirauth/bwauth.c | 2 +- src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/guardfraction.c | 2 +- src/feature/dirauth/process_descs.c | 2 +- src/feature/dircache/consdiffmgr.c | 2 +- src/feature/dircommon/consdiff.c | 2 +- src/feature/{nodelist => dirparse}/parsecommon.c | 2 +- src/feature/{nodelist => dirparse}/parsecommon.h | 0 src/feature/{nodelist => dirparse}/routerparse.c | 4 ++-- src/feature/{nodelist => dirparse}/routerparse.h | 0 src/feature/hs/hs_descriptor.c | 2 +- src/feature/nodelist/authcert.c | 4 ++-- src/feature/nodelist/microdesc.c | 2 +- src/feature/nodelist/networkstatus.c | 2 +- src/feature/nodelist/nodelist.c | 2 +- src/feature/nodelist/routerlist.c | 2 +- src/feature/nodelist/routerset.c | 2 +- src/feature/relay/router.c | 2 +- src/feature/rend/rendcache.c | 2 +- src/feature/rend/rendcommon.c | 2 +- src/feature/rend/rendservice.c | 2 +- src/test/fuzz/fuzz_consensus.c | 2 +- src/test/fuzz/fuzz_descriptor.c | 2 +- src/test/fuzz/fuzz_extrainfo.c | 2 +- src/test/fuzz/fuzz_hsdescv2.c | 2 +- src/test/fuzz/fuzz_hsdescv3.c | 2 +- src/test/fuzz/fuzz_iptsv2.c | 2 +- src/test/fuzz/fuzz_microdesc.c | 2 +- src/test/fuzz/fuzz_vrs.c | 2 +- src/test/test.c | 2 +- src/test/test_consdiffmgr.c | 2 +- src/test/test_dir.c | 2 +- src/test/test_dir_common.h | 2 +- src/test/test_dir_handle_get.c | 2 +- src/test/test_entrynodes.c | 2 +- src/test/test_guardfraction.c | 2 +- src/test/test_hs_service.c | 2 +- src/test/test_microdesc.c | 2 +- src/test/test_policy.c | 2 +- src/test/test_routerlist.c | 2 +- src/test/test_routerset.c | 2 +- src/test/test_shared_random.c | 2 +- 51 files changed, 60 insertions(+), 59 deletions(-) rename src/feature/{nodelist => dirparse}/parsecommon.c (99%) rename src/feature/{nodelist => dirparse}/parsecommon.h (100%) rename src/feature/{nodelist => dirparse}/routerparse.c (99%) rename src/feature/{nodelist => dirparse}/routerparse.h (100%) diff --git a/src/app/main/main.c b/src/app/main/main.c index 8a24df2105..2e3efadc08 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -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" diff --git a/src/core/include.am b/src/core/include.am index e51819fa20..aa8e29ad3f 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -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 \ diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index d8326a5be8..c5f474e033 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -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" diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 822129d80e..2943b7e803 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.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/relay/router.h" #include "feature/relay/routermode.h" diff --git a/src/core/or/policies.c b/src/core/or/policies.c index c3fded1fbd..36970cf15d 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -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" diff --git a/src/core/or/protover.c b/src/core/or/protover.c index f0791366fe..4458316c9c 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -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 diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 9e45a35246..dafc6effd3 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -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" 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 similarity index 99% rename from src/feature/nodelist/parsecommon.c rename to 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 similarity index 100% rename from src/feature/nodelist/parsecommon.h rename to src/feature/dirparse/parsecommon.h diff --git a/src/feature/nodelist/routerparse.c b/src/feature/dirparse/routerparse.c similarity index 99% rename from src/feature/nodelist/routerparse.c rename to 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 similarity index 100% rename from src/feature/nodelist/routerparse.h rename to 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" diff --git a/src/test/fuzz/fuzz_consensus.c b/src/test/fuzz/fuzz_consensus.c index b170fd33d8..c368b58d04 100644 --- a/src/test/fuzz/fuzz_consensus.c +++ b/src/test/fuzz/fuzz_consensus.c @@ -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" diff --git a/src/test/fuzz/fuzz_descriptor.c b/src/test/fuzz/fuzz_descriptor.c index 2babdce4bf..f7d4a7911a 100644 --- a/src/test/fuzz/fuzz_descriptor.c +++ b/src/test/fuzz/fuzz_descriptor.c @@ -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" diff --git a/src/test/fuzz/fuzz_extrainfo.c b/src/test/fuzz/fuzz_extrainfo.c index 6c88f80122..56fd6b7592 100644 --- a/src/test/fuzz/fuzz_extrainfo.c +++ b/src/test/fuzz/fuzz_extrainfo.c @@ -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" diff --git a/src/test/fuzz/fuzz_hsdescv2.c b/src/test/fuzz/fuzz_hsdescv2.c index fd5da41635..ebab5c6ce0 100644 --- a/src/test/fuzz/fuzz_hsdescv2.c +++ b/src/test/fuzz/fuzz_hsdescv2.c @@ -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" diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index b332973b39..4d630bf9bd 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -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" diff --git a/src/test/fuzz/fuzz_iptsv2.c b/src/test/fuzz/fuzz_iptsv2.c index a3082f4d0e..6fdfec3c9f 100644 --- a/src/test/fuzz/fuzz_iptsv2.c +++ b/src/test/fuzz/fuzz_iptsv2.c @@ -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" diff --git a/src/test/fuzz/fuzz_microdesc.c b/src/test/fuzz/fuzz_microdesc.c index fa9676372d..15e8b004c9 100644 --- a/src/test/fuzz/fuzz_microdesc.c +++ b/src/test/fuzz/fuzz_microdesc.c @@ -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" diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c index 8c96851b1f..6b22077ae6 100644 --- a/src/test/fuzz/fuzz_vrs.c +++ b/src/test/fuzz/fuzz_vrs.c @@ -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" diff --git a/src/test/test.c b/src/test/test.c index fff87a2b56..2b2f536e25 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -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" diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c index 6c0601b504..dc05c351bf 100644 --- a/src/test/test_consdiffmgr.c +++ b/src/test/test_consdiffmgr.c @@ -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" diff --git a/src/test/test_dir.c b/src/test/test_dir.c index aa1c706b1f..23c8c4a1d3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -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" diff --git a/src/test/test_dir_common.h b/src/test/test_dir_common.h index 1e90228edb..9bcabc7bdf 100644 --- a/src/test/test_dir_common.h +++ b/src/test/test_dir_common.h @@ -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 diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 623d9e9b9d..7deed61e76 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -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" diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index ebe9accf5a..295586c69f 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -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" diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c index 7d4a959bb4..c7266be66f 100644 --- a/src/test/test_guardfraction.c +++ b/src/test/test_guardfraction.c @@ -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" diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 334bde3e7b..67686bbeee 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -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" diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index ec4779ead1..bec8053f6e 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -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" diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 6a07e5b1f8..5101b57abf 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -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" diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 1086b98612..a76f5c37d1 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -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" diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c index fede419f0b..56abce162c 100644 --- a/src/test/test_routerset.c +++ b/src/test/test_routerset.c @@ -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" diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 725724aa56..4dc017f33c 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -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"