commit d19934866417aa9106fb17c39cfec606d33eacdb Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 1 11:22:47 2018 -0500
Remove versions.h include from routerparse.h --- src/core/or/protover.c | 2 +- src/feature/control/control.c | 2 +- src/feature/dirauth/process_descs.c | 1 + src/feature/dirparse/ns_parse.c | 1 + src/feature/dirparse/routerparse.c | 1 + src/feature/dirparse/routerparse.h | 2 -- src/test/fuzz/fuzz_hsdescv3.c | 1 - src/test/test_dir.c | 2 +- src/test/test_hs_service.c | 31 +++++++++++++++---------------- 9 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 4458316c9..e80fbfae8 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/dirparse/routerparse.h" +#include "core/or/versions.h" #include "lib/tls/tortls.h"
#ifndef HAVE_RUST diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 7f0032c0b..f0db97dc8 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -52,6 +52,7 @@ #include "core/or/connection_or.h" #include "core/or/policies.h" #include "core/or/reasons.h" +#include "core/or/versions.h" #include "core/proto/proto_control0.h" #include "core/proto/proto_http.h" #include "feature/client/addressmap.h" @@ -65,7 +66,6 @@ #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" diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 94c456a77..c379f25bd 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -17,6 +17,7 @@
#include "app/config/config.h" #include "core/or/policies.h" +#include "core/or/versions.h" #include "feature/dirauth/keypin.h" #include "feature/dirauth/reachability.h" #include "feature/dirclient/dlstatus.h" diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index e356c0c11..72299e807 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -13,6 +13,7 @@
#include "core/or/or.h" #include "app/config/config.h" +#include "core/or/versions.h" #include "feature/client/entrynodes.h" #include "feature/dirauth/dirvote.h" #include "feature/dirparse/authcert_parse.h" diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 2aa6bef80..2249ab7cb 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -55,6 +55,7 @@ #include "core/or/or.h" #include "app/config/config.h" #include "core/or/policies.h" +#include "core/or/versions.h" #include "feature/dirparse/parsecommon.h" #include "feature/dirparse/policy_parse.h" #include "feature/dirparse/routerparse.h" diff --git a/src/feature/dirparse/routerparse.h b/src/feature/dirparse/routerparse.h index 3022d60d3..6568dce0a 100644 --- a/src/feature/dirparse/routerparse.h +++ b/src/feature/dirparse/routerparse.h @@ -12,8 +12,6 @@ #ifndef TOR_ROUTERPARSE_H #define TOR_ROUTERPARSE_H
-#include "core/or/versions.h" - int router_get_router_hash(const char *s, size_t s_len, char *digest); int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest);
diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index ce6dfb177..871fbefa4 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -1,7 +1,6 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */
-#define ROUTERPARSE_PRIVATE #define HS_DESCRIPTOR_PRIVATE
#include "core/or/or.h" diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 3b5d6dc3d..c18aa99fe 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -20,7 +20,6 @@ #define NODE_SELECT_PRIVATE #define RELAY_PRIVATE #define ROUTERLIST_PRIVATE -#define ROUTERPARSE_PRIVATE #define ROUTER_PRIVATE #define UNPARSEABLE_PRIVATE #define VOTEFLAGS_PRIVATE @@ -30,6 +29,7 @@ #include "app/config/confparse.h" #include "core/mainloop/connection.h" #include "core/or/relay.h" +#include "core/or/versions.h" #include "feature/client/bridges.h" #include "feature/client/entrynodes.h" #include "feature/control/control.h" diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 67686bbee..957bf6e10 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -21,7 +21,6 @@ #define STATEFILE_PRIVATE #define TOR_CHANNEL_INTERNAL_ #define HS_CLIENT_PRIVATE -#define ROUTERPARSE_PRIVATE
#include "test/test.h" #include "test/test_helpers.h" @@ -31,33 +30,33 @@
#include "core/or/or.h" #include "app/config/config.h" +#include "app/config/statefile.h" +#include "core/crypto/hs_ntor.h" +#include "core/mainloop/connection.h" +#include "core/mainloop/mainloop.h" #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" -#include "core/mainloop/connection.h" #include "core/or/connection_edge.h" #include "core/or/edge_connection_st.h" -#include "lib/crypt_ops/crypto_rand.h" -#include "lib/fs/dir.h" -#include "feature/dirauth/dirvote.h" -#include "feature/nodelist/networkstatus.h" -#include "feature/nodelist/nodelist.h" #include "core/or/relay.h" -#include "feature/dirparse/routerparse.h" +#include "core/or/versions.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/shared_random_state.h" +#include "feature/dircommon/voting_schedule.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_client.h" #include "feature/hs/hs_common.h" #include "feature/hs/hs_config.h" #include "feature/hs/hs_ident.h" #include "feature/hs/hs_intropoint.h" -#include "core/crypto/hs_ntor.h" -#include "feature/hs/hs_circuit.h" -#include "feature/hs/hs_circuitmap.h" #include "feature/hs/hs_service.h" -#include "feature/hs/hs_client.h" -#include "core/mainloop/mainloop.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" #include "feature/rend/rendservice.h" -#include "app/config/statefile.h" -#include "feature/dirauth/shared_random_state.h" -#include "feature/dircommon/voting_schedule.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/fs/dir.h"
#include "core/or/cpath_build_state_st.h" #include "core/or/crypt_path_st.h"