Isolate resolve.h usage in the modules that really need it.

(Almost none of Tor should actually need to touch the platform resolver.)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index fa99fb0c884e32cf9b4df1b7a04812215ce3480e..1be1803f29cd00bfcaf40d7442a2681d9d67e4da 100644 (file)
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -106,6 +106,7 @@
 #include "feature/client/transports.h"
 #include "feature/relay/ext_orport.h"
 #include "feature/dircommon/voting_schedule.h"
+#include "lib/net/resolve.h"
 #ifdef _WIN32
 #include <shlobj.h>
 #endif

diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c
index 8eeef45026d43d47787c750ee829497b0c843f48..656dc2eec3027fb38c93a9a5ec14607dc15261a2 100644 (file)
--- a/src/app/config/statefile.c
+++ b/src/app/config/statefile.c
@@ -43,6 +43,7 @@
 #include "lib/sandbox/sandbox.h"
 #include "app/config/statefile.h"
 #include "lib/encoding/confline.h"
+#include "lib/net/resolve.h"
 
 #include "app/config/or_state_st.h"
 

diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c
index c5773ddfc12dee28d5e180d083a87f21e207d4a1..048397a2da4572b909da9c4f10092a00b3ad52cf 100644 (file)
--- a/src/core/mainloop/main.c
+++ b/src/core/mainloop/main.c
@@ -116,6 +116,7 @@
 #include "lib/sandbox/sandbox.h"
 #include "lib/fs/lockfile.h"
 #include "lib/net/buffers_net.h"
+#include "lib/net/resolve.h"
 #include "lib/tls/tortls.h"
 #include "lib/evloop/compat_libevent.h"
 #include "lib/encoding/confline.h"

diff --git a/src/core/or/or.h b/src/core/or/or.h
index a9bef9404a5c0da2178222127f99e4236ffea258..2e419eefd5e006a457d80e4b9ea445d2a243c57c 100644 (file)
--- a/src/core/or/or.h
+++ b/src/core/or/or.h
@@ -50,7 +50,6 @@
 #include "lib/malloc/util_malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
-#include "lib/net/resolve.h"
 #include "lib/net/socket.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/compat_string.h"

diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
index 12226fee64826f2c21e5b2486797ad84a5e702aa..8b54329da950d0aa4a6701bb6ccc291946730a82 100644 (file)
--- a/src/feature/nodelist/routerlist.c
+++ b/src/feature/nodelist/routerlist.c
@@ -123,6 +123,7 @@
 #include "lib/sandbox/sandbox.h"
 #include "feature/nodelist/torcert.h"
 #include "lib/math/fp.h"
+#include "lib/net/resolve.h"
 
 #include "feature/dirauth/dirvote.h"
 #include "feature/dirauth/mode.h"

diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c
index da4a98b3d120cf6b59bf374d84098cf290e90bbd..1a99bd56edce9099beeac6a7eddad599a85c842c 100644 (file)
--- a/src/feature/rend/rendservice.c
+++ b/src/feature/rend/rendservice.c
@@ -37,6 +37,7 @@
 #include "feature/nodelist/routerparse.h"
 #include "feature/nodelist/routerset.h"
 #include "lib/encoding/confline.h"
+#include "lib/net/resolve.h"
 
 #include "core/or/cpath_build_state_st.h"
 #include "core/or/crypt_path_st.h"

diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index c85779e52e0234f161640bf1fdc4fe664c3e3219..a9004048a53472afcdd12eaedc9f0bb2b08c9a52 100644 (file)
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -10,6 +10,7 @@
 #include "test/test.h"
 #include "feature/client/addressmap.h"
 #include "test/log_test_helpers.h"
+#include "lib/net/resolve.h"
 
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>

diff --git a/src/test/test_config.c b/src/test/test_config.c
index af3a8a7cfe4aa8e2b795283f1e44d5365daeec5f..393378b4c82b73de79ccddab5c99425c4bf00c4a 100644 (file)
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -10,6 +10,7 @@
 #define ROUTERSET_PRIVATE
 #include "core/or/or.h"
 #include "lib/net/address.h"
+#include "lib/net/resolve.h"
 #include "feature/client/addressmap.h"
 #include "feature/client/bridges.h"
 #include "core/or/circuitmux_ewma.h"

diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index c423c6573f3188105f188f551c79a24a2bee78b8..e716c83fe176852b665a4f147911bb173b1ebeba 100644 (file)
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -20,6 +20,7 @@
 #include "feature/rend/rendcache.h"
 #include "feature/dircache/directory.h"
 #include "core/or/connection_or.h"
+#include "lib/net/resolve.h"
 
 #include "test/test_connection.h"
 #include "test/test_helpers.h"
@@ -899,4 +900,3 @@ struct testcase_t connection_tests[] = {
   { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-

diff --git a/src/test/test_controller.c b/src/test/test_controller.c
index 2ded04619cbc9ec3e14fffab303862a11ed6d245..d0aa86844899b6bea86d4d5585c5392a36c41afd 100644 (file)
--- a/src/test/test_controller.c
+++ b/src/test/test_controller.c
@@ -14,6 +14,7 @@
 #include "feature/nodelist/nodelist.h"
 #include "test/test.h"
 #include "test/test_helpers.h"
+#include "lib/net/resolve.h"
 
 #include "feature/control/control_connection_st.h"
 #include "feature/dirclient/download_status_st.h"

diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index c666bca59aab90deaba00e1163c2fd0c41f5dede..c9138611d8e024c5b9f2df1d02d3ba95bd23b585 100644 (file)
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -24,6 +24,7 @@
 #include "core/or/relay.h"
 #include "feature/nodelist/routerlist.h"
 #include "lib/encoding/confline.h"
+#include "lib/net/resolve.h"
 
 #include "core/or/cell_st.h"
 #include "core/or/connection_st.h"

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 396965401eb6ed8a9678776cc475bcc583ae09b4..4e890205b2e1d00b6468f7dab48dfe7e01433b14 100644 (file)
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -21,6 +21,7 @@
 #include "lib/encoding/confline.h"
 #include "core/or/policies.h"
 #include "test/test_helpers.h"
+#include "lib/net/resolve.h"
 
 #define NS_MODULE test_options
 

diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index dea3791da2a073eddf69eb59c77e31c4731fbf44..d0160d11484873eae0565c135928ab2476164a51 100644 (file)
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -19,6 +19,7 @@
 #include "test/test.h"
 #include "lib/process/subprocess.h"
 #include "lib/encoding/confline.h"
+#include "lib/net/resolve.h"
 
 #include "app/config/or_state_st.h"