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.

diff --git a/src/common/include.am b/src/common/include.am
index d352a46de9bb35b2a9abacb1623505e13e994eb8..565482bcf91e04292e6234a83e8e5321cdb0eb74 100644 (file)
--- 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 a375ac8ad5d876223c8b112ca0bf1ffa4cd80d44..6fda1736147f7d3f5393b816323f538f41ff1bc0 100644 (file)
--- 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 b815463b74c2e3ab1f647b5652084f265ab01535..837b4a0f1a620283f3cb0885704c3aa842e16dc3 100644 (file)
--- 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 046ed35978a1665bbebc442c0ca0053d02a17ac8..0a01bf64311b67737c67b5a070b78ba2c42398e2 100644 (file)
--- 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 303c7af3eed4701b9a7274bca5c885ab1c6cc1d8..1532d5f20109a1792d2bd3e801c63ec5c1c2bd1a 100644 (file)
--- 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>