Browse Source

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.
Nick Mathewson 5 years ago
parent
commit
24c0f83185

+ 0 - 1
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				\

+ 2 - 1
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

+ 0 - 0
src/common/socks5_status.h → src/lib/net/socks5_status.h


+ 1 - 1
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);

+ 1 - 1
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;

+ 1 - 1
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>