youys
/
shadowsocks-windows
Not watched
1
0
Fork 0
Code
Releases 67 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

clean up code in C# 6

tags/3.2
kimw 8 years ago
parent
0cee110e59
commit
ff04a2a18a
1 changed files with 67 additions and 155 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +67
    -155
      shadowsocks-csharp/Controller/Service/TCPRelay.cs

+ 67
- 155
shadowsocks-csharp/Controller/Service/TCPRelay.cs View File

@@ -27,44 +27,38 @@ namespace Shadowsocks.Controller
public bool Handle(byte[] firstPacket, int length, Socket socket, object state) public bool Handle(byte[] firstPacket, int length, Socket socket, object state)
{ {
if (socket.ProtocolType != ProtocolType.Tcp)
{
if (socket.ProtocolType != ProtocolType.Tcp
|| (length < 2 || firstPacket[0] != 5))
return false; return false;
}
if (length < 2 || firstPacket[0] != 5)
else
{ {
return false;
}
socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, true);
TCPHandler handler = new TCPHandler(this);
handler.connection = socket;
handler.controller = _controller;
handler.tcprelay = this;
socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, true);
TCPHandler handler = new TCPHandler(this);
handler.connection = socket;
handler.controller = _controller;
handler.tcprelay = this;
handler.Start(firstPacket, length);
IList<TCPHandler> handlersToClose = new List<TCPHandler>();
lock (Handlers)
{
Handlers.Add(handler);
DateTime now = DateTime.Now;
if (now - _lastSweepTime > TimeSpan.FromSeconds(1))
handler.Start(firstPacket, length);
IList<TCPHandler> handlersToClose = new List<TCPHandler>();
lock (Handlers)
{ {
_lastSweepTime = now;
foreach (TCPHandler handler1 in Handlers)
Handlers.Add(handler);
DateTime now = DateTime.Now;
if (now - _lastSweepTime > TimeSpan.FromSeconds(1))
{ {
if (now - handler1.lastActivity > TimeSpan.FromSeconds(900))
{
handlersToClose.Add(handler1);
}
_lastSweepTime = now;
foreach (TCPHandler handler1 in Handlers)
if (now - handler1.lastActivity > TimeSpan.FromSeconds(900))
handlersToClose.Add(handler1);
} }
} }
foreach (TCPHandler handler1 in handlersToClose)
{
Logging.Debug("Closing timed out TCP connection.");
handler1.Close();
}
return true;
} }
foreach (TCPHandler handler1 in handlersToClose)
{
Logging.Debug("Closing timed out TCP connection.");
handler1.Close();
}
return true;
} }
public void UpdateInboundCounter(Server server, long n) public void UpdateInboundCounter(Server server, long n)
@@ -126,16 +120,14 @@ namespace Shadowsocks.Controller
public TCPHandler(TCPRelay tcprelay) public TCPHandler(TCPRelay tcprelay)
{ {
this._tcprelay = tcprelay;
_tcprelay = tcprelay;
} }
public void CreateRemote() public void CreateRemote()
{ {
Server server = controller.GetAServer(IStrategyCallerType.TCP, (IPEndPoint)connection.RemoteEndPoint); Server server = controller.GetAServer(IStrategyCallerType.TCP, (IPEndPoint)connection.RemoteEndPoint);
if (server == null || server.server == "") if (server == null || server.server == "")
{
throw new ArgumentException("No server configured"); throw new ArgumentException("No server configured");
}
encryptor = EncryptorFactory.GetEncryptor(server.method, server.password, server.auth, false); encryptor = EncryptorFactory.GetEncryptor(server.method, server.password, server.auth, false);
this.server = server; this.server = server;
} }
@@ -151,9 +143,7 @@ namespace Shadowsocks.Controller
private void CheckClose() private void CheckClose()
{ {
if (_connectionShutdown && _remoteShutdown) if (_connectionShutdown && _remoteShutdown)
{
Close(); Close();
}
} }
public void Close() public void Close()
@@ -165,57 +155,43 @@ namespace Shadowsocks.Controller
lock (this) lock (this)
{ {
if (_closed) if (_closed)
{
return; return;
}
_closed = true;
else
_closed = true;
} }
if (connection != null)
try
{ {
try
{
connection.Shutdown(SocketShutdown.Both);
connection.Close();
}
catch (Exception e)
{
Logging.LogUsefulException(e);
}
connection?.Shutdown(SocketShutdown.Both);
connection?.Close();
} }
if (remote != null)
catch (Exception e)
{ {
try
{
remote.Shutdown(SocketShutdown.Both);
remote.Close();
}
catch (Exception e)
{
Logging.LogUsefulException(e);
}
Logging.LogUsefulException(e);
}
try
{
remote?.Shutdown(SocketShutdown.Both);
remote?.Close();
}
catch (Exception e)
{
Logging.LogUsefulException(e);
} }
lock (_encryptionLock) lock (_encryptionLock)
{ {
lock (_decryptionLock) lock (_decryptionLock)
{ {
if (encryptor != null)
{
((IDisposable)encryptor).Dispose();
}
encryptor?.Dispose();
} }
} }
} }
private void HandshakeReceive() private void HandshakeReceive()
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
int bytesRead = _firstPacketLength; int bytesRead = _firstPacketLength;
if (bytesRead > 1) if (bytesRead > 1)
{ {
byte[] response = { 5, 0 }; byte[] response = { 5, 0 };
@@ -228,9 +204,7 @@ namespace Shadowsocks.Controller
connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(HandshakeSendCallback), null); connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(HandshakeSendCallback), null);
} }
else else
{
Close(); Close();
}
} }
catch (Exception e) catch (Exception e)
{ {
@@ -241,10 +215,7 @@ namespace Shadowsocks.Controller
private void HandshakeSendCallback(IAsyncResult ar) private void HandshakeSendCallback(IAsyncResult ar)
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
connection.EndSend(ar); connection.EndSend(ar);
@@ -267,14 +238,10 @@ namespace Shadowsocks.Controller
private void handshakeReceive2Callback(IAsyncResult ar) private void handshakeReceive2Callback(IAsyncResult ar)
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
int bytesRead = connection.EndReceive(ar); int bytesRead = connection.EndReceive(ar);
if (bytesRead >= 3) if (bytesRead >= 3)
{ {
_command = _connetionRecvBuffer[1]; _command = _connetionRecvBuffer[1];
@@ -284,9 +251,7 @@ namespace Shadowsocks.Controller
connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(ResponseCallback), null); connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(ResponseCallback), null);
} }
else if (_command == 3) else if (_command == 3)
{
HandleUDPAssociate(); HandleUDPAssociate();
}
} }
else else
{ {
@@ -308,13 +273,14 @@ namespace Shadowsocks.Controller
int port = endPoint.Port; int port = endPoint.Port;
byte[] response = new byte[4 + address.Length + 2]; byte[] response = new byte[4 + address.Length + 2];
response[0] = 5; response[0] = 5;
if (endPoint.AddressFamily == AddressFamily.InterNetwork)
{
response[3] = 1;
}
else if (endPoint.AddressFamily == AddressFamily.InterNetworkV6)
switch (endPoint.AddressFamily)
{ {
response[3] = 4;
case AddressFamily.InterNetwork:
response[3] = 1;
break;
case AddressFamily.InterNetworkV6:
response[3] = 4;
break;
} }
address.CopyTo(response, 4); address.CopyTo(response, 4);
response[response.Length - 1] = (byte)(port & 0xFF); response[response.Length - 1] = (byte)(port & 0xFF);
@@ -324,10 +290,7 @@ namespace Shadowsocks.Controller
private void ReadAll(IAsyncResult ar) private void ReadAll(IAsyncResult ar)
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
if (ar.AsyncState != null) if (ar.AsyncState != null)
@@ -345,9 +308,7 @@ namespace Shadowsocks.Controller
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, 0, new AsyncCallback(ReadAll), null); connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, 0, new AsyncCallback(ReadAll), null);
} }
else else
{
Close(); Close();
}
} }
} }
catch (Exception e) catch (Exception e)
@@ -362,10 +323,8 @@ namespace Shadowsocks.Controller
try try
{ {
connection.EndSend(ar); connection.EndSend(ar);
StartConnect(); StartConnect();
} }
catch (Exception e) catch (Exception e)
{ {
Logging.LogUsefulException(e); Logging.LogUsefulException(e);
@@ -396,8 +355,7 @@ namespace Shadowsocks.Controller
} }
IPEndPoint remoteEP = new IPEndPoint(ipAddress, server.server_port); IPEndPoint remoteEP = new IPEndPoint(ipAddress, server.server_port);
remote = new Socket(ipAddress.AddressFamily,
SocketType.Stream, ProtocolType.Tcp);
remote = new Socket(ipAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
remote.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, true); remote.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, true);
_startConnectTime = DateTime.Now; _startConnectTime = DateTime.Now;
@@ -420,16 +378,10 @@ namespace Shadowsocks.Controller
private void connectTimer_Elapsed(object sender, ElapsedEventArgs e) private void connectTimer_Elapsed(object sender, ElapsedEventArgs e)
{ {
if (_connected)
{
return;
}
if (_connected) return;
Server server = ((ServerTimer)sender).Server; Server server = ((ServerTimer)sender).Server;
IStrategy strategy = controller.GetCurrentStrategy(); IStrategy strategy = controller.GetCurrentStrategy();
if (strategy != null)
{
strategy.SetFailure(server);
}
strategy?.SetFailure(server);
Logging.Info($"{server.FriendlyName()} timed out"); Logging.Info($"{server.FriendlyName()} timed out");
remote.Close(); remote.Close();
RetryConnect(); RetryConnect();
@@ -444,22 +396,16 @@ namespace Shadowsocks.Controller
_retryCount++; _retryCount++;
} }
else else
{
Close(); Close();
}
} }
private void ConnectCallback(IAsyncResult ar) private void ConnectCallback(IAsyncResult ar)
{ {
Server server = null;
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
ServerTimer timer = (ServerTimer)ar.AsyncState; ServerTimer timer = (ServerTimer)ar.AsyncState;
server = timer.Server;
Server server = timer.Server;
timer.Elapsed -= connectTimer_Elapsed; timer.Elapsed -= connectTimer_Elapsed;
timer.Enabled = false; timer.Enabled = false;
timer.Dispose(); timer.Dispose();
@@ -484,10 +430,7 @@ namespace Shadowsocks.Controller
if (server != null) if (server != null)
{ {
IStrategy strategy = controller.GetCurrentStrategy(); IStrategy strategy = controller.GetCurrentStrategy();
if (strategy != null)
{
strategy.SetFailure(server);
}
strategy?.SetFailure(server);
} }
Logging.LogUsefulException(e); Logging.LogUsefulException(e);
RetryConnect(); RetryConnect();
@@ -496,10 +439,7 @@ namespace Shadowsocks.Controller
private void StartPipe() private void StartPipe()
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
_startReceivingTime = DateTime.Now; _startReceivingTime = DateTime.Now;
@@ -515,10 +455,7 @@ namespace Shadowsocks.Controller
private void PipeRemoteReceiveCallback(IAsyncResult ar) private void PipeRemoteReceiveCallback(IAsyncResult ar)
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
int bytesRead = remote.EndReceive(ar); int bytesRead = remote.EndReceive(ar);
@@ -531,32 +468,19 @@ namespace Shadowsocks.Controller
int bytesToSend; int bytesToSend;
lock (_decryptionLock) lock (_decryptionLock)
{ {
if (_closed)
{
return;
}
if (_closed) return;
encryptor.Decrypt(_remoteRecvBuffer, bytesRead, _remoteSendBuffer, out bytesToSend); encryptor.Decrypt(_remoteRecvBuffer, bytesRead, _remoteSendBuffer, out bytesToSend);
} }
connection.BeginSend(_remoteSendBuffer, 0, bytesToSend, 0, new AsyncCallback(PipeConnectionSendCallback), null); connection.BeginSend(_remoteSendBuffer, 0, bytesToSend, 0, new AsyncCallback(PipeConnectionSendCallback), null);
IStrategy strategy = controller.GetCurrentStrategy(); IStrategy strategy = controller.GetCurrentStrategy();
if (strategy != null)
{
strategy.UpdateLastRead(server);
}
strategy?.UpdateLastRead(server);
} }
else else
{ {
connection.Shutdown(SocketShutdown.Send); connection.Shutdown(SocketShutdown.Send);
_connectionShutdown = true; _connectionShutdown = true;
CheckClose(); CheckClose();
//if (totalRead == 0)
//{
// // closed before anything received, reports as failure
// // disable this feature
// controller.GetCurrentStrategy().SetFailure(this.server);
//}
} }
} }
catch (Exception e) catch (Exception e)
@@ -568,10 +492,7 @@ namespace Shadowsocks.Controller
private void PipeConnectionReceiveCallback(IAsyncResult ar) private void PipeConnectionReceiveCallback(IAsyncResult ar)
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
int bytesRead = connection.EndReceive(ar); int bytesRead = connection.EndReceive(ar);
@@ -604,10 +525,7 @@ namespace Shadowsocks.Controller
int bytesToSend; int bytesToSend;
lock (_encryptionLock) lock (_encryptionLock)
{ {
if (_closed)
{
return;
}
if (_closed) return;
encryptor.Encrypt(_connetionRecvBuffer, bytesRead, _connetionSendBuffer, out bytesToSend); encryptor.Encrypt(_connetionRecvBuffer, bytesRead, _connetionSendBuffer, out bytesToSend);
} }
_tcprelay.UpdateOutboundCounter(server, bytesToSend); _tcprelay.UpdateOutboundCounter(server, bytesToSend);
@@ -634,10 +552,7 @@ namespace Shadowsocks.Controller
private void PipeRemoteSendCallback(IAsyncResult ar) private void PipeRemoteSendCallback(IAsyncResult ar)
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
remote.EndSend(ar); remote.EndSend(ar);
@@ -652,10 +567,7 @@ namespace Shadowsocks.Controller
private void PipeConnectionSendCallback(IAsyncResult ar) private void PipeConnectionSendCallback(IAsyncResult ar)
{ {
if (_closed)
{
return;
}
if (_closed) return;
try try
{ {
connection.EndSend(ar); connection.EndSend(ar);


Write Preview
Loading…
Cancel
Save