Remove dependency on lib/net from lib/sandbox.

This was trivial, and the easiest way to remove the remaining
.may_include circularities.

diff --git a/src/app/main/main.c b/src/app/main/main.c
index 653a393fe4b5d98e767b877202e08d5647aecb06..ec86c46397fb1c54d007c9c26af575ba11353c78 100644 (file)
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1402,6 +1402,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
       tor_free_all(0);
       return -1;
     }
+    tor_make_getaddrinfo_cache_active();
 
     // registering libevent rng
 #ifdef HAVE_EVUTIL_SECURE_RNG_SET_URANDOM_DEVICE_FILE

diff --git a/src/lib/sandbox/.may_include b/src/lib/sandbox/.may_include
index 84906dfb3d3cb9e15795ecf5835be32eb9d55640..e8ba5bb73c94e152e711580229c28d3f2376922b 100644 (file)
--- a/src/lib/sandbox/.may_include
+++ b/src/lib/sandbox/.may_include
@@ -5,7 +5,6 @@ lib/container/*.h
 lib/err/*.h
 lib/log/*.h
 lib/malloc/*.h
-lib/net/*.h
 lib/sandbox/*.h
 lib/sandbox/*.inc
 lib/string/*.h

diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 6f074bb4e1df11f51ba56214d1479a55125878cf..4d832f106db562006e96329fe81c8f9925c13ccc 100644 (file)
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -38,7 +38,6 @@
 #include "lib/err/torerr.h"
 #include "lib/log/log.h"
 #include "lib/cc/torint.h"
-#include "lib/net/resolve.h"
 #include "lib/malloc/malloc.h"
 #include "lib/string/scanf.h"
 
@@ -1553,7 +1552,6 @@ install_syscall_filter(sandbox_cfg_t* cfg)
 
   // marking the sandbox as active
   sandbox_active = 1;
-  tor_make_getaddrinfo_cache_active();
 
  end:
   seccomp_release(ctx);