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

Enable proxy switch

Browse Source
This commit is contained in:
noisyfox
2016-06-30 00:09:45 +08:00
parent 9493f93c0f
commit 4a1aa01a4f
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/Controller/Service/TCPRelay.cs
+27 -6
View File
@@ -41,7 +41,7 @@ namespace Shadowsocks.Controller
return false;
}
socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, true);
TCPHandler handler = new TCPHandler(this);
TCPHandler handler = new TCPHandler(this, _config);
handler.connection = socket;
handler.controller = _controller;
handler.relay = this;
@@ -98,6 +98,7 @@ namespace Shadowsocks.Controller
public Socket connection;
public ShadowsocksController controller;
public TCPRelay relay;
public Configuration config;
public DateTime lastActivity;
@@ -140,9 +141,10 @@ namespace Shadowsocks.Controller
private int _bytesToSend;
private TCPRelay tcprelay; // TODO: tcprelay ?= relay
public TCPHandler(TCPRelay tcprelay)
public TCPHandler(TCPRelay tcprelay, Configuration config)
{
this.tcprelay = tcprelay;
this.config = config;
}
public void CreateRemote()
@@ -423,21 +425,40 @@ namespace Shadowsocks.Controller
IPHostEntry ipHostInfo = Dns.GetHostEntry(server.server);
ipAddress = ipHostInfo.AddressList[0];
}
IPEndPoint remoteEP = new IPEndPoint(ipAddress, server.server_port);
IPEndPoint destEP = new IPEndPoint(ipAddress, server.server_port);
// Setting up proxy
IPEndPoint proxyEP;
if (config.useProxy)
{
parsed = IPAddress.TryParse(config.proxyServer, out ipAddress);
if (!parsed)
{
IPHostEntry ipHostInfo = Dns.GetHostEntry(config.proxyServer);
ipAddress = ipHostInfo.AddressList[0];
}
remote = new Socks5Proxy();
proxyEP = new IPEndPoint(ipAddress, config.proxyPort);
}
else
{
remote = new DirectConnect();
proxyEP = destEP;
}
remote = new DirectConnect();
ProxyTimer proxyTimer = new ProxyTimer(3000);
proxyTimer.AutoReset = false;
proxyTimer.Elapsed += proxyConnectTimer_Elapsed;
proxyTimer.Enabled = true;
proxyTimer.DestEndPoint = remoteEP;
proxyTimer.DestEndPoint = destEP;
proxyTimer.Server = server;
proxyConnected = false;
// Connect to the proxy server.
remote.BeginConnectProxy(remoteEP, new AsyncCallback(ProxyConnectCallback), proxyTimer);
remote.BeginConnectProxy(proxyEP, new AsyncCallback(ProxyConnectCallback), proxyTimer);
}
catch (Exception e)
{