commit 3305ae50442aaed13a9e15c392439c348e6182be Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 13:12:23 2018 -0400

Rectify include paths (automated).

You have no idea how glad I am that this is automated. --- src/common/buffers.h | 2 +- src/common/compat.h | 2 +- src/common/compat_libevent.h | 2 +- src/common/compat_threads.h | 2 +- src/common/timers.h | 2 +- src/common/token_bucket.h | 2 +- src/common/torlog.h | 2 +- src/common/util.h | 2 +- src/common/util_bug.h | 2 +- src/common/util_format.h | 2 +- src/lib/crypt_ops/crypto_curve25519.h | 2 +- src/lib/crypt_ops/crypto_ed25519.h | 2 +- src/lib/crypt_ops/crypto_format.h | 2 +- src/lib/crypt_ops/crypto_rand.c | 2 +- src/lib/crypt_ops/crypto_rsa.h | 2 +- src/lib/tls/tortls.h | 2 +- src/or/addressmap.h | 2 +- src/or/circuitlist.h | 2 +- src/or/circuitmux.h | 2 +- src/or/config.h | 2 +- src/or/connection_edge.h | 2 +- src/or/dirauth/dircollate.h | 2 +- src/or/dirserv.h | 2 +- src/or/geoip.h | 2 +- src/or/hibernate.h | 2 +- src/or/keypin.h | 2 +- src/or/networkstatus.h | 2 +- src/or/router.h | 2 +- src/or/routerlist.h | 2 +- src/or/scheduler.h | 2 +- src/or/status.h | 2 +- src/test/test_channelpadding.c | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/common/buffers.h b/src/common/buffers.h index 5956e3484..80103af77 100644 --- a/src/common/buffers.h +++ b/src/common/buffers.h @@ -14,7 +14,7 @@

#include "common/compat.h" #include "lib/cc/torint.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

typedef struct buf_t buf_t;

diff --git a/src/common/compat.h b/src/common/compat.h index 654f10390..dff29a42b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -15,7 +15,7 @@ #endif #endif #include "lib/cc/torint.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 76a074d93..4b2672b7b 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -5,7 +5,7 @@ #define TOR_COMPAT_LIBEVENT_H

#include "orconfig.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

void configure_libevent_logging(void); void suppress_libevent_log_msg(const char *msg); diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index ed0ece5ab..19e0a4f11 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -8,7 +8,7 @@

#include "orconfig.h" #include "lib/cc/torint.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

#if defined(HAVE_PTHREAD_H) && !defined(_WIN32) #include <pthread.h> diff --git a/src/common/timers.h b/src/common/timers.h index 6b6179ca7..2348c7b7c 100644 --- a/src/common/timers.h +++ b/src/common/timers.h @@ -5,7 +5,7 @@ #define TOR_TIMERS_H

#include "orconfig.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

struct monotime_t; typedef struct timeout tor_timer_t; diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h index fd6834f26..787317fa1 100644 --- a/src/common/token_bucket.h +++ b/src/common/token_bucket.h @@ -10,7 +10,7 @@ #define TOR_TOKEN_BUCKET_H

#include "lib/cc/torint.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

/** Largest allowable burst value for a token buffer. */ #define TOKEN_BUCKET_MAX_BURST INT32_MAX diff --git a/src/common/torlog.h b/src/common/torlog.h index 56f922d40..66141ab0a 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -13,7 +13,7 @@ #ifndef TOR_TORLOG_H

#include "common/compat.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

#ifdef HAVE_SYSLOG_H #include <syslog.h> diff --git a/src/common/util.h b/src/common/util.h index cb8cefb12..d1528886c 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -15,7 +15,7 @@ #include "lib/cc/torint.h" #include "common/compat.h" #include "lib/ctime/di_ops.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include <stdio.h> #include <stdlib.h> #ifdef _WIN32 diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 1d499a197..9659f59b7 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -38,7 +38,7 @@

#include "orconfig.h" #include "common/compat.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

/* Replace assert() with a variant that sends failures to the log before * calling assert() normally. diff --git a/src/common/util_format.h b/src/common/util_format.h index e49efd05c..3580c2863 100644 --- a/src/common/util_format.h +++ b/src/common/util_format.h @@ -7,7 +7,7 @@ #ifndef TOR_UTIL_FORMAT_H #define TOR_UTIL_FORMAT_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h"

/** @{ */ diff --git a/src/lib/crypt_ops/crypto_curve25519.h b/src/lib/crypt_ops/crypto_curve25519.h index 8a3386611..2e614848e 100644 --- a/src/lib/crypt_ops/crypto_curve25519.h +++ b/src/lib/crypt_ops/crypto_curve25519.h @@ -4,7 +4,7 @@ #ifndef TOR_CRYPTO_CURVE25519_H #define TOR_CRYPTO_CURVE25519_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_openssl_mgt.h" diff --git a/src/lib/crypt_ops/crypto_ed25519.h b/src/lib/crypt_ops/crypto_ed25519.h index 69afb60ab..de992aaa8 100644 --- a/src/lib/crypt_ops/crypto_ed25519.h +++ b/src/lib/crypt_ops/crypto_ed25519.h @@ -4,7 +4,7 @@ #ifndef TOR_CRYPTO_ED25519_H #define TOR_CRYPTO_ED25519_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "common/util.h" diff --git a/src/lib/crypt_ops/crypto_format.h b/src/lib/crypt_ops/crypto_format.h index e0d9894f1..77983f216 100644 --- a/src/lib/crypt_ops/crypto_format.h +++ b/src/lib/crypt_ops/crypto_format.h @@ -7,7 +7,7 @@ #ifndef TOR_CRYPTO_FORMAT_H #define TOR_CRYPTO_FORMAT_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_ed25519.h"

diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 9fd8c1075..0bd7b078c 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -26,7 +26,7 @@ #include "lib/crypt_ops/compat_openssl.h" #include "lib/crypt_ops/crypto_util.h" #include "common/sandbox.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "common/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h index 31f7f2484..3faec1237 100644 --- a/src/lib/crypt_ops/crypto_rsa.h +++ b/src/lib/crypt_ops/crypto_rsa.h @@ -18,7 +18,7 @@ #include "lib/crypt_ops/crypto_digest.h" #include <stdio.h> #include "lib/cc/torint.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "common/compat.h" #include "common/util.h" #include "common/torlog.h" diff --git a/src/lib/tls/tortls.h b/src/lib/tls/tortls.h index 901cae49f..c46b46d2f 100644 --- a/src/lib/tls/tortls.h +++ b/src/lib/tls/tortls.h @@ -14,7 +14,7 @@ #include "lib/crypt_ops/crypto_rsa.h" #include "lib/crypt_ops/compat_openssl.h" #include "common/compat.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

/* Opaque structure to hold a TLS connection. */ typedef struct tor_tls_t tor_tls_t; diff --git a/src/or/addressmap.h b/src/or/addressmap.h index 0d53e7777..b0db5c8b4 100644 --- a/src/or/addressmap.h +++ b/src/or/addressmap.h @@ -7,7 +7,7 @@ #ifndef TOR_ADDRESSMAP_H #define TOR_ADDRESSMAP_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

void addressmap_init(void); void addressmap_clear_excluded_trackexithosts(const or_options_t *options); diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 9f80c3efd..8b41424ee 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -12,7 +12,7 @@ #ifndef TOR_CIRCUITLIST_H #define TOR_CIRCUITLIST_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/hs_ident.h"

/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index 68bcbf6e7..e94cc354c 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -10,7 +10,7 @@ #define TOR_CIRCUITMUX_H

#include "or/or.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

typedef struct circuitmux_policy_s circuitmux_policy_t; typedef struct circuitmux_policy_data_s circuitmux_policy_data_t; diff --git a/src/or/config.h b/src/or/config.h index a94cd7753..dc3322e6b 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -12,7 +12,7 @@ #ifndef TOR_CONFIG_H #define TOR_CONFIG_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN) #define KERNEL_MAY_SUPPORT_IPFW diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 9d480aec2..d6774668d 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -12,7 +12,7 @@ #ifndef TOR_CONNECTION_EDGE_H #define TOR_CONNECTION_EDGE_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

edge_connection_t *TO_EDGE_CONN(connection_t *); entry_connection_t *TO_ENTRY_CONN(connection_t *); diff --git a/src/or/dirauth/dircollate.h b/src/or/dirauth/dircollate.h index 1d403b20f..aae782978 100644 --- a/src/or/dirauth/dircollate.h +++ b/src/or/dirauth/dircollate.h @@ -12,7 +12,7 @@ #ifndef TOR_DIRCOLLATE_H #define TOR_DIRCOLLATE_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/or.h"

typedef struct dircollator_s dircollator_t; diff --git a/src/or/dirserv.h b/src/or/dirserv.h index a8d5ac616..757eba7ba 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -12,7 +12,7 @@ #ifndef TOR_DIRSERV_H #define TOR_DIRSERV_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

/** What fraction (1 over this number) of the relay ID space do we * (as a directory authority) launch connections to at each reachability diff --git a/src/or/geoip.h b/src/or/geoip.h index 8a5dd701e..3a991038a 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -12,7 +12,7 @@ #ifndef TOR_GEOIP_H #define TOR_GEOIP_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/dos.h"

#ifdef GEOIP_PRIVATE diff --git a/src/or/hibernate.h b/src/or/hibernate.h index cdef33543..bfd8571cd 100644 --- a/src/or/hibernate.h +++ b/src/or/hibernate.h @@ -12,7 +12,7 @@ #ifndef TOR_HIBERNATE_H #define TOR_HIBERNATE_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

int accounting_parse_options(const or_options_t *options, int validate_only); MOCK_DECL(int, accounting_is_enabled, (const or_options_t *options)); diff --git a/src/or/keypin.h b/src/or/keypin.h index b8b9ff597..73a76be56 100644 --- a/src/or/keypin.h +++ b/src/or/keypin.h @@ -4,7 +4,7 @@ #ifndef TOR_KEYPIN_H #define TOR_KEYPIN_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

int keypin_check_and_add(const uint8_t *rsa_id_digest, const uint8_t *ed25519_id_key, diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 97b90dab6..cc6badf0b 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -12,7 +12,7 @@ #ifndef TOR_NETWORKSTATUS_H #define TOR_NETWORKSTATUS_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

void networkstatus_reset_warnings(void); void networkstatus_reset_download_failures(void); diff --git a/src/or/router.h b/src/or/router.h index 4a383ac42..54f61c45a 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -12,7 +12,7 @@ #ifndef TOR_ROUTER_H #define TOR_ROUTER_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

#define TOR_ROUTERINFO_ERROR_NO_EXT_ADDR (-1) #define TOR_ROUTERINFO_ERROR_CANNOT_PARSE (-2) diff --git a/src/or/routerlist.h b/src/or/routerlist.h index a90c26b44..6d1e2a0b8 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -11,7 +11,7 @@ #ifndef TOR_ROUTERLIST_H #define TOR_ROUTERLIST_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

int get_n_authorities(dirinfo_type_t type); int trusted_dirs_reload_certs(void); diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 37c192fea..856923f9a 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -11,7 +11,7 @@

#include "or/or.h" #include "or/channel.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

/** Scheduler type, we build an ordered list with those values from the * parsed strings in Schedulers. The reason to do such a thing is so we can diff --git a/src/or/status.h b/src/or/status.h index 840ec1198..7258ed593 100644 --- a/src/or/status.h +++ b/src/or/status.h @@ -4,7 +4,7 @@ #ifndef TOR_STATUS_H #define TOR_STATUS_H

-#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h"

int log_heartbeat(time_t now);

diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index b48bf0f16..7edfdc114 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -7,7 +7,7 @@ #define TOR_TIMERS_PRIVATE #include "or/or.h" #include "test/test.h" -#include "common/testsupport.h" +#include "lib/testsupport/testsupport.h" #include "or/connection.h" #include "or/connection_or.h" #include "or/channel.h"