commit d893be190fc244330543c9e98613a3f0daebc6ed Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 27 09:13:04 2018 -0400

rectify include paths (automatic) for address.h --- src/common/address_set.c | 2 +- src/common/compat.c | 2 +- src/common/util.c | 2 +- src/or/hs_descriptor.h | 2 +- src/or/nodelist.c | 2 +- src/or/or.h | 2 +- src/test/test_address.c | 2 +- src/test/test_bridges.c | 2 +- src/test/test_channeltls.c | 2 +- src/test/test_config.c | 2 +- src/tools/tor-gencert.c | 2 +- src/tools/tor-resolve.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/address_set.c b/src/common/address_set.c index 369d33e9a..4e14021eb 100644 --- a/src/common/address_set.c +++ b/src/common/address_set.c @@ -12,7 +12,7 @@

#include "orconfig.h" #include "common/address_set.h" -#include "common/address.h" +#include "lib/net/address.h" #include "common/compat.h" #include "lib/container/bloomfilt.h" #include "lib/crypt_ops/crypto_rand.h" diff --git a/src/common/compat.c b/src/common/compat.c index 265e82a48..9575ab080 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -128,7 +128,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt) #include "common/util.h" #include "lib/container/smartlist.h" #include "lib/wallclock/tm_cvt.h" -#include "common/address.h" +#include "lib/net/address.h" #include "common/sandbox.h"

/** As open(path, flags, mode), but return an fd with the close-on-exec mode diff --git a/src/common/util.c b/src/common/util.c index 2ea990d79..25eba4b57 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -20,7 +20,7 @@ #include "lib/cc/torint.h" #include "lib/container/smartlist.h" #include "lib/fdio/fdio.h" -#include "common/address.h" +#include "lib/net/address.h" #include "common/sandbox.h" #include "lib/err/backtrace.h" #include "common/util_process.h" diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 219b93444..d16234969 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -12,7 +12,7 @@ #include <stdint.h>

#include "or/or.h" -#include "common/address.h" +#include "lib/net/address.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "trunnel/ed25519_cert.h" /* needed for trunnel */ diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 561ac9fda..bc04ab952 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -41,7 +41,7 @@ #define NODELIST_PRIVATE

#include "or/or.h" -#include "common/address.h" +#include "lib/net/address.h" #include "common/address_set.h" #include "or/bridges.h" #include "or/config.h" diff --git a/src/or/or.h b/src/or/or.h index 528159b4c..a71cb6b00 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -72,7 +72,7 @@ #include "lib/container/smartlist.h" #include "lib/container/map.h" #include "lib/compress/compress.h" -#include "common/address.h" +#include "lib/net/address.h" #include "common/compat_libevent.h" #include "ht.h" #include "common/confline.h" diff --git a/src/test/test_address.c b/src/test/test_address.c index 38a5310ed..52ca5137e 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -24,7 +24,7 @@ #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */

#include "or/or.h" -#include "common/address.h" +#include "lib/net/address.h" #include "test/test.h" #include "test/log_test_helpers.h"

diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index 747984140..98e85cd6d 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -12,7 +12,7 @@ #include <stdbool.h>

#include "or/or.h" -#include "common/address.h" +#include "lib/net/address.h" #include "or/bridges.h" #include "or/config.h" #include "or/transports.h" diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index 58bfaff68..bd1182677 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -7,7 +7,7 @@

#define TOR_CHANNEL_INTERNAL_ #include "or/or.h" -#include "common/address.h" +#include "lib/net/address.h" #include "common/buffers.h" #include "or/channel.h" #include "or/channeltls.h" diff --git a/src/test/test_config.c b/src/test/test_config.c index 177368c65..5abc97fc3 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -9,7 +9,7 @@ #define PT_PRIVATE #define ROUTERSET_PRIVATE #include "or/or.h" -#include "common/address.h" +#include "lib/net/address.h" #include "or/addressmap.h" #include "or/bridges.h" #include "or/circuitmux_ewma.h" diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index fc490ffeb..f65a0e250 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -41,7 +41,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "common/address.h" +#include "lib/net/address.h" #include "common/util_format.h"

#define IDENTITY_KEY_BITS 3072 diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index d80a7400f..a13de0b57 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -6,7 +6,7 @@ #include "orconfig.h" #include "common/compat.h" #include "common/util.h" -#include "common/address.h" +#include "lib/net/address.h" #include "lib/log/torlog.h" #include "common/sandbox.h"