Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mike Perry
Tor
Commits
0dab29ce
Commit
0dab29ce
authored
Jun 20, 2018
by
Nick Mathewson
🌻
Browse files
Run rectify_include_paths.py
parent
257b2807
Changes
410
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
0dab29ce
...
...
@@ -18,7 +18,8 @@ bin_SCRIPTS=
AM_CPPFLAGS
=
\
-I
$(top_srcdir)
/src
\
-I
$(top_srcdir)
/src/ext
\
-I
$(top_srcdir)
/src/ext/trunnel
-I
$(top_srcdir)
/src/ext/trunnel
\
-I
$(top_srcdir)
/src/trunnel
AM_CFLAGS
=
@TOR_SYSTEMD_CFLAGS@ @CFLAGS_BUGTRAP@ @TOR_LZMA_CFLAGS@ @TOR_ZSTD_CFLAGS@
SHELL
=
@SHELL@
...
...
scripts/maint/rectify_include_paths.py
View file @
0dab29ce
...
...
@@ -46,7 +46,7 @@ def fix_includes(inp, out, mapping):
incs
=
get_include_map
()
for
dirpath
,
dirnames
,
fnames
in
os
.
walk
(
"src"
):
exclude
([
"ext"
,
"trunnel"
],
dirnames
)
exclude
([
"trunnel"
],
dirnames
)
for
fname
in
fnames
:
if
fname
.
endswith
(
".c"
)
or
fname
.
endswith
(
".h"
):
...
...
src/common/address.c
View file @
0dab29ce
...
...
@@ -35,13 +35,13 @@
#include
<iphlpapi.h>
#endif
/* defined(_WIN32) */
#include
"compat.h"
#include
"util.h"
#include
"util_format.h"
#include
"address.h"
#include
"torlog.h"
#include
"container.h"
#include
"sandbox.h"
#include
"
common/
compat.h"
#include
"
common/
util.h"
#include
"
common/
util_format.h"
#include
"
common/
address.h"
#include
"
common/
torlog.h"
#include
"
common/
container.h"
#include
"
common/
sandbox.h"
#ifdef HAVE_SYS_TIME_H
#include
<sys/time.h>
...
...
src/common/address.h
View file @
0dab29ce
...
...
@@ -13,9 +13,9 @@
//#include <sys/sockio.h>
#include
"orconfig.h"
#include
"torint.h"
#include
"compat.h"
#include
"container.h"
#include
"
common/
torint.h"
#include
"
common/
compat.h"
#include
"
common/
container.h"
#ifdef ADDRESS_PRIVATE
...
...
src/common/address_set.c
View file @
0dab29ce
...
...
@@ -11,12 +11,12 @@
**/
#include
"orconfig.h"
#include
"address_set.h"
#include
"address.h"
#include
"compat.h"
#include
"container.h"
#include
"crypto_rand.h"
#include
"util.h"
#include
"
common/
address_set.h"
#include
"
common/
address.h"
#include
"
common/
compat.h"
#include
"
common/
container.h"
#include
"
common/
crypto_rand.h"
#include
"
common/
util.h"
#include
"siphash.h"
/** How many 64-bit siphash values to extract per address */
...
...
src/common/address_set.h
View file @
0dab29ce
...
...
@@ -14,7 +14,7 @@
#define TOR_ADDRESS_SET_H
#include
"orconfig.h"
#include
"torint.h"
#include
"
common/
torint.h"
/**
* An address_set_t represents a set of tor_addr_t values. The implementation
...
...
src/common/aes.c
View file @
0dab29ce
...
...
@@ -16,9 +16,9 @@
#include
<ws2tcpip.h>
#endif
#include
"compat_openssl.h"
#include
"
common/
compat_openssl.h"
#include
<openssl/opensslv.h>
#include
"crypto_openssl_mgt.h"
#include
"
common/
crypto_openssl_mgt.h"
#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,0)
#error "We require OpenSSL >= 1.0.0"
...
...
@@ -36,11 +36,11 @@ DISABLE_GCC_WARNING(redundant-decls)
ENABLE_GCC_WARNING
(
redundant
-
decls
)
#include
"compat.h"
#include
"aes.h"
#include
"util.h"
#include
"torlog.h"
#include
"di_ops.h"
#include
"
common/
compat.h"
#include
"
common/
aes.h"
#include
"
common/
util.h"
#include
"
common/
torlog.h"
#include
"
common/
di_ops.h"
#ifdef ANDROID
/* Android's OpenSSL seems to have removed all of its Engine support. */
...
...
src/common/backtrace.c
View file @
0dab29ce
...
...
@@ -14,9 +14,9 @@
*/
#include
"orconfig.h"
#include
"compat.h"
#include
"util.h"
#include
"torlog.h"
#include
"
common/
compat.h"
#include
"
common/
util.h"
#include
"
common/
torlog.h"
#ifdef HAVE_EXECINFO_H
#include
<execinfo.h>
...
...
@@ -40,7 +40,7 @@
#endif
/* defined(HAVE_CYGWIN_SIGNAL_H) || ... */
#define EXPOSE_CLEAN_BACKTRACE
#include
"backtrace.h"
#include
"
common/
backtrace.h"
#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
...
...
src/common/buffers.c
View file @
0dab29ce
...
...
@@ -21,12 +21,12 @@
#define BUFFERS_PRIVATE
#include
"orconfig.h"
#include
<stddef.h>
#include
"buffers.h"
#include
"compat.h"
#include
"compress.h"
#include
"util.h"
#include
"torint.h"
#include
"torlog.h"
#include
"
common/
buffers.h"
#include
"
common/
compat.h"
#include
"
common/
compress.h"
#include
"
common/
util.h"
#include
"
common/
torint.h"
#include
"
common/
torlog.h"
#ifdef HAVE_UNISTD_H
#include
<unistd.h>
#endif
...
...
src/common/buffers.h
View file @
0dab29ce
...
...
@@ -12,9 +12,9 @@
#ifndef TOR_BUFFERS_H
#define TOR_BUFFERS_H
#include
"compat.h"
#include
"torint.h"
#include
"testsupport.h"
#include
"
common/
compat.h"
#include
"
common/
torint.h"
#include
"
common/
testsupport.h"
typedef
struct
buf_t
buf_t
;
...
...
src/common/buffers_tls.c
View file @
0dab29ce
...
...
@@ -7,14 +7,14 @@
#define BUFFERS_PRIVATE
#include
"orconfig.h"
#include
<stddef.h>
#include
"buffers.h"
#include
"buffers_tls.h"
#include
"compat.h"
#include
"compress.h"
#include
"util.h"
#include
"torint.h"
#include
"torlog.h"
#include
"tortls.h"
#include
"
common/
buffers.h"
#include
"
common/
buffers_tls.h"
#include
"
common/
compat.h"
#include
"
common/
compress.h"
#include
"
common/
util.h"
#include
"
common/
torint.h"
#include
"
common/
torlog.h"
#include
"
common/
tortls.h"
#ifdef HAVE_UNISTD_H
#include
<unistd.h>
#endif
...
...
src/common/compat.c
View file @
0dab29ce
...
...
@@ -13,7 +13,7 @@
**/
#define COMPAT_PRIVATE
#include
"compat.h"
#include
"
common/
compat.h"
#ifdef _WIN32
#include
<winsock2.h>
...
...
@@ -125,11 +125,11 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt)
#include
<sys/file.h>
#endif
#include
"torlog.h"
#include
"util.h"
#include
"container.h"
#include
"address.h"
#include
"sandbox.h"
#include
"
common/
torlog.h"
#include
"
common/
util.h"
#include
"
common/
container.h"
#include
"
common/
address.h"
#include
"
common/
sandbox.h"
/* Inline the strl functions if the platform doesn't have them. */
#ifndef HAVE_STRLCPY
...
...
src/common/compat.h
View file @
0dab29ce
...
...
@@ -14,8 +14,8 @@
#define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b
#endif
#endif
#include
"torint.h"
#include
"testsupport.h"
#include
"
common/
torint.h"
#include
"
common/
testsupport.h"
#ifdef HAVE_SYS_PARAM_H
#include
<sys/param.h>
#endif
...
...
@@ -45,7 +45,7 @@
#include
<netinet6/in6.h>
#endif
#include
"compat_time.h"
#include
"
common/
compat_time.h"
#if defined(__has_feature)
# if __has_feature(address_sanitizer)
...
...
@@ -751,7 +751,7 @@ STATIC int tor_ersatz_socketpair(int family, int type, int protocol,
ssize_t
tor_getpass
(
const
char
*
prompt
,
char
*
output
,
size_t
buflen
);
/* This needs some of the declarations above so we include it here. */
#include
"compat_threads.h"
#include
"
common/
compat_threads.h"
#endif
/* !defined(TOR_COMPAT_H) */
src/common/compat_libevent.c
View file @
0dab29ce
...
...
@@ -7,14 +7,14 @@
*/
#include
"orconfig.h"
#include
"compat.h"
#include
"
common/
compat.h"
#define COMPAT_LIBEVENT_PRIVATE
#include
"compat_libevent.h"
#include
"
common/
compat_libevent.h"
#include
"crypto_rand.h"
#include
"
common/
crypto_rand.h"
#include
"util.h"
#include
"torlog.h"
#include
"
common/
util.h"
#include
"
common/
torlog.h"
#include
<event2/event.h>
#include
<event2/thread.h>
...
...
src/common/compat_libevent.h
View file @
0dab29ce
...
...
@@ -5,7 +5,7 @@
#define TOR_COMPAT_LIBEVENT_H
#include
"orconfig.h"
#include
"testsupport.h"
#include
"
common/
testsupport.h"
void
configure_libevent_logging
(
void
);
void
suppress_libevent_log_msg
(
const
char
*
msg
);
...
...
src/common/compat_openssl.h
View file @
0dab29ce
...
...
@@ -8,7 +8,7 @@
#define TOR_COMPAT_OPENSSL_H
#include
<openssl/opensslv.h>
#include
"crypto_openssl_mgt.h"
#include
"
common/
crypto_openssl_mgt.h"
/**
* \file compat_openssl.h
...
...
src/common/compat_pthreads.c
View file @
0dab29ce
...
...
@@ -15,9 +15,9 @@
#include
<signal.h>
#include
<time.h>
#include
"compat.h"
#include
"torlog.h"
#include
"util.h"
#include
"
common/
compat.h"
#include
"
common/
torlog.h"
#include
"
common/
util.h"
/** Wraps a void (*)(void*) function and its argument so we can
* invoke them in a way pthreads would expect.
...
...
src/common/compat_threads.c
View file @
0dab29ce
...
...
@@ -13,11 +13,11 @@
#include
"orconfig.h"
#include
<stdlib.h>
#include
"compat.h"
#include
"compat_threads.h"
#include
"
common/
compat.h"
#include
"
common/
compat_threads.h"
#include
"util.h"
#include
"torlog.h"
#include
"
common/
util.h"
#include
"
common/
torlog.h"
#ifdef HAVE_SYS_EVENTFD_H
#include
<sys/eventfd.h>
...
...
src/common/compat_threads.h
View file @
0dab29ce
...
...
@@ -7,8 +7,8 @@
#define TOR_COMPAT_THREADS_H
#include
"orconfig.h"
#include
"torint.h"
#include
"testsupport.h"
#include
"
common/
torint.h"
#include
"
common/
testsupport.h"
#if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
#include
<pthread.h>
...
...
src/common/compat_time.c
View file @
0dab29ce
...
...
@@ -10,7 +10,7 @@
**/
#define COMPAT_TIME_PRIVATE
#include
"compat.h"
#include
"
common/
compat.h"
#ifdef _WIN32
#include
<winsock2.h>
...
...
@@ -34,9 +34,9 @@
#include
<mach/mach_time.h>
#endif
#include
"torlog.h"
#include
"util.h"
#include
"container.h"
#include
"
common/
torlog.h"
#include
"
common/
util.h"
#include
"
common/
container.h"
#ifndef HAVE_GETTIMEOFDAY
#ifdef HAVE_FTIME
...
...
Prev
1
2
3
4
5
…
21
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment