3.8.8

Author: breakwa11

shadowsocks-csharp/Controller/HttpPortForwarder.cs

@@ -3,6 +3,7 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading;
 using Shadowsocks.Model;
 
 namespace Shadowsocks.Controller
@@ -32,8 +33,6 @@ class Handler
             private Socket _local;
             private Socket _remote;
             private bool _closed = false;
-            private bool _localShutdown = false;
-            private bool _remoteShutdown = false;
             private Configuration _config;
             HttpPraser httpProxyState;
             public const int RecvSize = 16384;
@@ -44,11 +43,11 @@ class Handler
 
             public void Start(Configuration config, byte[] firstPacket, int length, Socket socket, int targetPort)
             {
-                this._firstPacket = firstPacket;
-                this._firstPacketLength = length;
-                this._local = socket;
-                this._targetPort = targetPort;
-                this._config = config;
+                _firstPacket = firstPacket;
+                _firstPacketLength = length;
+                _local = socket;
+                _targetPort = targetPort;
+                _config = config;
                 if ((_config.authUser ?? "").Length == 0 || Util.Utils.isMatchSubNet(((IPEndPoint)this._local.RemoteEndPoint).Address, "127.0.0.0/8"))
                 {
                     Connect();
@@ -119,13 +118,13 @@ private void HttpHandshakeRecv(IAsyncResult ar)
                     else
                     {
                         Console.WriteLine("failed to recv data in HttpHandshakeRecv");
-                        this.Close();
+                        Close();
                     }
                 }
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -144,7 +143,7 @@ private void HttpHandshakeAuthEndSend(IAsyncResult ar)
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -158,7 +157,7 @@ private void StartConnect(IAsyncResult ar)
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
 
             }
@@ -172,7 +171,6 @@ private void Connect()
                     bool parsed = IPAddress.TryParse("127.0.0.1", out ipAddress);
                     IPEndPoint remoteEP = new IPEndPoint(ipAddress, _targetPort);
 
-
                     _remote = new Socket(ipAddress.AddressFamily,
                         SocketType.Stream, ProtocolType.Tcp);
                     _remote.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, true);
@@ -184,7 +182,7 @@ private void Connect()
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -202,7 +200,7 @@ private void ConnectCallback(IAsyncResult ar)
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -219,7 +217,7 @@ private void HandshakeReceive()
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -241,7 +239,7 @@ private void StartPipe(IAsyncResult ar)
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -261,15 +259,13 @@ private void PipeRemoteReceiveCallback(IAsyncResult ar)
                     }
                     else
                     {
-                        _local.Shutdown(SocketShutdown.Send);
-                        _localShutdown = true;
-                        CheckClose();
+                        Close();
                     }
                 }
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -289,15 +285,13 @@ private void PipeConnectionReceiveCallback(IAsyncResult ar)
                     }
                     else
                     {
-                        _remote.Shutdown(SocketShutdown.Send);
-                        _remoteShutdown = true;
-                        CheckClose();
+                        Close();
                     }
                 }
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -316,7 +310,7 @@ private void PipeRemoteSendCallback(IAsyncResult ar)
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -335,15 +329,7 @@ private void PipeConnectionSendCallback(IAsyncResult ar)
                 catch (Exception e)
                 {
                     Logging.LogUsefulException(e);
-                    this.Close();
-                }
-            }
-
-            private void CheckClose()
-            {
-                if (_localShutdown && _remoteShutdown)
-                {
-                    this.Close();
+                    Close();
                 }
             }
 
@@ -357,6 +343,7 @@ public void Close()
                     }
                     _closed = true;
                 }
+                Thread.Sleep(100);
                 if (_local != null)
                 {
                     try

shadowsocks-csharp/Controller/Local.cs

@@ -533,6 +533,8 @@ private void BeginConnect(IPAddress ipAddress, int serverPort)
                     remoteUDP = new ProxySocket(ipAddress.AddressFamily,
                         SocketType.Dgram, ProtocolType.Udp);
                     remoteUDP.GetSocket().Bind(new IPEndPoint(ipAddress.AddressFamily == AddressFamily.InterNetworkV6 ? IPAddress.IPv6Any : IPAddress.Any, 0));
+
+                    remoteUDP.SetEncryptor(EncryptorFactory.GetEncryptor(server.method, server.password));
                     remoteUDP.SetProtocol(ObfsFactory.GetObfs(server.protocol));
                     remoteUDP.SetObfs(ObfsFactory.GetObfs(server.obfs));
                 }
@@ -699,6 +701,18 @@ public void Close()
                     connection = null;
                     connectionUDP = null;
                 }
+
+                getCurrentServer = null;
+                keepCurrentServer = null;
+
+                detector = null;
+                speedTester = null;
+                random = null;
+                remoteUDPRecvBuffer = null;
+
+                server = null;
+                select_server = null;
+                cfg = null;
             }
             catch (Exception e)
             {
@@ -714,6 +728,11 @@ private bool ConnectProxyServer(string strRemoteHost, int iRemotePort)
                 remoteUDPEndPoint = remote.GetProxyUdpEndPoint();
                 remote.SetTcpServer(server.server, server.server_port);
                 remote.SetUdpServer(server.server, server.server_udp_port == 0 ? server.server_port : server.server_udp_port);
+                if (remoteUDP != null)
+                {
+                    remoteUDP.GoS5Proxy = true;
+                    remoteUDP.SetUdpServer(server.server, server.server_udp_port == 0 ? server.server_port : server.server_udp_port);
+                }
                 return ret;
             }
             else if (cfg.proxyType == 1)
@@ -1336,7 +1355,7 @@ private void PipeRemoteUDPReceiveCallback(IAsyncResult ar)
 
                 int bytesRead = endRemoteUDPRecv(ar, ref tempEP);
 
-                if (remote.IsClose)
+                if (remoteUDP.IsClose)
                 {
                     final_close = true;
                 }
@@ -1361,7 +1380,7 @@ private void PipeRemoteUDPReceiveCallback(IAsyncResult ar)
                     }
                     else //if (bytesRead > 0)
                     {
-                        ConnectionSend(remote.GetAsyncResultBuffer(ar), bytesRead);
+                        ConnectionSend(remoteUDP.GetAsyncResultBuffer(ar), bytesRead);
 
                         speedTester.AddRecvSize(bytesRead);
                         server.ServerSpeedLog().AddDownloadRawBytes(bytesRead);