Merge branch 'http-proxy-feature' of https://github.com/nurupo/InsertProjectNameHere

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 @@
 
 #define TCP_CONNECTION_TIMEOUT 10
 
-typedef struct  {
+typedef enum {
+    TCP_PROXY_NONE,
+    TCP_PROXY_HTTP,
+    TCP_PROXY_SOCKS5
+} TCP_PROXY_TYPE;
+
+typedef struct {
     IP_Port ip_port;
+    uint8_t proxy_type; // a value from TCP_PROXY_TYPE
 } TCP_Proxy_Info;
 
 enum {
     TCP_CLIENT_NO_STATUS,
-    TCP_CLIENT_PROXY_CONNECTING,
-    TCP_CLIENT_PROXY_UNCONFIRMED,
+    TCP_CLIENT_PROXY_HTTP_CONNECTING,
+    TCP_CLIENT_PROXY_SOCKS5_CONNECTING,
+    TCP_CLIENT_PROXY_SOCKS5_UNCONFIRMED,
     TCP_CLIENT_CONNECTING,
     TCP_CLIENT_UNCONFIRMED,
     TCP_CLIENT_CONFIRMED,