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 buggy parameter. 

Replaced SocketFlags.None (an enum which euqals 0) from zero.
tags/3.2
kimw 8 years ago
parent
ff04a2a18a
commit
f9296b49b1
1 changed files with 12 additions and 17 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +12
    -17
      shadowsocks-csharp/Controller/Service/TCPRelay.cs

+ 12
- 17
shadowsocks-csharp/Controller/Service/TCPRelay.cs View File

@@ -37,7 +37,6 @@ namespace Shadowsocks.Controller
handler.connection = socket; handler.connection = socket;
handler.controller = _controller; handler.controller = _controller;
handler.tcprelay = this; handler.tcprelay = this;
handler.Start(firstPacket, length); handler.Start(firstPacket, length);
IList<TCPHandler> handlersToClose = new List<TCPHandler>(); IList<TCPHandler> handlersToClose = new List<TCPHandler>();
lock (Handlers) lock (Handlers)
@@ -201,7 +200,7 @@ namespace Shadowsocks.Controller
response = new byte[] { 0, 91 }; response = new byte[] { 0, 91 };
Logging.Error("socks 5 protocol error"); Logging.Error("socks 5 protocol error");
} }
connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(HandshakeSendCallback), null);
connection.BeginSend(response, 0, response.Length, SocketFlags.None, new AsyncCallback(HandshakeSendCallback), null);
} }
else else
Close(); Close();
@@ -227,7 +226,7 @@ namespace Shadowsocks.Controller
// +-----+-----+-------+------+----------+----------+ // +-----+-----+-------+------+----------+----------+
// Skip first 3 bytes // Skip first 3 bytes
// TODO validate // TODO validate
connection.BeginReceive(_connetionRecvBuffer, 0, 3, 0, new AsyncCallback(handshakeReceive2Callback), null);
connection.BeginReceive(_connetionRecvBuffer, 0, 3, SocketFlags.None, new AsyncCallback(handshakeReceive2Callback), null);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -248,7 +247,7 @@ namespace Shadowsocks.Controller
if (_command == 1) if (_command == 1)
{ {
byte[] response = { 5, 0, 0, 1, 0, 0, 0, 0, 0, 0 }; byte[] response = { 5, 0, 0, 1, 0, 0, 0, 0, 0, 0 };
connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(ResponseCallback), null);
connection.BeginSend(response, 0, response.Length, SocketFlags.None, new AsyncCallback(ResponseCallback), null);
} }
else if (_command == 3) else if (_command == 3)
HandleUDPAssociate(); HandleUDPAssociate();
@@ -285,7 +284,7 @@ namespace Shadowsocks.Controller
address.CopyTo(response, 4); address.CopyTo(response, 4);
response[response.Length - 1] = (byte)(port & 0xFF); response[response.Length - 1] = (byte)(port & 0xFF);
response[response.Length - 2] = (byte)((port >> 8) & 0xFF); response[response.Length - 2] = (byte)((port >> 8) & 0xFF);
connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(ReadAll), true);
connection.BeginSend(response, 0, response.Length, SocketFlags.None, new AsyncCallback(ReadAll), true);
} }
private void ReadAll(IAsyncResult ar) private void ReadAll(IAsyncResult ar)
@@ -297,7 +296,7 @@ namespace Shadowsocks.Controller
{ {
connection.EndSend(ar); connection.EndSend(ar);
Logging.Debug(remote, RecvSize, "TCP Relay"); Logging.Debug(remote, RecvSize, "TCP Relay");
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, 0, new AsyncCallback(ReadAll), null);
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, SocketFlags.None, new AsyncCallback(ReadAll), null);
} }
else else
{ {
@@ -305,7 +304,7 @@ namespace Shadowsocks.Controller
if (bytesRead > 0) if (bytesRead > 0)
{ {
Logging.Debug(remote, RecvSize, "TCP Relay"); Logging.Debug(remote, RecvSize, "TCP Relay");
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, 0, new AsyncCallback(ReadAll), null);
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, SocketFlags.None, new AsyncCallback(ReadAll), null);
} }
else else
Close(); Close();
@@ -443,8 +442,8 @@ namespace Shadowsocks.Controller
try try
{ {
_startReceivingTime = DateTime.Now; _startReceivingTime = DateTime.Now;
remote.BeginReceive(_remoteRecvBuffer, 0, RecvSize, 0, new AsyncCallback(PipeRemoteReceiveCallback), null);
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, 0, new AsyncCallback(PipeConnectionReceiveCallback), null);
remote.BeginReceive(_remoteRecvBuffer, 0, RecvSize, SocketFlags.None, new AsyncCallback(PipeRemoteReceiveCallback), null);
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, SocketFlags.None, new AsyncCallback(PipeConnectionReceiveCallback), null);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -461,7 +460,6 @@ namespace Shadowsocks.Controller
int bytesRead = remote.EndReceive(ar); int bytesRead = remote.EndReceive(ar);
_totalRead += bytesRead; _totalRead += bytesRead;
_tcprelay.UpdateInboundCounter(server, bytesRead); _tcprelay.UpdateInboundCounter(server, bytesRead);
if (bytesRead > 0) if (bytesRead > 0)
{ {
lastActivity = DateTime.Now; lastActivity = DateTime.Now;
@@ -471,8 +469,7 @@ namespace Shadowsocks.Controller
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, SocketFlags.None, new AsyncCallback(PipeConnectionSendCallback), null);
IStrategy strategy = controller.GetCurrentStrategy(); IStrategy strategy = controller.GetCurrentStrategy();
strategy?.UpdateLastRead(server); strategy?.UpdateLastRead(server);
} }
@@ -497,7 +494,6 @@ namespace Shadowsocks.Controller
{ {
int bytesRead = connection.EndReceive(ar); int bytesRead = connection.EndReceive(ar);
_totalWrite += bytesRead; _totalWrite += bytesRead;
if (bytesRead > 0) if (bytesRead > 0)
{ {
int atyp = _connetionRecvBuffer[0]; int atyp = _connetionRecvBuffer[0];
@@ -531,8 +527,7 @@ namespace Shadowsocks.Controller
_tcprelay.UpdateOutboundCounter(server, bytesToSend); _tcprelay.UpdateOutboundCounter(server, bytesToSend);
_startSendingTime = DateTime.Now; _startSendingTime = DateTime.Now;
_bytesToSend = bytesToSend; _bytesToSend = bytesToSend;
remote.BeginSend(_connetionSendBuffer, 0, bytesToSend, 0, new AsyncCallback(PipeRemoteSendCallback), null);
remote.BeginSend(_connetionSendBuffer, 0, bytesToSend, SocketFlags.None, new AsyncCallback(PipeRemoteSendCallback), null);
IStrategy strategy = controller.GetCurrentStrategy(); IStrategy strategy = controller.GetCurrentStrategy();
strategy?.UpdateLastWrite(server); strategy?.UpdateLastWrite(server);
} }
@@ -556,7 +551,7 @@ namespace Shadowsocks.Controller
try try
{ {
remote.EndSend(ar); remote.EndSend(ar);
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, 0, new AsyncCallback(PipeConnectionReceiveCallback), null);
connection.BeginReceive(_connetionRecvBuffer, 0, RecvSize, SocketFlags.None, new AsyncCallback(PipeConnectionReceiveCallback), null);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -571,7 +566,7 @@ namespace Shadowsocks.Controller
try try
{ {
connection.EndSend(ar); connection.EndSend(ar);
remote.BeginReceive(_remoteRecvBuffer, 0, RecvSize, 0, new AsyncCallback(PipeRemoteReceiveCallback), null);
remote.BeginReceive(_remoteRecvBuffer, 0, RecvSize, SocketFlags.None, new AsyncCallback(PipeRemoteReceiveCallback), null);
} }
catch (Exception e) catch (Exception e)
{ {


Write Preview
Loading…
Cancel
Save