Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add HTTP proxy support in forward proxy (#745)

Browse Source 
* Add HTTP proxy support in forward proxy

Signed-off-by: noisyfox <timemanager.rick@gmail.com>

* Typo

* Throw exception if forward proxy not supported.
This commit is contained in:
Noisyfox
2016-09-24 23:37:24 -05:00
committed by Syrone Wong
parent 156b3acd9b
commit 35fc73b58b
13 changed files with 532 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/Controller/Service/TCPRelay.cs
+11 -1
View File
@@ -420,7 +420,17 @@ namespace Shadowsocks.Controller
EndPoint proxyEP;
if (_config.proxy.useProxy)
{
remote = new Socks5Proxy();
switch (_config.proxy.proxyType)
{
case ProxyConfig.PROXY_SOCKS5:
remote = new Socks5Proxy();
break;
case ProxyConfig.PROXY_HTTP:
remote = new HttpProxy();
break;
default:
throw new NotSupportedException("Unknown forward proxy.");
}
proxyEP = SocketUtil.GetEndPoint(_config.proxy.proxyServer, _config.proxy.proxyPort);
}
else
shadowsocks-csharp/Controller/ShadowsocksController.cs
+2 -1
View File
@@ -221,9 +221,10 @@ namespace Shadowsocks.Controller
SaveConfig(_config);
}
public void EnableProxy(string proxy, int port)
public void EnableProxy(int type, string proxy, int port)
{
_config.proxy.useProxy = true;
_config.proxy.proxyType = type;
_config.proxy.proxyServer = proxy;
_config.proxy.proxyPort = port;
SaveConfig(_config);