fix the logic of port occupy testing in linux.

tmoonlight · Oct 2, 2019 · 4a830f9 · 4a830f9
1 parent 70c170a
commit 4a830f9
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 18 deletions.
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();