diff options
author | irungentoo <irungentoo@gmail.com> | 2014-12-26 19:38:19 -0500 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-12-26 19:38:19 -0500 |
commit | fe57a72659a8a298d8c11f7355d15815dee10195 (patch) | |
tree | aa3064268b325cb1ceb145cb5a367d1df6c1c4f9 /toxcore/TCP_client.h | |
parent | a4f0b65ad72682e6ca2becf3081f7e5e72a0f7af (diff) | |
parent | 35602e12c007aec38f65c860cad5f03953c4596d (diff) |
Merge branch 'http-proxy-feature' of https://github.com/nurupo/InsertProjectNameHere
Diffstat (limited to 'toxcore/TCP_client.h')
-rw-r--r-- | toxcore/TCP_client.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h index 83cb48ba..e37a4ee0 100644 --- a/toxcore/TCP_client.h +++ b/toxcore/TCP_client.h | |||
@@ -29,14 +29,22 @@ | |||
29 | 29 | ||
30 | #define TCP_CONNECTION_TIMEOUT 10 | 30 | #define TCP_CONNECTION_TIMEOUT 10 |
31 | 31 | ||
32 | typedef struct { | 32 | typedef enum { |
33 | TCP_PROXY_NONE, | ||
34 | TCP_PROXY_HTTP, | ||
35 | TCP_PROXY_SOCKS5 | ||
36 | } TCP_PROXY_TYPE; | ||
37 | |||
38 | typedef struct { | ||
33 | IP_Port ip_port; | 39 | IP_Port ip_port; |
40 | uint8_t proxy_type; // a value from TCP_PROXY_TYPE | ||
34 | } TCP_Proxy_Info; | 41 | } TCP_Proxy_Info; |
35 | 42 | ||
36 | enum { | 43 | enum { |
37 | TCP_CLIENT_NO_STATUS, | 44 | TCP_CLIENT_NO_STATUS, |
38 | TCP_CLIENT_PROXY_CONNECTING, | 45 | TCP_CLIENT_PROXY_HTTP_CONNECTING, |
39 | TCP_CLIENT_PROXY_UNCONFIRMED, | 46 | TCP_CLIENT_PROXY_SOCKS5_CONNECTING, |
47 | TCP_CLIENT_PROXY_SOCKS5_UNCONFIRMED, | ||
40 | TCP_CLIENT_CONNECTING, | 48 | TCP_CLIENT_CONNECTING, |
41 | TCP_CLIENT_UNCONFIRMED, | 49 | TCP_CLIENT_UNCONFIRMED, |
42 | TCP_CLIENT_CONFIRMED, | 50 | TCP_CLIENT_CONFIRMED, |