diff options
author | irungentoo <irungentoo@gmail.com> | 2014-12-26 20:33:34 -0500 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-12-26 20:33:34 -0500 |
commit | efea858c91de4a43e8c56bbef95837a8650ca3f5 (patch) | |
tree | e4cbbbb6097265bd9e0d6f89cfb40414685c4ecb | |
parent | c2e394c5c2a60927b543c8eb9791724edca917ff (diff) |
Make it possible to port clients to the new api by just replacing
proxy_enabled with proxy_type.
-rw-r--r-- | toxcore/TCP_client.c | 1 | ||||
-rw-r--r-- | toxcore/tox.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/toxcore/TCP_client.c b/toxcore/TCP_client.c index 61a2ff1e..eaa248bf 100644 --- a/toxcore/TCP_client.c +++ b/toxcore/TCP_client.c | |||
@@ -609,6 +609,7 @@ TCP_Client_Connection *new_TCP_connection(IP_Port ip_port, const uint8_t *public | |||
609 | uint8_t family = ip_port.ip.family; | 609 | uint8_t family = ip_port.ip.family; |
610 | 610 | ||
611 | TCP_Proxy_Info default_proxyinfo; | 611 | TCP_Proxy_Info default_proxyinfo; |
612 | |||
612 | if (proxy_info == NULL) { | 613 | if (proxy_info == NULL) { |
613 | default_proxyinfo.proxy_type = TCP_PROXY_NONE; | 614 | default_proxyinfo.proxy_type = TCP_PROXY_NONE; |
614 | proxy_info = &default_proxyinfo; | 615 | proxy_info = &default_proxyinfo; |
diff --git a/toxcore/tox.h b/toxcore/tox.h index c5a5d952..db1b1033 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h | |||
@@ -875,8 +875,8 @@ int tox_isconnected(const Tox *tox); | |||
875 | 875 | ||
876 | typedef enum { | 876 | typedef enum { |
877 | TOX_PROXY_NONE, | 877 | TOX_PROXY_NONE, |
878 | TOX_PROXY_HTTP, | 878 | TOX_PROXY_SOCKS5, |
879 | TOX_PROXY_SOCKS5 | 879 | TOX_PROXY_HTTP |
880 | } TOX_PROXY_TYPE; | 880 | } TOX_PROXY_TYPE; |
881 | 881 | ||
882 | typedef struct { | 882 | typedef struct { |