Commit 6c440da9 authored by Nick Mathewson's avatar Nick Mathewson 🐕
Browse files

Remove system headers from or.h

parent 13116378
......@@ -110,6 +110,15 @@
#ifdef _WIN32
#include <shlobj.h>
#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include "lib/meminfo/meminfo.h"
#include "lib/osinfo/uname.h"
......
......@@ -112,6 +112,13 @@
#include <pwd.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef HAVE_SYS_UN_H
#include <sys/socket.h>
#include <sys/un.h>
......
......@@ -100,6 +100,13 @@
#include "or/routerlist_st.h"
#include "or/socks_request_st.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifndef _WIN32
#include <pwd.h>
#include <sys/resource.h>
......
......@@ -69,6 +69,10 @@
#include "or/edge_connection_st.h"
#include "or/or_circuit_st.h"
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#include <event2/event.h>
#include <event2/dns.h>
......
......@@ -46,6 +46,10 @@ hibernating, phase 2:
#include "or/or_connection_st.h"
#include "or/or_state_st.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/** Are we currently awake, asleep, running out of bandwidth, or shutting
* down? */
static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL;
......
......@@ -56,6 +56,13 @@
#include "trunnel/hs/cell_common.h"
#include "trunnel/hs/cell_establish_intro.h"
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* Helper macro. Iterate over every service in the global map. The var is the
* name of the service pointer. */
#define FOR_EACH_SERVICE_BEGIN(var) \
......
......@@ -136,6 +136,10 @@
#include "or/routerinfo_st.h"
#include "or/socks_request_st.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYSTEMD
# if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)
/* Systemd's use of gcc's __INCLUDE_LEVEL__ extension macro appears to confuse
......
......@@ -30,6 +30,10 @@
#include "or/node_st.h"
#include "or/routerstatus_st.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
/** A data structure to hold a bunch of cached microdescriptors. There are
* two active files in the cache: a "cache file" that we mmap, and a "journal
* file" that we append to. Periodically, we rebuild the cache file to hold
......
......@@ -88,6 +88,10 @@
#include "or/vote_microdesc_hash_st.h"
#include "or/vote_routerstatus_st.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/** Most recently received and validated v3 "ns"-flavored consensus network
* status. */
STATIC networkstatus_t *current_ns_consensus = NULL;
......
......@@ -13,56 +13,15 @@
#define TOR_OR_H
#include "orconfig.h"
#include "lib/cc/torint.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> /* FreeBSD needs this to know what version it is */
#endif
#include "lib/cc/torint.h"
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
#ifdef HAVE_TIME_H
#include <time.h>
#endif
#ifdef _WIN32
#include <winsock2.h>
#include <io.h>
#include <process.h>
#include <direct.h>
#include <windows.h>
#endif /* defined(_WIN32) */
#include "common/util.h"
#include "lib/container/map.h"
......
......@@ -51,6 +51,16 @@
#include "or/rend_service_descriptor_st.h"
#include "or/routerstatus_st.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
struct rend_service_t;
static origin_circuit_t *find_intro_circuit(rend_intro_point_t *intro,
const char *pk_digest);
......
......@@ -98,6 +98,10 @@
#include "lib/math/fp.h"
#include "lib/math/laplace.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
static void bw_arrays_init(void);
static void predicted_ports_alloc(void);
......
......@@ -29,6 +29,10 @@
#define ENC_KEY_HEADER "Boxed Ed25519 key"
#define ENC_KEY_TAG "master"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* DOCDOC */
static ssize_t
do_getpass(const char *prompt, char *buf, size_t buflen,
......
......@@ -141,6 +141,10 @@
#include "lib/crypt_ops/digestset.h"
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
// #define DEBUG_ROUTERLIST
/****************************************************************************/
......
......@@ -104,6 +104,9 @@
#undef log
#include <math.h>
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
/****************************************************************************/
......
......@@ -19,6 +19,10 @@
#define TLS_PER_CELL_OVERHEAD 29
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_KIST_SUPPORT
/* Kernel interface needed for KIST. */
#include <netinet/tcp.h>
......
......@@ -46,6 +46,10 @@
#include "or/or_state_st.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/** A list of state-file "abbreviations," for compatibility. */
static config_abbrev_t state_abbrevs_[] = {
{ "AccountingBytesReadInterval", "AccountingBytesReadInInterval", 0, 0 },
......
......@@ -11,6 +11,10 @@
#include "or/addressmap.h"
#include "test/log_test_helpers.h"
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
/** Mocking replacement: only handles localhost. */
static int
mock_tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out)
......@@ -1257,4 +1261,3 @@ struct testcase_t addr_tests[] = {
{ "make_null", test_addr_make_null, 0, NULL, NULL },
END_OF_TESTCASES
};
......@@ -12,6 +12,10 @@
#include "lib/err/backtrace.h"
#include "lib/log/torlog.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
/* -1: no crash.
* 0: crash with a segmentation fault.
* 1x: crash with an assertion failure. */
......@@ -118,4 +122,3 @@ main(int argc, char **argv)
return 0;
}
......@@ -14,6 +14,10 @@
#include "test/test.h"
#include "common/util.h"
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef _WIN32
#define mkdir(a,b) mkdir(a)
#define tt_int_op_nowin(a,op,b) do { (void)(a); (void)(b); } while (0)
......@@ -146,4 +150,3 @@ struct testcase_t checkdir_tests[] = {
CHECKDIR(perms, TT_FORK),
END_OF_TESTCASES
};
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment