[tor-commits] [tor/master] Move socks5_status.h to src/lib/net

[nickm at torproject.org]

commit 24c0f83185a9c5dff080b250d9a8e15bbf8e1a88
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 5 14:48:29 2018 -0400

    Move socks5_status.h to src/lib/net
    
    There might be a better place for it in the long run, but this is
    the best I can think of for now.
---
 src/common/include.am                   | 1 -
 src/lib/net/include.am                  | 3 ++-
 src/{common => lib/net}/socks5_status.h | 0
 src/or/reasons.h                        | 2 +-
 src/test/test_socks.c                   | 2 +-
 src/tools/tor-resolve.c                 | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/include.am b/src/common/include.am
index d352a46de..565482bcf 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -52,7 +52,6 @@ COMMONHEADERS = \
   src/common/address_set.h			\
   src/common/compat_libevent.h			\
   src/common/procmon.h				\
-  src/common/socks5_status.h                    \
   src/common/timers.h				\
   src/common/token_bucket.h			\
   src/common/util.h				\
diff --git a/src/lib/net/include.am b/src/lib/net/include.am
index a375ac8ad..6fda17361 100644
--- a/src/lib/net/include.am
+++ b/src/lib/net/include.am
@@ -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
diff --git a/src/common/socks5_status.h b/src/lib/net/socks5_status.h
similarity index 100%
rename from src/common/socks5_status.h
rename to src/lib/net/socks5_status.h
diff --git a/src/or/reasons.h b/src/or/reasons.h
index b815463b7..837b4a0f1 100644
--- a/src/or/reasons.h
+++ b/src/or/reasons.h
@@ -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);
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 046ed3597..0a01bf643 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -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;
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 303c7af3e..1532d5f20 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -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>