mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge branch 'destroy_common'
This commit is contained in:
Nick Mathewson
+2
-13
@@ -132,19 +132,6 @@ uptime-*.json
|
||||
# /src/trace
|
||||
/src/trace/libor-trace.a
|
||||
|
||||
# /src/common/
|
||||
/src/common/Makefile
|
||||
/src/common/Makefile.in
|
||||
/src/common/libor.a
|
||||
/src/common/libor-testing.a
|
||||
/src/common/libor.lib
|
||||
/src/common/libor-ctime.a
|
||||
/src/common/libor-ctime-testing.a
|
||||
/src/common/libor-ctime.lib
|
||||
/src/common/libor-event.a
|
||||
/src/common/libor-event-testing.a
|
||||
/src/common/libor-event.lib
|
||||
|
||||
# /src/config/
|
||||
/src/config/Makefile
|
||||
/src/config/Makefile.in
|
||||
@@ -173,6 +160,8 @@ uptime-*.json
|
||||
/src/lib/libtor-ctime-testing.a
|
||||
/src/lib/libtor-encoding.a
|
||||
/src/lib/libtor-encoding-testing.a
|
||||
/src/lib/libtor-evloop.a
|
||||
/src/lib/libtor-evloop-testing.a
|
||||
/src/lib/libtor-err.a
|
||||
/src/lib/libtor-err-testing.a
|
||||
/src/lib/libtor-fdio.a
|
||||
|
||||
+2
-4
@@ -40,7 +40,6 @@ endif
|
||||
|
||||
# "Common" libraries used to link tor's utility code.
|
||||
TOR_UTIL_LIBS = \
|
||||
src/common/libor.a \
|
||||
src/lib/libtor-process.a \
|
||||
src/lib/libtor-time.a \
|
||||
src/lib/libtor-fs.a \
|
||||
@@ -68,7 +67,6 @@ TOR_UTIL_LIBS = \
|
||||
# Variants of the above for linking the testing variant of tor (for coverage
|
||||
# and tests)
|
||||
TOR_UTIL_TESTING_LIBS = \
|
||||
src/common/libor-testing.a \
|
||||
src/lib/libtor-process-testing.a \
|
||||
src/lib/libtor-time-testing.a \
|
||||
src/lib/libtor-fs-testing.a \
|
||||
@@ -112,9 +110,9 @@ TOR_CRYPTO_TESTING_LIBS = \
|
||||
TOR_INTERNAL_LIBS = \
|
||||
src/or/libtor-app.a \
|
||||
src/lib/libtor-compress.a \
|
||||
src/lib/libtor-evloop.a \
|
||||
$(TOR_CRYPTO_LIBS) \
|
||||
$(TOR_UTIL_LIBS) \
|
||||
src/common/libor-event.a \
|
||||
src/trunnel/libor-trunnel.a \
|
||||
src/lib/libtor-trace.a
|
||||
|
||||
@@ -123,9 +121,9 @@ TOR_INTERNAL_LIBS = \
|
||||
TOR_INTERNAL_TESTING_LIBS = \
|
||||
src/or/libtor-app-testing.a \
|
||||
src/lib/libtor-compress-testing.a \
|
||||
src/lib/libtor-evloop-testing.a \
|
||||
$(TOR_CRYPTO_TESTING_LIBS) \
|
||||
$(TOR_UTIL_TESTING_LIBS) \
|
||||
src/common/libor-event-testing.a \
|
||||
src/trunnel/libor-trunnel-testing.a \
|
||||
src/lib/libtor-trace.a
|
||||
|
||||
|
||||
@@ -24,32 +24,17 @@ FUZZING_CFLAGS = \
|
||||
FUZZING_LDFLAG = \
|
||||
@TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
|
||||
FUZZING_LIBS = \
|
||||
src/or/libtor-testing.a \
|
||||
src/common/libor-crypto-testing.a \
|
||||
$(LIBKECCAK_TINY) \
|
||||
$(LIBDONNA) \
|
||||
src/common/libor-testing.a \
|
||||
src/common/libor-ctime-testing.a \
|
||||
src/common/libor-event-testing.a \
|
||||
src/trunnel/libor-trunnel-testing.a \
|
||||
$(TOR_INTERNAL_TESTING_LIBS) \
|
||||
$(rust_ldadd) \
|
||||
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
|
||||
@TOR_LIBEVENT_LIBS@ \
|
||||
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
|
||||
@CURVE25519_LIBS@ \
|
||||
@TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \
|
||||
@TOR_SYSTEMD_LIBS@ \
|
||||
@TOR_LZMA_LIBS@ \
|
||||
@TOR_ZSTD_LIBS@
|
||||
|
||||
oss-fuzz-prereqs: \
|
||||
src/or/libtor-testing.a \
|
||||
src/common/libor-crypto-testing.a \
|
||||
$(LIBKECCAK_TINY) \
|
||||
$(LIBDONNA) \
|
||||
src/common/libor-testing.a \
|
||||
src/common/libor-ctime-testing.a \
|
||||
src/common/libor-event-testing.a \
|
||||
src/trunnel/libor-trunnel-testing.a
|
||||
$(TOR_INTERNAL_TESTING_LIBS)
|
||||
|
||||
noinst_HEADERS += \
|
||||
src/test/fuzz/fuzzing.h
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
all: libor.lib libor-crypto.lib libor-event.lib
|
||||
|
||||
CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \
|
||||
/I ..\ext
|
||||
|
||||
LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \
|
||||
log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \
|
||||
util_codedigest.obj
|
||||
|
||||
LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj compress.obj compress_zlib.obj \
|
||||
tortls.obj crypto_curve25519.obj curve25519-donna.obj
|
||||
|
||||
LIBOR_EVENT_OBJECTS = compat_libevent.obj
|
||||
|
||||
curve25519-donna.obj: ..\ext\curve25519_donna\curve25519-donna.c
|
||||
$(CC) $(CFLAGS) /D inline=_inline /c ..\ext\curve25519_donna\curve25519-donna.c
|
||||
|
||||
libor.lib: $(LIBOR_OBJECTS)
|
||||
lib $(LIBOR_OBJECTS) /out:libor.lib
|
||||
|
||||
libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS)
|
||||
lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib
|
||||
|
||||
libor-event.lib: $(LIBOR_EVENT_OBJECTS)
|
||||
lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib
|
||||
|
||||
clean:
|
||||
del *.obj *.lib libor*.lib
|
||||
@@ -1,62 +0,0 @@
|
||||
|
||||
noinst_LIBRARIES += \
|
||||
src/common/libor.a \
|
||||
src/common/libor-event.a
|
||||
|
||||
if UNITTESTS_ENABLED
|
||||
noinst_LIBRARIES += \
|
||||
src/common/libor-testing.a \
|
||||
src/common/libor-event-testing.a
|
||||
endif
|
||||
|
||||
EXTRA_DIST += src/common/Makefile.nmake
|
||||
|
||||
if USE_OPENBSD_MALLOC
|
||||
libor_extra_source=src/ext/OpenBSD_malloc_Linux.c
|
||||
else
|
||||
libor_extra_source=
|
||||
endif
|
||||
|
||||
LIBOR_A_SRC = \
|
||||
src/common/address_set.c \
|
||||
src/common/token_bucket.c \
|
||||
src/common/workqueue.c \
|
||||
$(libor_extra_source)
|
||||
|
||||
src/common/src_common_libor_testing_a-log.$(OBJEXT) \
|
||||
src/common/log.$(OBJEXT): micro-revision.i
|
||||
|
||||
LIBOR_EVENT_A_SRC = \
|
||||
src/common/compat_libevent.c \
|
||||
src/common/procmon.c \
|
||||
src/common/timers.c \
|
||||
src/ext/timeouts/timeout.c
|
||||
|
||||
src_common_libor_a_SOURCES = $(LIBOR_A_SRC)
|
||||
src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC)
|
||||
|
||||
if UNITTESTS_ENABLED
|
||||
src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC)
|
||||
src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC)
|
||||
else
|
||||
src_common_libor_testing_a_SOURCES =
|
||||
src_common_libor_event_testing_a_SOURCES =
|
||||
endif
|
||||
|
||||
src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
|
||||
src_common_libor_event_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
|
||||
src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
|
||||
src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
|
||||
|
||||
COMMONHEADERS = \
|
||||
src/common/address_set.h \
|
||||
src/common/compat_libevent.h \
|
||||
src/common/handles.h \
|
||||
src/common/procmon.h \
|
||||
src/common/socks5_status.h \
|
||||
src/common/timers.h \
|
||||
src/common/token_bucket.h \
|
||||
src/common/util.h \
|
||||
src/common/workqueue.h
|
||||
|
||||
noinst_HEADERS+= $(COMMONHEADERS)
|
||||
@@ -1,52 +0,0 @@
|
||||
/* Copyright (c) 2003-2004, Roger Dingledine
|
||||
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
||||
* Copyright (c) 2007-2018, The Tor Project, Inc. */
|
||||
/* See LICENSE for licensing information */
|
||||
|
||||
/**
|
||||
* \file util.h
|
||||
* \brief Headers for util.c
|
||||
**/
|
||||
|
||||
#ifndef TOR_UTIL_H
|
||||
#define TOR_UTIL_H
|
||||
|
||||
#include "orconfig.h"
|
||||
#include "lib/arch/bytes.h"
|
||||
#include "lib/cc/compat_compiler.h"
|
||||
#include "lib/cc/torint.h"
|
||||
#include "lib/ctime/di_ops.h"
|
||||
#include "lib/encoding/cstring.h"
|
||||
#include "lib/encoding/time_fmt.h"
|
||||
#include "lib/err/torerr.h"
|
||||
#include "lib/fs/dir.h"
|
||||
#include "lib/fs/files.h"
|
||||
#include "lib/fs/mmap.h"
|
||||
#include "lib/fs/path.h"
|
||||
#include "lib/fs/userdb.h"
|
||||
#include "lib/intmath/addsub.h"
|
||||
#include "lib/intmath/bits.h"
|
||||
#include "lib/intmath/cmp.h"
|
||||
#include "lib/intmath/logic.h"
|
||||
#include "lib/intmath/muldiv.h"
|
||||
#include "lib/log/escape.h"
|
||||
#include "lib/log/ratelim.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
#include "lib/malloc/util_malloc.h"
|
||||
#include "lib/net/ipv4.h"
|
||||
#include "lib/net/ipv6.h"
|
||||
#include "lib/net/resolve.h"
|
||||
#include "lib/net/socket.h"
|
||||
#include "lib/string/compat_ctype.h"
|
||||
#include "lib/string/compat_string.h"
|
||||
#include "lib/string/parse_int.h"
|
||||
#include "lib/string/printf.h"
|
||||
#include "lib/string/scanf.h"
|
||||
#include "lib/string/util_string.h"
|
||||
#include "lib/testsupport/testsupport.h"
|
||||
#include "lib/thread/threads.h"
|
||||
#include "lib/time/compat_time.h"
|
||||
#include "lib/wallclock/approx_time.h"
|
||||
#include "lib/wallclock/timeval.h"
|
||||
|
||||
#endif /* !defined(TOR_UTIL_H) */
|
||||
+1
-1
@@ -8,6 +8,7 @@ include src/lib/container/include.am
|
||||
include src/lib/crypt_ops/include.am
|
||||
include src/lib/defs/include.am
|
||||
include src/lib/encoding/include.am
|
||||
include src/lib/evloop/include.am
|
||||
include src/lib/fdio/include.am
|
||||
include src/lib/fs/include.am
|
||||
include src/lib/include.libdonna.am
|
||||
@@ -31,7 +32,6 @@ include src/lib/time/include.am
|
||||
include src/lib/tls/include.am
|
||||
include src/lib/trace/include.am
|
||||
include src/lib/wallclock/include.am
|
||||
include src/common/include.am
|
||||
include src/trunnel/include.am
|
||||
include src/or/include.am
|
||||
include src/rust/include.am
|
||||
|
||||
@@ -21,6 +21,7 @@ noinst_HEADERS += \
|
||||
src/lib/container/bitarray.h \
|
||||
src/lib/container/bloomfilt.h \
|
||||
src/lib/container/buffers.h \
|
||||
src/lib/container/handles.h \
|
||||
src/lib/container/map.h \
|
||||
src/lib/container/order.h \
|
||||
src/lib/container/smartlist.h
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
orconfig.h
|
||||
|
||||
lib/cc/*.h
|
||||
lib/crypt_ops/*.h
|
||||
lib/evloop/*.h
|
||||
lib/intmath/*.h
|
||||
lib/log/*.h
|
||||
lib/malloc/*.h
|
||||
lib/net/*.h
|
||||
lib/string/*.h
|
||||
lib/testsupport/*.h
|
||||
lib/thread/*.h
|
||||
lib/time/*.h
|
||||
|
||||
src/ext/timeouts/timeout.c
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "orconfig.h"
|
||||
#define COMPAT_LIBEVENT_PRIVATE
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
#include "lib/log/torlog.h"
|
||||
@@ -0,0 +1,26 @@
|
||||
|
||||
noinst_LIBRARIES += src/lib/libtor-evloop.a
|
||||
|
||||
if UNITTESTS_ENABLED
|
||||
noinst_LIBRARIES += src/lib/libtor-evloop-testing.a
|
||||
endif
|
||||
|
||||
src_lib_libtor_evloop_a_SOURCES = \
|
||||
src/lib/evloop/compat_libevent.c \
|
||||
src/lib/evloop/procmon.c \
|
||||
src/lib/evloop/timers.c \
|
||||
src/lib/evloop/token_bucket.c \
|
||||
src/lib/evloop/workqueue.c
|
||||
|
||||
|
||||
src_lib_libtor_evloop_testing_a_SOURCES = \
|
||||
$(src_lib_libtor_evloop_a_SOURCES)
|
||||
src_lib_libtor_evloop_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
|
||||
src_lib_libtor_evloop_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
|
||||
|
||||
noinst_HEADERS += \
|
||||
src/lib/evloop/compat_libevent.h \
|
||||
src/lib/evloop/procmon.h \
|
||||
src/lib/evloop/timers.h \
|
||||
src/lib/evloop/token_bucket.h \
|
||||
src/lib/evloop/workqueue.h
|
||||
@@ -6,7 +6,7 @@
|
||||
* \brief Process-termination monitor functions
|
||||
**/
|
||||
|
||||
#include "common/procmon.h"
|
||||
#include "lib/evloop/procmon.h"
|
||||
|
||||
#include "lib/log/torlog.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
@@ -9,7 +9,7 @@
|
||||
#ifndef TOR_PROCMON_H
|
||||
#define TOR_PROCMON_H
|
||||
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include "lib/log/torlog.h"
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
|
||||
#define TOR_TIMERS_PRIVATE
|
||||
|
||||
#include "common/compat_libevent.h"
|
||||
#include "common/timers.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "lib/evloop/timers.h"
|
||||
#include "lib/intmath/muldiv.h"
|
||||
#include "lib/log/torlog.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
#define TOKEN_BUCKET_PRIVATE
|
||||
|
||||
#include "common/token_bucket.h"
|
||||
#include "lib/evloop/token_bucket.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
#include "lib/intmath/cmp.h"
|
||||
#include "lib/time/compat_time.h"
|
||||
@@ -24,8 +24,8 @@
|
||||
*/
|
||||
|
||||
#include "orconfig.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "common/workqueue.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "lib/evloop/workqueue.h"
|
||||
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
#include "lib/intmath/weakrng.h"
|
||||
@@ -8,6 +8,10 @@ endif
|
||||
src_lib_libtor_malloc_a_SOURCES = \
|
||||
src/lib/malloc/util_malloc.c
|
||||
|
||||
if USE_OPENBSD_MALLOC
|
||||
src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c
|
||||
endif
|
||||
|
||||
src_lib_libtor_malloc_testing_a_SOURCES = \
|
||||
$(src_lib_libtor_malloc_a_SOURCES)
|
||||
src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
|
||||
|
||||
@@ -29,4 +29,5 @@ noinst_HEADERS += \
|
||||
src/lib/net/ipv6.h \
|
||||
src/lib/net/nettypes.h \
|
||||
src/lib/net/resolve.h \
|
||||
src/lib/net/socket.h
|
||||
src/lib/net/socket.h \
|
||||
src/lib/net/socks5_status.h
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
**/
|
||||
|
||||
#include "orconfig.h"
|
||||
#include "common/address_set.h"
|
||||
#include "or/address_set.h"
|
||||
#include "lib/net/address.h"
|
||||
#include "lib/container/bloomfilt.h"
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
+1
-1
@@ -79,7 +79,7 @@
|
||||
#include "lib/time/compat_time.h"
|
||||
#include "or/networkstatus.h"
|
||||
#include "or/rendservice.h"
|
||||
#include "common/timers.h"
|
||||
#include "lib/evloop/timers.h"
|
||||
|
||||
#include "or/cell_queue_st.h"
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "or/or.h"
|
||||
#include "or/circuitmux.h"
|
||||
#include "common/handles.h"
|
||||
#include "lib/container/handles.h"
|
||||
#include "lib/crypt_ops/crypto_ed25519.h"
|
||||
|
||||
#include "tor_queue.h"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "or/router.h"
|
||||
#include "lib/time/compat_time.h"
|
||||
#include "or/rendservice.h"
|
||||
#include "common/timers.h"
|
||||
#include "lib/evloop/timers.h"
|
||||
|
||||
#include "or/cell_st.h"
|
||||
#include "or/or_connection_st.h"
|
||||
|
||||
+1
-2
@@ -99,7 +99,6 @@
|
||||
#include "or/rephist.h"
|
||||
#include "or/router.h"
|
||||
#include "lib/sandbox/sandbox.h"
|
||||
#include "common/util.h"
|
||||
#include "or/routerlist.h"
|
||||
#include "or/routerset.h"
|
||||
#include "or/scheduler.h"
|
||||
@@ -132,7 +131,7 @@
|
||||
|
||||
#include "lib/encoding/keyval.h"
|
||||
#include "lib/fs/conffile.h"
|
||||
#include "common/procmon.h"
|
||||
#include "lib/evloop/procmon.h"
|
||||
|
||||
#include "or/dirauth/dirvote.h"
|
||||
#include "or/dirauth/mode.h"
|
||||
|
||||
+1
-1
@@ -105,7 +105,7 @@
|
||||
#include "lib/sandbox/sandbox.h"
|
||||
#include "lib/net/buffers_net.h"
|
||||
#include "lib/tls/tortls.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "lib/compress/compress.h"
|
||||
|
||||
#ifdef HAVE_PWD_H
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
#include "or/or_circuit_st.h"
|
||||
#include "or/origin_circuit_st.h"
|
||||
#include "or/socks_request_st.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#ifdef HAVE_LINUX_TYPES_H
|
||||
#include <linux/types.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#ifndef TOR_CONSCACHE_H
|
||||
#define TOR_CONSCACHE_H
|
||||
|
||||
#include "common/handles.h"
|
||||
#include "lib/container/handles.h"
|
||||
|
||||
typedef struct consensus_cache_entry_t consensus_cache_entry_t;
|
||||
typedef struct consensus_cache_t consensus_cache_t;
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
#include "or/cpuworker.h"
|
||||
#include "or/networkstatus.h"
|
||||
#include "or/routerparse.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "common/workqueue.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "lib/evloop/workqueue.h"
|
||||
#include "lib/compress/compress.h"
|
||||
#include "lib/encoding/confline.h"
|
||||
|
||||
|
||||
+3
-3
@@ -46,7 +46,7 @@
|
||||
#include "or/circuitstats.h"
|
||||
#include "or/circuituse.h"
|
||||
#include "or/command.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "or/config.h"
|
||||
#include "or/confparse.h"
|
||||
#include "or/connection.h"
|
||||
@@ -113,8 +113,8 @@
|
||||
#endif
|
||||
|
||||
#include "lib/crypt_ops/crypto_s2k.h"
|
||||
#include "common/procmon.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/procmon.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
/** Yield true iff <b>s</b> is the state of a control_connection_t that has
|
||||
* finished authentication and is accepting commands. */
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
#include "or/onion.h"
|
||||
#include "or/rephist.h"
|
||||
#include "or/router.h"
|
||||
#include "common/workqueue.h"
|
||||
#include "lib/evloop/workqueue.h"
|
||||
|
||||
#include "or/or_circuit_st.h"
|
||||
#include "lib/intmath/weakrng.h"
|
||||
|
||||
@@ -99,7 +99,6 @@
|
||||
#include "or/routerlist.h"
|
||||
#include "or/shared_random_client.h"
|
||||
#include "or/dirauth/shared_random_state.h"
|
||||
#include "common/util.h"
|
||||
#include "or/voting_schedule.h"
|
||||
|
||||
#include "or/dirauth/dirvote.h"
|
||||
|
||||
+1
-1
@@ -64,7 +64,7 @@
|
||||
#include "or/router.h"
|
||||
#include "ht.h"
|
||||
#include "lib/sandbox/sandbox.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include "or/edge_connection_st.h"
|
||||
#include "or/or_circuit_st.h"
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@
|
||||
#include "or/entry_connection_st.h"
|
||||
#include "or/listener_connection_st.h"
|
||||
#include "or/socks_request_st.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include <event2/dns.h>
|
||||
#include <event2/dns_compat.h>
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#ifndef TOR_ENTRYNODES_H
|
||||
#define TOR_ENTRYNODES_H
|
||||
|
||||
#include "common/handles.h"
|
||||
#include "lib/container/handles.h"
|
||||
|
||||
/* Forward declare for guard_selection_t; entrynodes.c has the real struct */
|
||||
typedef struct guard_selection_s guard_selection_t;
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
#include "or/ext_orport.h"
|
||||
#include "or/main.h"
|
||||
#include "or/proto_ext_or.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#include "or/or_connection_st.h"
|
||||
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ hibernating, phase 2:
|
||||
#include "or/main.h"
|
||||
#include "or/router.h"
|
||||
#include "or/statefile.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include "or/or_connection_st.h"
|
||||
#include "or/or_state_st.h"
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include "lib/crypt_ops/crypto_util.h"
|
||||
#include "or/rendservice.h"
|
||||
#include "or/replaycache.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#include "or/hs_cell.h"
|
||||
#include "or/hs_ntor.h"
|
||||
|
||||
@@ -19,6 +19,7 @@ EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake
|
||||
|
||||
LIBTOR_APP_A_SOURCES = \
|
||||
src/or/addressmap.c \
|
||||
src/or/address_set.c \
|
||||
src/or/bridges.c \
|
||||
src/or/channel.c \
|
||||
src/or/channelpadding.c \
|
||||
@@ -180,6 +181,7 @@ endif
|
||||
|
||||
ORHEADERS = \
|
||||
src/or/addressmap.h \
|
||||
src/or/address_set.h \
|
||||
src/or/addr_policy_st.h \
|
||||
src/or/authority_cert_st.h \
|
||||
src/or/auth_dirs.inc \
|
||||
|
||||
+20
-5
@@ -11,17 +11,28 @@
|
||||
#define KEYPIN_PRIVATE
|
||||
|
||||
#include "orconfig.h"
|
||||
|
||||
#include "lib/cc/torint.h"
|
||||
#include "lib/crypt_ops/crypto_digest.h"
|
||||
#include "lib/crypt_ops/crypto_format.h"
|
||||
#include "lib/crypt_ops/crypto_format.h"
|
||||
#include "lib/ctime/di_ops.h"
|
||||
#include "lib/ctime/di_ops.h"
|
||||
#include "lib/encoding/binascii.h"
|
||||
#include "lib/encoding/time_fmt.h"
|
||||
#include "lib/fdio/fdio.h"
|
||||
#include "lib/fs/files.h"
|
||||
#include "lib/fs/mmap.h"
|
||||
#include "lib/log/torlog.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
#include "lib/string/compat_ctype.h"
|
||||
#include "lib/string/printf.h"
|
||||
#include "lib/wallclock/approx_time.h"
|
||||
|
||||
#include "ht.h"
|
||||
#include "or/keypin.h"
|
||||
|
||||
#include "siphash.h"
|
||||
#include "lib/cc/torint.h"
|
||||
#include "lib/log/torlog.h"
|
||||
#include "lib/fdio/fdio.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/encoding/binascii.h"
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
@@ -34,6 +45,10 @@
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/**
|
||||
* @file keypin.c
|
||||
* @brief Key-pinning for RSA and Ed25519 identity keys at directory
|
||||
|
||||
+2
-2
@@ -117,9 +117,9 @@
|
||||
#include "lib/fs/lockfile.h"
|
||||
#include "lib/net/buffers_net.h"
|
||||
#include "lib/tls/tortls.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "lib/encoding/confline.h"
|
||||
#include "common/timers.h"
|
||||
#include "lib/evloop/timers.h"
|
||||
|
||||
#include <event2/event.h>
|
||||
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@
|
||||
|
||||
#include "or/or.h"
|
||||
#include "lib/net/address.h"
|
||||
#include "common/address_set.h"
|
||||
#include "or/address_set.h"
|
||||
#include "or/bridges.h"
|
||||
#include "or/config.h"
|
||||
#include "or/control.h"
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
#include "or/ntmain.h"
|
||||
#include "lib/log/win32err.h"
|
||||
#include "lib/fs/winlib.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include <windows.h>
|
||||
#define GENSRV_SERVICENAME "tor"
|
||||
|
||||
+7
-4
@@ -21,14 +21,17 @@
|
||||
#include "orconfig.h"
|
||||
|
||||
#define ONION_NTOR_PRIVATE
|
||||
|
||||
#include "lib/crypt_ops/crypto.h"
|
||||
#include "lib/crypt_ops/crypto_hkdf.h"
|
||||
#include "lib/crypt_ops/crypto_digest.h"
|
||||
#include "lib/crypt_ops/crypto_hkdf.h"
|
||||
#include "lib/crypt_ops/crypto_util.h"
|
||||
#include "or/onion_ntor.h"
|
||||
#include "lib/log/torlog.h"
|
||||
#include "lib/ctime/di_ops.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/log/torlog.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
#include "or/onion_ntor.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/** Free storage held in an ntor handshake state. */
|
||||
void
|
||||
|
||||
+36
-2
@@ -22,14 +22,48 @@
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
#include "common/util.h"
|
||||
|
||||
#include "lib/arch/bytes.h"
|
||||
#include "lib/cc/compat_compiler.h"
|
||||
#include "lib/cc/torint.h"
|
||||
#include "lib/container/map.h"
|
||||
#include "lib/container/smartlist.h"
|
||||
#include "lib/crypt_ops/crypto.h"
|
||||
#include "lib/ctime/di_ops.h"
|
||||
#include "lib/defs/dh_sizes.h"
|
||||
#include "lib/encoding/binascii.h"
|
||||
#include "lib/encoding/cstring.h"
|
||||
#include "lib/encoding/time_fmt.h"
|
||||
#include "lib/err/torerr.h"
|
||||
#include "lib/fs/dir.h"
|
||||
#include "lib/fs/files.h"
|
||||
#include "lib/fs/mmap.h"
|
||||
#include "lib/fs/path.h"
|
||||
#include "lib/fs/userdb.h"
|
||||
#include "lib/intmath/addsub.h"
|
||||
#include "lib/intmath/bits.h"
|
||||
#include "lib/intmath/cmp.h"
|
||||
#include "lib/intmath/logic.h"
|
||||
#include "lib/intmath/muldiv.h"
|
||||
#include "lib/log/escape.h"
|
||||
#include "lib/log/ratelim.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
#include "lib/malloc/util_malloc.h"
|
||||
#include "lib/net/address.h"
|
||||
#include "lib/net/ipv4.h"
|
||||
#include "lib/net/ipv6.h"
|
||||
#include "lib/net/resolve.h"
|
||||
#include "lib/net/socket.h"
|
||||
#include "lib/string/compat_ctype.h"
|
||||
#include "lib/string/compat_string.h"
|
||||
#include "lib/string/parse_int.h"
|
||||
#include "lib/string/printf.h"
|
||||
#include "lib/string/scanf.h"
|
||||
#include "lib/string/util_string.h"
|
||||
#include "lib/testsupport/testsupport.h"
|
||||
#include "lib/thread/threads.h"
|
||||
#include "lib/time/compat_time.h"
|
||||
#include "lib/wallclock/approx_time.h"
|
||||
#include "lib/wallclock/timeval.h"
|
||||
|
||||
#include "ht.h"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#define OR_CONNECTION_ST_H
|
||||
|
||||
#include "or/connection_st.h"
|
||||
#include "common/token_bucket.h"
|
||||
#include "lib/evloop/token_bucket.h"
|
||||
|
||||
struct tor_tls_t;
|
||||
|
||||
|
||||
+2
-2
@@ -12,11 +12,11 @@
|
||||
*/
|
||||
|
||||
#include "or/or.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "or/config.h"
|
||||
#include "or/main.h"
|
||||
#include "or/periodic.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
/** We disable any interval greater than this number of seconds, on the
|
||||
* grounds that it is probably an absolute time mistakenly passed in as a
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#ifndef TOR_REASONS_H
|
||||
#define TOR_REASONS_H
|
||||
|
||||
#include "common/socks5_status.h"
|
||||
#include "lib/net/socks5_status.h"
|
||||
enum bandwidth_weight_rule_t;
|
||||
|
||||
const char *stream_end_reason_to_control_string(int reason);
|
||||
|
||||
+2
-2
@@ -4,7 +4,7 @@
|
||||
#include "or/or.h"
|
||||
#include "or/config.h"
|
||||
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#define SCHEDULER_PRIVATE_
|
||||
#define SCHEDULER_KIST_PRIVATE
|
||||
#include "or/scheduler.h"
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "lib/container/buffers.h"
|
||||
#define TOR_CHANNEL_INTERNAL_
|
||||
#include "or/channeltls.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include "or/or_connection_st.h"
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
#include "or/config.h"
|
||||
#include "or/voting_schedule.h"
|
||||
#include "or/networkstatus.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/encoding/binascii.h"
|
||||
|
||||
#include "or/networkstatus_st.h"
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#include "or/torcert.h"
|
||||
#include "trunnel/ed25519_cert.h"
|
||||
#include "lib/log/torlog.h"
|
||||
#include "common/util.h"
|
||||
#include "trunnel/link_handshake.h"
|
||||
#include "lib/tls/tortls.h"
|
||||
|
||||
|
||||
@@ -96,7 +96,6 @@
|
||||
#include "or/connection.h"
|
||||
#include "or/circuitbuild.h"
|
||||
#include "or/transports.h"
|
||||
#include "common/util.h"
|
||||
#include "or/router.h"
|
||||
#include "or/statefile.h"
|
||||
#include "or/connection_or.h"
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#include "lib/crypt_ops/crypto_ed25519.h"
|
||||
#include "or/hs_descriptor.h"
|
||||
#include "or/routerparse.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#include "test/fuzz/fuzzing.h"
|
||||
|
||||
|
||||
+1
-1
@@ -271,7 +271,7 @@ src_test_test_workqueue_LDADD = \
|
||||
src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS)
|
||||
src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS)
|
||||
src_test_test_timers_LDADD = \
|
||||
src/common/libor-event-testing.a \
|
||||
src/lib/libtor-evloop-testing.a \
|
||||
$(TOR_CRYPTO_TESTING_LIBS) \
|
||||
$(TOR_UTIL_TESTING_LIBS) \
|
||||
$(rust_ldadd) \
|
||||
|
||||
@@ -2,14 +2,16 @@
|
||||
/* See LICENSE for licensing information */
|
||||
|
||||
#include "orconfig.h"
|
||||
#include "lib/crypt_ops/crypto_util.h"
|
||||
|
||||
#include "lib/intmath/cmp.h"
|
||||
#include "lib/malloc/util_malloc.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "lib/crypt_ops/crypto_util.h"
|
||||
#include "common/util.h"
|
||||
|
||||
static unsigned fill_a_buffer_memset(void) __attribute__((noinline));
|
||||
static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline));
|
||||
static unsigned fill_a_buffer_nothing(void) __attribute__((noinline));
|
||||
@@ -214,4 +216,3 @@ main(int argc, char **argv)
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,10 +7,12 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "lib/evloop/timers.h"
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
#include "common/timers.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
#include "lib/time/compat_time.h"
|
||||
#include "lib/wallclock/timeval.h"
|
||||
|
||||
#define N_TIMERS 1000
|
||||
#define MAX_DURATION 30
|
||||
@@ -138,4 +140,3 @@ main(int argc, char **argv)
|
||||
timers_shutdown();
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "or/or.h"
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
#include "common/address_set.h"
|
||||
#include "or/address_set.h"
|
||||
#include "or/microdesc.h"
|
||||
#include "or/networkstatus.h"
|
||||
#include "or/nodelist.h"
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
#include "or/bridges.h"
|
||||
#include "or/config.h"
|
||||
#include "or/transports.h"
|
||||
#include "common/util.h"
|
||||
|
||||
/* Test suite stuff */
|
||||
#include "test/test.h"
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
/* To prevent 'assert' from going away. */
|
||||
#undef TOR_COVERAGE
|
||||
#include "or/or.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/err/backtrace.h"
|
||||
#include "lib/log/torlog.h"
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "or/or.h"
|
||||
#include "test/test.h"
|
||||
|
||||
#include "common/token_bucket.h"
|
||||
#include "lib/evloop/token_bucket.h"
|
||||
|
||||
// an imaginary time, in timestamp units. Chosen so it will roll over.
|
||||
static const uint32_t START_TS = UINT32_MAX-10;
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
#include "or/channel.h"
|
||||
#include "or/channeltls.h"
|
||||
#include "or/channelpadding.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "or/config.h"
|
||||
#include "lib/time/compat_time.h"
|
||||
#include "or/main.h"
|
||||
#include "or/networkstatus.h"
|
||||
#include "test/log_test_helpers.h"
|
||||
#include "lib/tls/tortls.h"
|
||||
#include "common/timers.h"
|
||||
#include "lib/evloop/timers.h"
|
||||
#include "lib/container/buffers.h"
|
||||
|
||||
#include "or/cell_st.h"
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
|
||||
#include "or/config.h"
|
||||
#include "test/test.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
#include <sys/stat.h>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "test/test.h"
|
||||
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include <event2/event.h>
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#include "or/connection.h"
|
||||
#include "or/connection_edge.h"
|
||||
#include "test/test.h"
|
||||
#include "common/util.h"
|
||||
#include "or/connection_or.h"
|
||||
#include "or/control.h"
|
||||
#include "or/cpuworker.h"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
#include "or/networkstatus.h"
|
||||
#include "or/routerparse.h"
|
||||
#include "common/workqueue.h"
|
||||
#include "lib/evloop/workqueue.h"
|
||||
#include "lib/compress/compress.h"
|
||||
#include "lib/encoding/confline.h"
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#include "or/or.h"
|
||||
#include "test/test.h"
|
||||
#include "lib/crypt_ops/aes.h"
|
||||
#include "common/util.h"
|
||||
#include "siphash.h"
|
||||
#include "lib/crypt_ops/crypto_curve25519.h"
|
||||
#include "lib/crypt_ops/crypto_dh.h"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
#define CRYPTO_RAND_PRIVATE
|
||||
|
||||
#include "lib/crypt_ops/compat_openssl.h"
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/encoding/binascii.h"
|
||||
#include "test/test.h"
|
||||
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/rand.h>
|
||||
#include "lib/crypt_ops/compat_openssl.h"
|
||||
#include <string.h>
|
||||
|
||||
/* Test for rectifying openssl RAND engine. */
|
||||
static void
|
||||
@@ -103,4 +103,3 @@ struct testcase_t crypto_openssl_tests[] = {
|
||||
TT_FORK, NULL, NULL },
|
||||
END_OF_TESTCASES
|
||||
};
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "or/routerparse.h"
|
||||
#include "or/routerset.h"
|
||||
#include "or/statefile.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#include "or/cpath_build_state_st.h"
|
||||
#include "or/crypt_path_st.h"
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#include "or/config.h"
|
||||
#include "or/dirserv.h"
|
||||
#include "or/entrynodes.h"
|
||||
#include "common/util.h"
|
||||
#include "or/routerparse.h"
|
||||
#include "or/networkstatus.h"
|
||||
|
||||
|
||||
@@ -4,8 +4,10 @@
|
||||
#include "orconfig.h"
|
||||
#include "test/test.h"
|
||||
|
||||
#include "common/util.h"
|
||||
#include "common/handles.h"
|
||||
#include "lib/container/handles.h"
|
||||
#include "lib/log/util_bug.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
typedef struct demo_t {
|
||||
HANDLE_ENTRY(demo, demo_t);
|
||||
@@ -94,4 +96,3 @@ struct testcase_t handle_tests[] = {
|
||||
HANDLE_TEST(basic, 0),
|
||||
END_OF_TESTCASES
|
||||
};
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#include "or/statefile.h"
|
||||
#include "or/circuitlist.h"
|
||||
#include "or/dirauth/shared_random.h"
|
||||
#include "common/util.h"
|
||||
#include "or/voting_schedule.h"
|
||||
|
||||
#include "or/microdesc_st.h"
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
|
||||
#define ONION_NTOR_PRIVATE
|
||||
#include "or/or.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/crypt_ops/crypto.h"
|
||||
#include "lib/crypt_ops/crypto_curve25519.h"
|
||||
#include "lib/crypt_ops/crypto_ed25519.h"
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#define KEYPIN_PRIVATE
|
||||
#include "or/or.h"
|
||||
#include "or/keypin.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#include "test/test.h"
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
#define ONION_NTOR_PRIVATE
|
||||
#include "or/or.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/crypt_ops/crypto.h"
|
||||
#include "lib/crypt_ops/crypto_curve25519.h"
|
||||
#include "or/onion_ntor.h"
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include "or/or.h"
|
||||
#include "lib/container/buffers.h"
|
||||
#include "or/circuitlist.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "or/connection.h"
|
||||
#include "or/config.h"
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "or/or.h"
|
||||
#include "test/test.h"
|
||||
|
||||
#include "common/procmon.h"
|
||||
#include "lib/evloop/procmon.h"
|
||||
|
||||
#include "test/log_test_helpers.h"
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include "or/control.h"
|
||||
#include "or/transports.h"
|
||||
#include "or/circuitbuild.h"
|
||||
#include "common/util.h"
|
||||
#include "or/statefile.h"
|
||||
#include "test/test.h"
|
||||
#include "lib/process/subprocess.h"
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#include "or/config.h"
|
||||
#include "or/router.h"
|
||||
#include "or/routerkeys.h"
|
||||
#include "common/util.h"
|
||||
#include "lib/crypt_ops/crypto.h"
|
||||
#include "lib/crypt_ops/crypto_format.h"
|
||||
#include "or/torcert.h"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#define CHANNEL_PRIVATE_
|
||||
#include "or/or.h"
|
||||
#include "or/config.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "or/channel.h"
|
||||
#include "or/channeltls.h"
|
||||
#include "or/connection.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "test/test.h"
|
||||
#include "test/log_test_helpers.h"
|
||||
#include "or/socks_request_st.h"
|
||||
#include "common/socks5_status.h"
|
||||
#include "lib/net/socks5_status.h"
|
||||
|
||||
typedef struct socks_test_data_t {
|
||||
socks_request_t *req;
|
||||
|
||||
@@ -6,13 +6,17 @@
|
||||
#include "orconfig.h"
|
||||
#define UTIL_PRIVATE
|
||||
#define SUBPROCESS_PRIVATE
|
||||
#include "common/util.h"
|
||||
#include "lib/process/waitpid.h"
|
||||
#include "lib/crypt_ops/crypto.h"
|
||||
#include "lib/log/torlog.h"
|
||||
#include "lib/process/subprocess.h"
|
||||
#include "lib/process/waitpid.h"
|
||||
#include "lib/string/printf.h"
|
||||
#include "lib/time/compat_time.h"
|
||||
#include "test/test.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifndef BUILDDIR
|
||||
#define BUILDDIR "."
|
||||
#endif
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
#include "or/or.h"
|
||||
#include "lib/thread/threads.h"
|
||||
#include "or/onion.h"
|
||||
#include "common/workqueue.h"
|
||||
#include "lib/evloop/workqueue.h"
|
||||
#include "lib/crypt_ops/crypto_curve25519.h"
|
||||
#include "lib/crypt_ops/crypto_rand.h"
|
||||
#include "lib/net/alertsock.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
#include "lib/intmath/weakrng.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "or/channelpadding.h"
|
||||
#include "or/main.h"
|
||||
#include "lib/compress/compress.h"
|
||||
#include "common/compat_libevent.h"
|
||||
#include "lib/evloop/compat_libevent.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#ifdef HAVE_FCNTL_H
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "lib/sandbox/sandbox.h"
|
||||
#include "lib/string/util_string.h"
|
||||
|
||||
#include "common/socks5_status.h"
|
||||
#include "lib/net/socks5_status.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
Reference in New Issue
Block a user