diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 14:48:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 14:48:29 -0400 |
| commit | 24c0f83185a9c5dff080b250d9a8e15bbf8e1a88 (patch) | |
| tree | d68b467bb0294fa23a8a1aebc12b6a479caa41c1 | |
| parent | 0e4b1781f4f0135c925cd728a09cca7d7959b961 (diff) | |
| download | tor-24c0f83185a9c5dff080b250d9a8e15bbf8e1a88.tar.gz tor-24c0f83185a9c5dff080b250d9a8e15bbf8e1a88.zip | |
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.
| -rw-r--r-- | src/common/include.am | 1 | ||||
| -rw-r--r-- | src/lib/net/include.am | 3 | ||||
| -rw-r--r-- | src/lib/net/socks5_status.h (renamed from src/common/socks5_status.h) | 0 | ||||
| -rw-r--r-- | src/or/reasons.h | 2 | ||||
| -rw-r--r-- | src/test/test_socks.c | 2 | ||||
| -rw-r--r-- | 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 d352a46de9..565482bcf9 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 a375ac8ad5..6fda173614 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 index 74b9c91023..74b9c91023 100644 --- a/src/common/socks5_status.h +++ b/src/lib/net/socks5_status.h diff --git a/src/or/reasons.h b/src/or/reasons.h index b815463b74..837b4a0f1a 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 046ed35978..0a01bf6431 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 303c7af3ee..1532d5f201 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> |