Browse Source

修改socks5协议连接建立成功回复发送时间

原始的是socks5收到tcp代理请求立刻回复已连接到远程主机。
现在改为只有建立了到远程ss的连接后才回复链接已建立。
pull/240/head
GameXG 10 years ago
parent
commit
50309a0fe3
1 changed files with 7 additions and 7 deletions
  1. +7
    -7
      shadowsocks-csharp/Controller/Service/TCPRelay.cs

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

@@ -74,7 +74,7 @@ namespace Shadowsocks.Controller
private bool connectionShutdown = false; private bool connectionShutdown = false;
private bool remoteShutdown = false; private bool remoteShutdown = false;
private bool closed = false; private bool closed = false;
private object encryptionLock = new object(); private object encryptionLock = new object();
private object decryptionLock = new object(); private object decryptionLock = new object();
@@ -222,14 +222,13 @@ namespace Shadowsocks.Controller
try try
{ {
int bytesRead = connection.EndReceive(ar); int bytesRead = connection.EndReceive(ar);
if (bytesRead >= 3) if (bytesRead >= 3)
{ {
command = connetionRecvBuffer[1]; command = connetionRecvBuffer[1];
if (command == 1) if (command == 1)
{ {
byte[] response = { 5, 0, 0, 1, 0, 0, 0, 0, 0, 0 };
connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(ResponseCallback), null);
StartConnect();
} }
else if (command == 3) else if (command == 3)
{ {
@@ -312,7 +311,7 @@ namespace Shadowsocks.Controller
{ {
connection.EndSend(ar); connection.EndSend(ar);
StartConnect();
StartPipe();
} }
catch (Exception e) catch (Exception e)
@@ -326,7 +325,7 @@ namespace Shadowsocks.Controller
{ {
public Server Server; public Server Server;
public ServerTimer(int p) :base(p)
public ServerTimer(int p) : base(p)
{ {
} }
} }
@@ -432,7 +431,8 @@ namespace Shadowsocks.Controller
strategy.UpdateLatency(server, latency); strategy.UpdateLatency(server, latency);
} }
StartPipe();
byte[] response = { 5, 0, 0, 1, 0, 0, 0, 0, 0, 0 };
connection.BeginSend(response, 0, response.Length, 0, new AsyncCallback(ResponseCallback), null);
} }
catch (ArgumentException) catch (ArgumentException)
{ {


Loading…
Cancel
Save