Add socks5 support to websocket and http clients

CMakeLists.txt

@@ -64,6 +64,8 @@ set( IXWEBSOCKET_SOURCES
     ixwebsocket/IXWebSocketProxyServer.cpp
     ixwebsocket/IXWebSocketServer.cpp
     ixwebsocket/IXWebSocketTransport.cpp
+    ixwebsocket/IXProxyOptions.cpp
+    ixwebsocket/IXProxySocket.cpp
 )
 
 set( IXWEBSOCKET_HEADERS
@@ -117,6 +119,8 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXWebSocketServer.h
     ixwebsocket/IXWebSocketTransport.h
     ixwebsocket/IXWebSocketVersion.h
+    ixwebsocket/IXProxyOptions.h
+    ixwebsocket/IXProxySocket.h
 )
 
 option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF)

ixwebsocket/IXHttpClient.cpp

@@ -53,6 +53,11 @@ namespace ix
         _tlsOptions = tlsOptions;
     }
 
+    void HttpClient::setProxyOptions(const ProxyOptions& proxyOptions)
+    {
+        _proxyOptions = proxyOptions;
+    }
+
     void HttpClient::setForceBody(bool value)
     {
         _forceBody = value;
@@ -158,7 +163,9 @@ namespace ix
 
         bool tls = protocol == "https";
         std::string errorMsg;
-        _socket = createSocket(tls, -1, errorMsg, _tlsOptions);
+
+        bool proxy = !_proxyOptions.host.empty();
+        _socket = createSocket(tls, -1, errorMsg, _tlsOptions, proxy, _proxyOptions);
 
         if (!_socket)
         {

ixwebsocket/IXHttpClient.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include "IXHttp.h"
+#include "IXProxyOptions.h"
 #include "IXSocket.h"
 #include "IXSocketTLSOptions.h"
 #include "IXWebSocketHttpHeaders.h"
@@ -80,6 +81,9 @@ namespace ix
         // TLS
         void setTLSOptions(const SocketTLSOptions& tlsOptions);
 
+        // Proxy
+        void setProxyOptions(const ProxyOptions& proxyOptions);
+
         std::string serializeHttpParameters(const HttpParameters& httpParameters);
 
         std::string serializeHttpFormDataParameters(
@@ -117,6 +121,7 @@ namespace ix
                                      // might be called recursively to follow HTTP redirections
 
         SocketTLSOptions _tlsOptions;
+        ProxyOptions _proxyOptions;
 
         bool _forceBody;
     };

ixwebsocket/IXProxyOptions.cpp

@@ -0,0 +1 @@
+#include "IXProxyOptions.h"

ixwebsocket/IXProxyOptions.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <string>
+
+enum class SocksVersion
+{
+    SOCKS4 = 0,
+    SOCKS4a = 1,
+    SOCKS5 = 2,
+    SOCKS5h = 3,
+};
+
+struct ProxyOptions
+{
+public:
+    std::string host;
+    unsigned short port;
+    SocksVersion socksVersion;
+    std::string userId;
+    std::string username;
+    std::string password;
+    bool auth;
+};