Move sandbox code into a new library.

This commit is contained in:
Nick Mathewson 2018-06-27 09:48:26 -04:00
parent d893be190f
commit bee580ddba
10 changed files with 35 additions and 3 deletions

2
.gitignore vendored
View File

@ -185,6 +185,8 @@ uptime-*.json
/src/lib/libtor-malloc-testing.a /src/lib/libtor-malloc-testing.a
/src/lib/libtor-net.a /src/lib/libtor-net.a
/src/lib/libtor-net-testing.a /src/lib/libtor-net-testing.a
/src/lib/libtor-sandbox.a
/src/lib/libtor-sandbox-testing.a
/src/lib/libtor-string.a /src/lib/libtor-string.a
/src/lib/libtor-string-testing.a /src/lib/libtor-string-testing.a
/src/lib/libtor-tls.a /src/lib/libtor-tls.a

View File

@ -40,6 +40,7 @@ endif
# "Common" libraries used to link tor's utility code. # "Common" libraries used to link tor's utility code.
TOR_UTIL_LIBS = \ TOR_UTIL_LIBS = \
src/common/libor.a \ src/common/libor.a \
src/lib/libtor-sandbox.a \
src/lib/libtor-net.a \ src/lib/libtor-net.a \
src/lib/libtor-log.a \ src/lib/libtor-log.a \
src/lib/libtor-lock.a \ src/lib/libtor-lock.a \
@ -56,6 +57,7 @@ TOR_UTIL_LIBS = \
# and tests) # and tests)
TOR_UTIL_TESTING_LIBS = \ TOR_UTIL_TESTING_LIBS = \
src/common/libor-testing.a \ src/common/libor-testing.a \
src/lib/libtor-sandbox-testing.a \
src/lib/libtor-net-testing.a \ src/lib/libtor-net-testing.a \
src/lib/libtor-log-testing.a \ src/lib/libtor-log-testing.a \
src/lib/libtor-lock-testing.a \ src/lib/libtor-lock-testing.a \

View File

@ -41,7 +41,6 @@ LIBOR_A_SRC = \
src/common/util.c \ src/common/util.c \
src/common/util_format.c \ src/common/util_format.c \
src/common/util_process.c \ src/common/util_process.c \
src/common/sandbox.c \
src/common/storagedir.c \ src/common/storagedir.c \
src/common/token_bucket.c \ src/common/token_bucket.c \
src/common/workqueue.c \ src/common/workqueue.c \
@ -84,9 +83,7 @@ COMMONHEADERS = \
src/common/confline.h \ src/common/confline.h \
src/common/handles.h \ src/common/handles.h \
src/common/memarea.h \ src/common/memarea.h \
src/common/linux_syscalls.inc \
src/common/procmon.h \ src/common/procmon.h \
src/common/sandbox.h \
src/common/storagedir.h \ src/common/storagedir.h \
src/common/timers.h \ src/common/timers.h \
src/common/token_bucket.h \ src/common/token_bucket.h \

View File

@ -13,6 +13,7 @@ include src/lib/lock/include.am
include src/lib/log/include.am include src/lib/log/include.am
include src/lib/malloc/include.am include src/lib/malloc/include.am
include src/lib/net/include.am include src/lib/net/include.am
include src/lib/sandbox/include.am
include src/lib/string/include.am include src/lib/string/include.am
include src/lib/testsupport/include.am include src/lib/testsupport/include.am
include src/lib/tls/include.am include src/lib/tls/include.am

View File

@ -0,0 +1,11 @@
orconfig.h
lib/cc/*.h
lib/container/*.h
lib/err/*.h
lib/log/*.h
lib/sandbox/*.h
ht.h
siphash.h
tor_queue.h

View File

@ -0,0 +1,18 @@
noinst_LIBRARIES += src/lib/libtor-sandbox.a
if UNITTESTS_ENABLED
noinst_LIBRARIES += src/lib/libtor-sandbox-testing.a
endif
src_lib_libtor_sandbox_a_SOURCES = \
src/lib/sandbox/sandbox.c
src_lib_libtor_sandbox_testing_a_SOURCES = \
$(src_lib_libtor_sandbox_a_SOURCES)
src_lib_libtor_sandbox_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_lib_libtor_sandbox_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
noinst_HEADERS += \
src/lib/sandbox/linux_syscalls.inc \
src/lib/sandbox/sandbox.h

View File

@ -151,6 +151,7 @@ pub fn main() {
// moving forward! // moving forward!
cfg.component("tor-crypt-ops-testing"); cfg.component("tor-crypt-ops-testing");
cfg.component("or-testing"); cfg.component("or-testing");
cfg.component("tor-sandbox");
cfg.component("tor-net"); cfg.component("tor-net");
cfg.component("tor-log"); cfg.component("tor-log");
cfg.component("tor-lock"); cfg.component("tor-lock");