Fix #589 GetProcessByUsedTcpPort multiple process

netchx · Mar 22, 2021 · 9a3a1e3 · 9a3a1e3
1 parent 3f4a31d
commit 9a3a1e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
@@ -191,8 +191,7 @@ public static void PortCheck(ushort port, string portName, PortType portType = P
 
         public static void TryReleaseTcpPort(ushort port, string portName)
         {
-            Process? p;
-            if ((p = PortHelper.GetProcessByUsedTcpPort(port)) != null)
+            foreach (var p in PortHelper.GetProcessByUsedTcpPort(port))
             {
                 if (p.MainModule!.FileName.StartsWith(Global.NetchDir))
                 {

diff --git a/Netch/Utils/PortHelper.cs b/Netch/Utils/PortHelper.cs
@@ -28,16 +28,14 @@ static PortHelper()
             }
         }
 
-        public static Process? GetProcessByUsedTcpPort(ushort port)
+        public static IEnumerable<Process> GetProcessByUsedTcpPort(ushort port)
         {
             if (port == 0)
                 throw new ArgumentOutOfRangeException();
 
-            var row = GetTcpTable2().SingleOrDefault(r => ntohs((ushort) r.dwLocalPort) == port);
-            if (row.dwOwningPid == 0)
-                return null;
+            var row = GetTcpTable2().Where(r => ntohs((ushort) r.dwLocalPort) == port);
 
-            return Process.GetProcessById((int) row.dwOwningPid);
+            return row.Select(r => Process.GetProcessById((int) r.dwOwningPid));
         }
 
         private static void GetReservedPortRange(PortType portType, ref List<Range> targetList)