Merge pull request netchx#90 from chsbuffer/master

Fix killing Netch ChildProcess
simple555a · Sep 1, 2019 · c61da58 · c61da58
2 parents f9c07d8 + 89dc161
commit c61da58
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 56 deletions.
diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
@@ -66,12 +66,15 @@ public bool Start(Objects.Server server, Objects.Mode mode)
                     result = true;
                     break;
                 case "Shadowsocks":
+                    KillProcess("Shadowsocks");
                     result = pSSController.Start(server, mode);
                     break;
                 case "ShadowsocksR":
+                    KillProcess("ShadowsocksR");
                     result = pSSRController.Start(server, mode);
                     break;
                 case "VMess":
+                    KillProcess("v2ray");
                     result = pVMessController.Start(server, mode);
                     break;
                 default:
@@ -130,5 +133,33 @@ public void Stop()
             pHTTPController.Stop();
             pTUNTAPController.Stop();
         }
+
+        public void KillProcess(String name) {
+            Process[] processes = Process.GetProcessesByName(name);
+            foreach (Process p in processes)
+            {
+                if (IsChildProcess(p, name))
+                {
+                    p.Kill();
+                }
+            }
+        }
+
+        private static bool IsChildProcess(Process process,string name)
+        {
+            bool result;
+            try
+            {
+                string FileName = (Directory.GetCurrentDirectory() + "\\bin\\" + name + ".exe").ToLower();
+                string procFileName = process.MainModule.FileName.ToLower();
+                result = FileName.Equals(procFileName, StringComparison.Ordinal);
+            }
+            catch (Exception e)
+            {
+                Utils.Logging.Info(e.Message);
+                result = false;
+            }
+            return result;
+        }
     }
 }
diff --git a/Netch/Controllers/SSController.cs b/Netch/Controllers/SSController.cs
@@ -25,18 +25,6 @@ public class SSController
         /// <returns>是否启动成功</returns>
         public bool Start(Objects.Server server, Objects.Mode mode)
         {
-            foreach (var proc in Process.GetProcessesByName("Shadowsocks"))
-            {
-                try
-                {
-                    proc.Kill();
-                }
-                catch (Exception)
-                {
-                    // 跳过
-                }
-            }
-
             if (!File.Exists("bin\\Shadowsocks.exe"))
             {
                 return false;

diff --git a/Netch/Controllers/SSRController.cs b/Netch/Controllers/SSRController.cs
@@ -25,18 +25,6 @@ public class SSRController
         /// <returns>是否启动成功</returns>
         public bool Start(Objects.Server server, Objects.Mode mode)
         {
-            foreach (var proc in Process.GetProcessesByName("ShadowsocksR"))
-            {
-                try
-                {
-                    proc.Kill();
-                }
-                catch (Exception)
-                {
-                    // 跳过
-                }
-            }
-
             if (!File.Exists("bin\\ShadowsocksR.exe"))
             {
                 return false;

diff --git a/Netch/Controllers/VMessController.cs b/Netch/Controllers/VMessController.cs
@@ -26,18 +26,6 @@ public class VMessController
         /// <returns>是否启动成功</returns>
         public bool Start(Objects.Server server, Objects.Mode mode)
         {
-            foreach (var proc in Process.GetProcessesByName("v2ray"))
-            {
-                try
-                {
-                    proc.Kill();
-                }
-                catch (Exception)
-                {
-                    // 跳过
-                }
-            }
-
             if (!File.Exists("bin\\v2ray.exe") || !File.Exists("bin\\v2ctl.exe"))
             {
                 return false;

diff --git a/Netch/Forms/MainForm.Designer.cs b/Netch/Forms/MainForm.Designer.cs
diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs
@@ -37,7 +37,7 @@ public MainForm()
             InitializeComponent();
 
             CheckForIllegalCrossThreadCalls = false;
-            ToolStrip.Renderer = new Override.ToolStripProfessionalRender();
+            //MenuStrip.Renderer = new Override.ToolStripProfessionalRender();
         }
 
         public void TestServer()
@@ -657,7 +657,7 @@ private void ControlButton_Click(object sender, EventArgs e)
                     return;
                 }
 
-                ToolStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = false;
+                MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = false;
                 ControlButton.Text = "...";
                 StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting")}";
                 State = Objects.State.Starting;
@@ -683,7 +683,7 @@ private void ControlButton_Click(object sender, EventArgs e)
                     }
                     else
                     {
-                        ToolStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = true;
+                        MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = true;
                         ControlButton.Text = Utils.i18N.Translate("Start");
                         StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Start failed")}";
                         State = Objects.State.Stopped;
@@ -714,7 +714,7 @@ private void ControlButton_Click(object sender, EventArgs e)
                         UsedBandwidthLabel.Visible = UploadSpeedLabel.Visible = DownloadSpeedLabel.Visible = false;
                     }
 
-                    ToolStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = true;
+                    MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = true;
                     ControlButton.Text = Utils.i18N.Translate("Start");
                     StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Stopped")}";
                     State = Objects.State.Stopped;

diff --git a/Netch/Forms/MainForm.resx b/Netch/Forms/MainForm.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />