尝试修复退出错误

修复停止时进程堵塞
netchx · Jul 24, 2020 · bbf9c5e · bbf9c5e
1 parent 6174e78
commit bbf9c5e
Show file tree

Hide file tree

Showing 11 changed files with 160 additions and 151 deletions.
diff --git a/Netch/Controllers/Interface/Controller.cs b/Netch/Controllers/Interface/Controller.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
@@ -67,10 +68,14 @@ protected void StopInstance()
                 Instance.Kill();
                 Instance.WaitForExit();
             }
-            catch (Exception e)
+            catch (Win32Exception e)
             {
                 Logging.Error($"停止 {MainFile} 错误：\n" + e);
             }
+            catch
+            {
+                // ignored
+            }
         }
 
 

diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
@@ -146,9 +146,14 @@ public bool Start(Server server, Mode mode)
         /// </summary>
         public void Stop()
         {
-            Task.Run(() => pEncryptedProxyController?.Stop());
-            Task.Run(() => UsingPorts.Clear());
-            pModeController?.Stop();
+            var tasks = new[]
+            {
+                Task.Factory.StartNew(() => pEncryptedProxyController?.Stop()),
+                Task.Factory.StartNew(() => UsingPorts.Clear()),
+                Task.Factory.StartNew(() => pModeController?.Stop()),
+                Task.Factory.StartNew(() => pNTTController.Stop())
+            };
+            Task.WaitAll(tasks);
         }
 
         public static void KillProcessByName(string name)

diff --git a/Netch/Controllers/Mode/HTTPController.cs b/Netch/Controllers/Mode/HTTPController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using Microsoft.Win32;
 using Netch.Models;
@@ -30,7 +31,8 @@ public HTTPController()
         /// <returns>是否启动成功</returns>
         public override bool Start(Server server, Mode mode)
         {
-            RecordPrevious();
+            Task.Run(RecordPrevious);
+
             try
             {
                 if (server.Type == "Socks5")
@@ -79,21 +81,20 @@ private void RecordPrevious()
         /// </summary>
         public override void Stop()
         {
-            try
+            var tasks = new[]
             {
-                pPrivoxyController.Stop();
-
-                NativeMethods.SetGlobal(prevHTTP, prevBypass);
-                if (prevPAC != "")
-                    NativeMethods.SetURL(prevPAC);
-                if (!prevEnabled)
-                    NativeMethods.SetDIRECT();
-                prevEnabled = false;
-            }
-            catch (Exception e)
-            {
-                Logging.Error("停止HTTP控制器错误：\n" + e);
-            }
+                Task.Factory.StartNew(pPrivoxyController.Stop),
+                Task.Factory.StartNew(() =>
+                {
+                    NativeMethods.SetGlobal(prevHTTP, prevBypass);
+                    if (prevPAC != "")
+                        NativeMethods.SetURL(prevPAC);
+                    if (!prevEnabled)
+                        NativeMethods.SetDIRECT();
+                    prevEnabled = false;
+                })
+            };
+            Task.WaitAll(tasks);
         }
     }
 }
diff --git a/Netch/Controllers/Mode/TUNTAPController.cs b/Netch/Controllers/Mode/TUNTAPController.cs
@@ -7,6 +7,7 @@
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using Netch.Models;
 using Netch.Properties;
@@ -366,10 +367,11 @@ public override bool Start(Server server, Mode mode)
             {
                 Thread.Sleep(10);
 
-                if (State == State.Started) return true;
-
-                if (State == State.Stopped)
+                switch (State)
                 {
+                    case State.Started:
+                        return true;
+                    case State.Stopped:
                     Stop();
                     return false;
                 }
@@ -383,9 +385,13 @@ public override bool Start(Server server, Mode mode)
         /// </summary>
         public override void Stop()
         {
-            StopInstance();
-            ClearBypass();
-            pDNSController.Stop();
+            var tasks = new[]
+            {
+                Task.Factory.StartNew(StopInstance),
+                Task.Factory.StartNew(ClearBypass),
+                Task.Factory.StartNew(pDNSController.Stop)
+            };
+            Task.WaitAll(tasks);
         }
 
         /// <summary>

diff --git a/Netch/Controllers/NTTController.cs b/Netch/Controllers/NTTController.cs
@@ -43,9 +43,9 @@ public NTTController()
 
                 return (true, natType, localEnd, publicEnd);
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                Logging.Error("NTT 进程出错");
+                Logging.Error("NTT 进程出错\n" + e);
                 Stop();
                 return (false, null, null, null);
             }
@@ -57,11 +57,9 @@ private new void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
                 _lastResult = e.Data;
         }
 
-        /// <summary>
-        ///     无用
-        /// </summary>
         public override void Stop()
         {
+            StopInstance();
         }
     }
 }
diff --git a/Netch/Forms/MainForm.Control.cs b/Netch/Forms/MainForm.Control.cs
@@ -19,9 +19,6 @@ partial class MainForm
 
         private void ControlFun()
         {
-            //防止模式选择框变成蓝色:D
-            ModeComboBox.Select(0, 0);
-
             if (State == State.Waiting || State == State.Stopped)
             {
                 // 服务器、模式 需选择
@@ -37,7 +34,10 @@ private void ControlFun()
                     return;
                 }
 
-                UpdateStatus(State.Starting);
+                State = State.Starting;
+
+                // 清除模式搜索框文本选择
+                ModeComboBox.Select(0, 0);
 
                 Task.Run(() =>
                 {
@@ -50,15 +50,14 @@ private void ControlFun()
                     {
                         Task.Run(() =>
                         {
-                            UpdateStatus(State.Started,
-                                i18N.Translate(StateExtension.GetStatusString(State.Started)) + LocalPortText(server.Type, mode.Type));
+                            State = State.Started;
+                            StatusTextAppend(LocalPortText(server.Type, mode.Type));
                             Bandwidth.NetTraffic(server, mode, _mainController);
                         });
                         // 如果勾选启动后最小化
                         if (Global.Settings.MinimizeWhenStarted)
                         {
                             WindowState = FormWindowState.Minimized;
-                            NotifyIcon.Visible = true;
 
                             if (_isFirstCloseWindow)
                             {
@@ -100,16 +99,20 @@ private void ControlFun()
                     }
                     else
                     {
-                        UpdateStatus(State.Stopped, i18N.Translate("Start failed"));
+                        State = State.Stopped;
+                        StatusText(i18N.Translate("Start failed"));
                     }
                 });
             }
             else
             {
-                // 停止
-                UpdateStatus(State.Stopping);
-                _mainController.Stop();
-                UpdateStatus(State.Stopped);
+                Task.Run(() =>
+                {
+                    // 停止
+                    State = State.Stopping;
+                    _mainController.Stop();
+                    State = State.Stopped;
+                });
                 Task.Run(TestServer);
             }
         }

diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs
@@ -210,7 +210,7 @@ private void UpdateServersFromSubscribeLinksToolStripMenuItem_Click(object sende
                     StatusText(i18N.Translate("Subscription updated"));
 
                     MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = true;
-                    UpdateStatus(bak_State);
+                    State = bak_State;
                     StatusLabel.Text = bak_StateText;
                 }).ContinueWith(task => { BeginInvoke(new Action(() => { UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = true; })); });
 
@@ -283,7 +283,7 @@ private void CleanDNSCacheToolStripMenuItem_Click(object sender, EventArgs e)
             }
             finally
             {
-                UpdateStatus(bak_State);
+                State = bak_State;
                 StatusLabel.Text = bak_StateText;
             }
         }
@@ -315,7 +315,7 @@ private void reinstallTapDriverToolStripMenuItem_Click(object sender, EventArgs
                 }
                 finally
                 {
-                    UpdateStatus(State.Waiting);
+                    State = State.Waiting;
                     Enabled = true;
                 }
             });
@@ -365,7 +365,7 @@ private void updateACLWithProxyToolStripMenuItem_Click(object sender, EventArgs
                 }
                 finally
                 {
-                    UpdateStatus(State.Waiting);
+                    State = State.Waiting;
                     _mainController.Stop();
                 }
             });
@@ -422,7 +422,7 @@ private void updateACLToolStripMenuItem_Click(object sender, EventArgs e)
                 }
                 finally
                 {
-                    UpdateStatus(bak_State);
+                    State = bak_State;
                     StatusLabel.Text = bak_StateText;
                 }
             });