fix the logic of port occupy testing in linux.

tmoonlight · tmoonlight · commit 4a830f9e024b · 2019-10-02T16:48:31.000+08:00
diff --git a/src/NSmartProxy.Infrastructure/NetworkUtil.cs b/src/NSmartProxy.Infrastructure/NetworkUtil.cs
@@ -87,10 +87,16 @@ public static int[] FindAvailableTCPPorts(int startPort, int PortCount)
                             continue;
                         }
                         foreach (IPEndPoint endPoint in endPoints)
-                        {
-                            if (endPoint.Port != port) continue;
-                            isAvailable = false;
-                            break;
+                        {//判断规则 ：0000或者三冒号打头，ip占用，才算占用，否则pass
+                         //因为linux下 出现192.168.0.106:8787的记录，也会被误判为端口被占用
+                            if (endPoint.Address.ToString() == "0.0.0.0" || endPoint.Address.ToString() == ":::")
+                            {
+                                if (endPoint.Port == port)
+                                {
+                                    isAvailable = false;
+                                    break;
+                                }
+                            }
                         }
 
                     } while (!isAvailable && port < IPEndPoint.MaxPort);
@@ -127,7 +133,7 @@ public static List<int> FindUnAvailableTCPPorts(List<int> ports)
                     ipGlobalProperties.GetActiveTcpListeners();
                 for (int i = ports.Count - 1; i > -1; i--)
                 {
-                    if (ports[i] > 65535 || ports[i] < 1|| _usedPorts.Contains(ports[i]))
+                    if (ports[i] > 65535 || ports[i] < 1 || _usedPorts.Contains(ports[i]))
                     {
                         usedPortList.Add(ports[i]);
                         ports.Remove(ports[i]);
diff --git a/src/NSmartProxy/Authorize/NSPServerContext.cs b/src/NSmartProxy/Authorize/NSPServerContext.cs
@@ -106,9 +106,14 @@ public void CloseAllSourceByClient(int clientId, bool addToBanlist = false)
                             if (nspAppGroup.IsAllClosed())
                             {
                                 Server.Logger.Info($"端口{port}所有app退出，侦听终止");
-                                //如果port内所有的app全都移除，才关闭listener
-                                nspAppGroup.Listener.Server.Close();
-                                nspAppGroup.Listener.Stop();
+                                if (nspAppGroup.Listener != null)
+                                {
+                                    //如果port内所有的app全都移除，才关闭listener
+                                    nspAppGroup.Listener.Server.NoDelay = true;
+                                    nspAppGroup.Listener.Server.Close();
+                                    nspAppGroup.Listener.Stop();
+                                }
+
                                 PortAppMap.Remove(port);
                             }
                         }
diff --git a/src/NSmartProxy/NSPApp.cs b/src/NSmartProxy/NSPApp.cs
@@ -71,15 +71,34 @@ public int Close()
         {
             if (!_closed)
             {
-                int ClosedCount = 0;
+                int closedCount = 0;
                 try
                 {
-                    Tunnels.ForEach((t) =>
+                    foreach (var t in Tunnels)
                     {
-                        t.ClientServerClient?.Close();
-                        t.ConsumerClient?.Close();
-                        ClosedCount++;
-                    });
+                        //TODO 3调试用
+                        //Console.WriteLine("XXX");
+                        ////Console.WriteLine(t.ConsumerClient?.Client.LocalEndPoint);
+                        //Console.WriteLine("XXX");
+                        if (t.ClientServerClient != null && t.ClientServerClient.Connected)
+                        {
+                            t.ClientServerClient.Close();
+                        }
+
+
+                        if (t.ConsumerClient != null && t.ConsumerClient.Connected)
+                        {
+                            //关闭会直接出timewat
+                            t.ConsumerClient.LingerState.Enabled = true;
+                            t.ConsumerClient.LingerState.LingerTime = 0;
+                            t.ConsumerClient.NoDelay = true;
+                            //t.ConsumerClient.Client.Shutdown(SocketShutdown.Both);
+                            t.ConsumerClient.Close();
+                        }
+
+                        closedCount++;
+                    }
+
                     //关闭循环和当前的侦听
                     CancelListenSource?.Cancel();
                     //Listener?.Stop();//TODO 3 逻辑错误！这个侦听可能还共享给了其他的app
@@ -89,7 +108,7 @@ public int Close()
                         TcpClientBlocks.Receive().Close();
                     }
                     _closed = true;
-                    return ClosedCount;
+                    return closedCount;
                 }
                 catch (Exception ex)
                 {
diff --git a/src/NSmartProxy/Server.cs b/src/NSmartProxy/Server.cs
@@ -208,7 +208,7 @@ private void ConnectionManager_AppAdded(object sender, AppChangedEventArgs e)
         {
             Server.Logger.Debug("AppTcpClientMapConfigConnected");
             int port = 0;
-            Protocol protocol;
+            //Protocol protocol;
             //string host = "";
             //TODO 如果有host 则分配到相同的group中
             foreach (var kv in ServerContext.PortAppMap)
@@ -217,7 +217,7 @@ private void ConnectionManager_AppAdded(object sender, AppChangedEventArgs e)
                     kv.Value.ActivateApp.ClientId == e.App.ClientId)
                 {
                     port = kv.Value.ActivateApp.ConsumePort;
-                    protocol = kv.Value.ActivateApp.AppProtocol;
+                    //protocol = kv.Value.ActivateApp.AppProtocol;
                     break;
                 }
 
@@ -261,7 +261,11 @@ async Task ListenConsumeAsync(int consumerPort)
             }
             catch (ObjectDisposedException ode)
             {
-                Logger.Debug($"外网端口{consumerPort}侦听时被外部终止" + ode);
+                _ = ode;
+                Logger.Debug($"外网端口{consumerPort}侦听时被外部终止");
+//#if DEBUG
+//                Logger.Debug("详细信息：" + ode);
+//#endif
             }
             catch (Exception ex)
             {
@@ -350,6 +354,17 @@ private async Task ProcessConsumeRequestAsync(int consumerPort, string clientApp
             }
             finally
             {
+                //if (consumerClient.Client.Connected)
+                //{
+                //    consumerClient.Client.LingerState = new LingerOption(false, 0);
+                //}
+
+                //if (s2pClient.Client.Connected)
+                //{
+                //    s2pClient.Client.LingerState = new LingerOption(false, 0);
+                //}
+
+
                 consumerClient.Close();
                 s2pClient.Close();
                 transfering.Cancel();

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,14 @@ public void CloseAllSourceByClient(int clientId, bool addToBanlist = false)`
`106`	`106`	`if (nspAppGroup.IsAllClosed())`
`107`	`107`	`{`
`108`	`108`	`Server.Logger.Info($"端口{port}所有app退出，侦听终止");`
`109`		`- //如果port内所有的app全都移除，才关闭listener`
`110`		`- nspAppGroup.Listener.Server.Close();`
`111`		`- nspAppGroup.Listener.Stop();`
	`109`	`+ if (nspAppGroup.Listener != null)`
	`110`	`+ {`
	`111`	`+ //如果port内所有的app全都移除，才关闭listener`
	`112`	`+ nspAppGroup.Listener.Server.NoDelay = true;`
	`113`	`+ nspAppGroup.Listener.Server.Close();`
	`114`	`+ nspAppGroup.Listener.Stop();`
	`115`	`+ }`
	`116`	`+`
`112`	`117`	`PortAppMap.Remove(port);`
`113`	`118`	`}`
`114`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ private void ConnectionManager_AppAdded(object sender, AppChangedEventArgs e)`
`208`	`208`	`{`
`209`	`209`	`Server.Logger.Debug("AppTcpClientMapConfigConnected");`
`210`	`210`	`int port = 0;`
`211`		`- Protocol protocol;`
	`211`	`+ //Protocol protocol;`
`212`	`212`	`//string host = "";`
`213`	`213`	`//TODO 如果有host 则分配到相同的group中`
`214`	`214`	`foreach (var kv in ServerContext.PortAppMap)`
`@@ -217,7 +217,7 @@ private void ConnectionManager_AppAdded(object sender, AppChangedEventArgs e)`
`217`	`217`	`kv.Value.ActivateApp.ClientId == e.App.ClientId)`
`218`	`218`	`{`
`219`	`219`	`port = kv.Value.ActivateApp.ConsumePort;`
`220`		`- protocol = kv.Value.ActivateApp.AppProtocol;`
	`220`	`+ //protocol = kv.Value.ActivateApp.AppProtocol;`
`221`	`221`	`break;`
`222`	`222`	`}`
`223`	`223`
`@@ -261,7 +261,11 @@ async Task ListenConsumeAsync(int consumerPort)`
`261`	`261`	`}`
`262`	`262`	`catch (ObjectDisposedException ode)`
`263`	`263`	`{`
`264`		`- Logger.Debug($"外网端口{consumerPort}侦听时被外部终止" + ode);`
	`264`	`+ _ = ode;`
	`265`	`+ Logger.Debug($"外网端口{consumerPort}侦听时被外部终止");`
	`266`	`+//#if DEBUG`
	`267`	`+// Logger.Debug("详细信息：" + ode);`
	`268`	`+//#endif`
`265`	`269`	`}`
`266`	`270`	`catch (Exception ex)`
`267`	`271`	`{`
`@@ -350,6 +354,17 @@ private async Task ProcessConsumeRequestAsync(int consumerPort, string clientApp`
`350`	`354`	`}`
`351`	`355`	`finally`
`352`	`356`	`{`
	`357`	`+ //if (consumerClient.Client.Connected)`
	`358`	`+ //{`
	`359`	`+ // consumerClient.Client.LingerState = new LingerOption(false, 0);`
	`360`	`+ //}`
	`361`	`+`
	`362`	`+ //if (s2pClient.Client.Connected)`
	`363`	`+ //{`
	`364`	`+ // s2pClient.Client.LingerState = new LingerOption(false, 0);`
	`365`	`+ //}`
	`366`	`+`
	`367`	`+`
`353`	`368`	`consumerClient.Close();`
`354`	`369`	`s2pClient.Close();`
`355`	`370`	`transfering.Cancel();`