Update mode

调整设置界面UI

.editorconfig

@@ -6,4 +6,54 @@ root = true
 # all files
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 4
+tab_width = 4
+
+# Microsoft .NET properties
+csharp_new_line_before_members_in_object_initializers = false
+csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
+csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+# ReSharper properties
+resharper_blank_lines_after_block_statements = 0
+resharper_csharp_blank_lines_around_field = 0
+resharper_csharp_blank_lines_around_invocable = 0
+resharper_csharp_blank_lines_around_type = 0
+resharper_csharp_int_align_comments = true
+resharper_csharp_max_line_length = 368
+resharper_csharp_wrap_lines = false
+resharper_place_expr_accessor_on_single_line = true
+resharper_place_expr_method_on_single_line = true
+resharper_place_field_attribute_on_same_line = false
+resharper_place_simple_embedded_statement_on_same_line = false
+resharper_place_simple_initializer_on_single_line = false
+resharper_use_indent_from_vs = false
+resharper_wrap_array_initializer_style = chop_if_long
+resharper_wrap_object_and_collection_initializer_style = chop_always
+
+# ReSharper inspection severities
+resharper_arrange_redundant_parentheses_highlighting = hint
+resharper_arrange_this_qualifier_highlighting = hint
+resharper_arrange_type_member_modifiers_highlighting = hint
+resharper_arrange_type_modifiers_highlighting = hint
+resharper_built_in_type_reference_style_for_member_access_highlighting = hint
+resharper_built_in_type_reference_style_highlighting = hint
+resharper_redundant_base_qualifier_highlighting = warning
+resharper_suggest_var_or_type_built_in_types_highlighting = hint
+resharper_suggest_var_or_type_elsewhere_highlighting = hint
+resharper_suggest_var_or_type_simple_types_highlighting = hint
+resharper_web_config_module_not_resolved_highlighting = warning
+resharper_web_config_type_not_resolved_highlighting = warning
+resharper_web_config_wrong_module_highlighting = warning

Netch/Controllers/DNSController.cs

@@ -6,7 +6,6 @@ namespace Netch.Controllers
 {
     public class DNSController : IController
     {
-
         public string Name { get; } = "DNS Service";
 
         /// <summary>
@@ -15,13 +14,14 @@ namespace Netch.Controllers
         /// <returns></returns>
         public bool Start()
         {
-            if (!aiodns_dial(Encoding.UTF8.GetBytes(Path.GetFullPath(Global.Settings.AioDNS.RulePath)),
-                Encoding.UTF8.GetBytes($"{Global.Settings.AioDNS.ChinaDNS}:53"),
-                Encoding.UTF8.GetBytes($"{Global.Settings.AioDNS.OtherDNS}:53"))
-            )
-                return false;
-            return
-                aiodns_init();
+            aiodns_dial((int) NameList.TYPE_REST, null);
+            aiodns_dial((int) NameList.TYPE_ADDR, Encoding.UTF8.GetBytes($"{Global.Settings.LocalAddress}:53"));
+            aiodns_dial((int) NameList.TYPE_LIST, Encoding.UTF8.GetBytes(Path.GetFullPath(Global.Settings.AioDNS.RulePath)));
+            aiodns_dial((int) NameList.TYPE_CDNS, Encoding.UTF8.GetBytes($"{Global.Settings.AioDNS.ChinaDNS}:53"));
+            aiodns_dial((int) NameList.TYPE_ODNS, Encoding.UTF8.GetBytes($"{Global.Settings.AioDNS.OtherDNS}:53"));
+            aiodns_dial((int) NameList.TYPE_METH, Encoding.UTF8.GetBytes(Global.Settings.AioDNS.Protocol));
+
+            return aiodns_init();
         }
 
         public void Stop()
@@ -32,7 +32,7 @@ namespace Netch.Controllers
         #region NativeMethods
 
         [DllImport("aiodns.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool aiodns_dial(byte[] chinacon, byte[] chinadns, byte[] otherdns);
+        public static extern bool aiodns_dial(int name, byte[] value);
 
         [DllImport("aiodns.bin", CallingConvention = CallingConvention.Cdecl)]
         public static extern bool aiodns_init();
@@ -40,6 +40,16 @@ namespace Netch.Controllers
         [DllImport("aiodns.bin", CallingConvention = CallingConvention.Cdecl)]
         public static extern void aiodns_free();
 
+        enum NameList : int
+        {
+            TYPE_REST,
+            TYPE_ADDR,
+            TYPE_LIST,
+            TYPE_CDNS,
+            TYPE_ODNS,
+            TYPE_METH
+        }
+
         #endregion
     }
 }

Netch/Controllers/Guard.cs

@@ -56,7 +56,7 @@ namespace Netch.Controllers
         ///     程序输出的编码,
         ///     调用于基类的 <see cref="OnOutputDataReceived"/> 
         /// </summary>
-        protected string InstanceOutputEncoding { get; set; } = "gbk";
+        protected Encoding InstanceOutputEncoding { get; set; } = Encoding.GetEncoding("gbk");
 
         /// <summary>
         ///     停止进程
@@ -93,10 +93,11 @@ namespace Netch.Controllers
                     WorkingDirectory = $"{Global.NetchDir}\\bin",
                     Arguments = argument,
                     CreateNoWindow = true,
-                    RedirectStandardError = RedirectStd,
-                    RedirectStandardInput = RedirectStd,
-                    RedirectStandardOutput = RedirectStd,
                     UseShellExecute = !RedirectStd,
+                    RedirectStandardOutput = RedirectStd,
+                    StandardOutputEncoding = RedirectStd ? InstanceOutputEncoding : null,
+                    RedirectStandardError = RedirectStd,
+                    StandardErrorEncoding = RedirectStd ? InstanceOutputEncoding : null,
                     WindowStyle = ProcessWindowStyle.Hidden
                 }
             };
@@ -192,15 +193,13 @@ namespace Netch.Controllers
             if (e.Data == null)
                 return;
 
-            var info = Encoding.GetEncoding(InstanceOutputEncoding).GetBytes(e.Data);
-            var str = Encoding.UTF8.GetString(info);
-            Write(str);
+            Write(e.Data);
             // 检查启动
             if (State == State.Starting)
             {
-                if (StartedKeywords.Any(s => str.Contains(s)))
+                if (StartedKeywords.Any(s => e.Data.Contains(s)))
                     State = State.Started;
-                else if (StoppedKeywords.Any(s => str.Contains(s)))
+                else if (StoppedKeywords.Any(s => e.Data.Contains(s)))
                     State = State.Stopped;
             }
         }

Netch/Controllers/HTTPController.cs

@@ -4,8 +4,9 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Microsoft.Win32;
 using Netch.Models;
-using Netch.Servers.Socks5;
 using Netch.Utils;
+using WindowsProxy;
+using Netch.Utils.HttpProxyHandler;
 
 namespace Netch.Controllers
 {
@@ -31,12 +32,28 @@ namespace Netch.Controllers
 
             try
             {
-                if (pPrivoxyController.Start(MainController.ServerController.Server, mode))
+                if (pPrivoxyController.Start(MainController.Server, mode))
                 {
                     Global.Job.AddProcess(pPrivoxyController.Instance);
                 }
 
-                if (mode.Type == 3) NativeMethods.SetGlobal($"127.0.0.1:{Global.Settings.HTTPLocalPort}", IEProxyExceptions);
+                if (mode.Type == 3)
+                {
+                    if (mode.BypassChina)
+                    {
+                        //启动PAC服务器
+                        PACServerHandle.InitPACServer("127.0.0.1");
+                    }
+                    else
+                    {
+                        using var service = new ProxyService
+                        {
+                            Server = $"127.0.0.1:{Global.Settings.HTTPLocalPort}",
+                            Bypass = IEProxyExceptions
+                        };
+                        service.Global();
+                    }
+                }
             }
             catch (Exception e)
             {
@@ -85,18 +102,36 @@ namespace Netch.Controllers
         {
             var tasks = new[]
             {
-                Task.Factory.StartNew(pPrivoxyController.Stop),
-                Task.Factory.StartNew(() =>
+                Task.Run(pPrivoxyController.Stop),
+                Task.Run(() =>
                 {
-                    if (prevEnabled)
+                    using var service = new ProxyService();
+                    try
                     {
-                        if (prevHTTP != "")
-                            NativeMethods.SetGlobal(prevHTTP, prevBypass);
-                        if (prevPAC != "")
-                            NativeMethods.SetURL(prevPAC);
+                        PACServerHandle.Stop();
+                        if (prevEnabled)
+                        {
+                            if (prevHTTP != "")
+                            {
+                                service.Server = prevHTTP;
+                                service.Bypass = prevBypass;
+                                service.Global();
+                            }
+                            if (prevPAC != "")
+                            {
+                                service.AutoConfigUrl = prevPAC;
+                                service.Pac();
+                            }
+                        }
+                        else
+                        {
+                            service.Direct();
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Logging.Error($"{Name} 控制器出错:\n" + e);
                     }
-                    else
-                        NativeMethods.SetDIRECT();
                 })
             };
             Task.WaitAll(tasks);

Netch/Controllers/IServerController.cs

@@ -4,8 +4,6 @@ namespace Netch.Controllers
 {
     public interface IServerController : IController
     {
-        public Server Server { get; set; }
-
         public ushort? Socks5LocalPort { get; set; }
 
         public string LocalAddress { get; set; }

Netch/Controllers/MainController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using Netch.Models;
 using Netch.Servers.Socks5;
@@ -18,12 +19,29 @@ namespace Netch.Controllers
             private set => _serverController = value;
         }
 
+        public static IServerController UdpServerController
+        {
+            get => _udpServerController ?? _serverController;
+            set => _udpServerController = value;
+        }
+
+        /// TCP or Both Server
+        public static Server Server;
+
+        public static Server UdpServer
+        {
+            get => _udpServer ?? Server;
+            set => _udpServer = value;
+        }
+
+        private static Server _udpServer;
         public static IModeController ModeController { get; private set; }
 
         public static bool NttTested;
 
         private static readonly NTTController NTTController = new NTTController();
         private static IServerController _serverController;
+        private static IServerController _udpServerController;
 
         /// <summary>
         ///     启动
@@ -34,6 +52,7 @@ namespace Netch.Controllers
         public static async Task<bool> Start(Server server, Mode mode)
         {
             Logging.Info($"启动主控制器: {server.Type} [{mode.Type}]{mode.Remark}");
+            Server = server;
 
             if (server is Socks5 && mode.Type == 4)
             {
@@ -64,19 +83,22 @@ namespace Netch.Controllers
 
             try
             {
-                if (!await Task.Run(() => StartServer(server, mode, ref _serverController)))
+                if (!ModeHelper.SkipServerController(server, mode))
+                {
+                    if (!await Task.Run(() => StartServer(server, mode, ref _serverController)))
+                    {
+                        throw new StartFailedException();
+                    }
+
+                    StatusPortInfoText.UpdateShareLan();
+                }
+
+                if (!await StartMode(mode))
                 {
                     throw new StartFailedException();
                 }
 
-                StatusPortInfoText.UpdateShareLan();
-
-                if (!await StartMode(server, mode))
-                {
-                    throw new StartFailedException();
-                }
-
-                if (mode.TestNatRequired)
+                if (mode.TestNatRequired())
                     NatTest();
 
                 return true;
@@ -128,13 +150,17 @@ namespace Netch.Controllers
                 {
                     if (guard.Instance != null)
                     {
-                        Global.Job.AddProcess(guard.Instance);
+                        Task.Run(() =>
+                        {
+                            Thread.Sleep(1000);
+                            Global.Job.AddProcess(guard.Instance);
+                        });
                     }
                 }
 
                 if (server is Socks5 socks5)
                 {
-                    if (socks5.Auth() && !mode.SupportSocks5Auth)
+                    if (socks5.Auth())
                         UsingPorts.Add(StatusPortInfoText.Socks5Port = controller.Socks5LocalPort());
                 }
                 else
@@ -148,7 +174,7 @@ namespace Netch.Controllers
             return false;
         }
 
-        private static async Task<bool> StartMode(Server server, Mode mode)
+        private static async Task<bool> StartMode(Mode mode)
         {
             ModeController = ModeHelper.GetModeControllerByType(mode.Type, out var port, out var portName, out var portType);
 
@@ -209,7 +235,7 @@ namespace Netch.Controllers
         /// <param name="portName">端口用途名称</param>
         /// <param name="portType"></param>
         /// <exception cref="PortInUseException"></exception>
-        private static void PortCheckAndShowMessageBox(ushort port, string portName, PortType portType = PortType.Both)
+        public static void PortCheckAndShowMessageBox(ushort port, string portName, PortType portType = PortType.Both)
         {
             if (PortInUse(port, portType))
             {

Netch/Controllers/NFController.cs

@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.ServiceProcess;
 using System.Threading.Tasks;
 using Netch.Models;
+using Netch.Servers.Shadowsocks;
 using Netch.Servers.Socks5;
 using Netch.Utils;
 using nfapinet;
@@ -52,11 +55,39 @@ namespace Netch.Controllers
             #region aio_dial
 
             aio_dial((int) NameList.TYPE_FILTERLOOPBACK, "false");
-            aio_dial((int) NameList.TYPE_FILTERTCP, "true");
-            aio_dial((int) NameList.TYPE_FILTERUDP, "true");
             aio_dial((int) NameList.TYPE_TCPLISN, Global.Settings.RedirectorTCPPort.ToString());
 
-            SetServer(MainController.ServerController, PortType.Both);
+            if (Global.Settings.ProcessNoProxyForUdp && Global.Settings.ProcessNoProxyForTcp) MessageBoxX.Show("？");
+
+            //UDP
+            if (Global.Settings.ProcessNoProxyForUdp)
+            {
+                aio_dial((int) NameList.TYPE_FILTERUDP, "false");
+                SetServer(PortType.TCP);
+            }
+            else
+            {
+                aio_dial((int) NameList.TYPE_FILTERUDP, "true");
+                SetServer(PortType.Both);
+            }
+
+            //TCP
+            if (Global.Settings.ProcessNoProxyForTcp)
+            {
+                aio_dial((int) NameList.TYPE_FILTERTCP, "false");
+                SetServer(PortType.UDP);
+            }
+            else
+            {
+                aio_dial((int) NameList.TYPE_FILTERTCP, "true");
+                SetServer(PortType.Both);
+            }
+
+            if (!CheckRule(mode.FullRule, out var list))
+            {
+                MessageBoxX.Show($"\"{string.Join("", list.Select(s => s + "\n"))}\" does not conform to C++ regular expression syntax");
+                return false;
+            }
 
             SetName(mode);
 
@@ -74,6 +105,40 @@ namespace Netch.Controllers
             return aio_init();
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="rules"></param>
+        /// <param name="incompatibleRule"></param>
+        /// <returns>No Problem true</returns>
+        public static bool CheckRule(IEnumerable<string> rules, out IEnumerable<string> incompatibleRule)
+        {
+            incompatibleRule = rules.Where(r => !CheckCppRegex(r, false));
+            aio_dial((int) NameList.TYPE_CLRNAME, "");
+            return !incompatibleRule.Any();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="clear"></param>
+        /// <returns>No Problem true</returns>
+        public static bool CheckCppRegex(string r, bool clear = true)
+        {
+            try
+            {
+                if (r.StartsWith("!"))
+                    return aio_dial((int) NameList.TYPE_ADDNAME, r.Substring(1));
+                return aio_dial((int) NameList.TYPE_ADDNAME, r);
+            }
+            finally
+            {
+                if (clear)
+                    aio_dial((int) NameList.TYPE_CLRNAME, "");
+            }
+        }
+
         private static bool CheckDriver()
         {
             var binFileVersion = Utils.Utils.GetFileVersion(BinDriver);
@@ -134,33 +199,55 @@ namespace Netch.Controllers
             return InstallDriver();
         }
 
-        private void SetServer(in IServerController controller, in PortType portType)
+        private void SetServer(in PortType portType)
         {
             if (portType == PortType.Both)
             {
-                SetServer(controller, PortType.TCP);
-                SetServer(controller, PortType.UDP);
+                SetServer(PortType.TCP);
+                SetServer(PortType.UDP);
                 return;
             }
 
-            var offset = portType == PortType.UDP ? UdpNameListOffset : 0;
+            int offset;
+            Server server;
+            IServerController controller;
 
-            aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Socks5");
-
-            if (controller.Server is Socks5 socks5)
+            if (portType == PortType.UDP)
             {
-                aio_dial((int) NameList.TYPE_TCPHOST + offset, $"{socks5.AutoResolveHostname()}:{socks5.Port}");
-                aio_dial((int) NameList.TYPE_TCPUSER + offset, socks5.Username ?? string.Empty);
-                aio_dial((int) NameList.TYPE_TCPPASS + offset, socks5.Password ?? string.Empty);
+                offset = UdpNameListOffset;
+                server = MainController.UdpServer;
+                controller = MainController.UdpServerController;
             }
             else
             {
+                offset = 0;
+                server = MainController.Server;
+                controller = MainController.ServerController;
+            }
+
+            if (server is Socks5 socks5)
+            {
+                aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Socks5");
+                aio_dial((int) NameList.TYPE_TCPHOST + offset, $"{socks5.AutoResolveHostname()}:{socks5.Port}");
+                aio_dial((int) NameList.TYPE_TCPUSER + offset, socks5.Username ?? string.Empty);
+                aio_dial((int) NameList.TYPE_TCPPASS + offset, socks5.Password ?? string.Empty);
+                aio_dial((int) NameList.TYPE_TCPMETH + offset, string.Empty);
+            }
+            else if (server is Shadowsocks shadowsocks && !shadowsocks.HasPlugin() && Global.Settings.RedirectorSS)
+            {
+                aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Shadowsocks");
+                aio_dial((int) NameList.TYPE_TCPHOST + offset, $"{shadowsocks.AutoResolveHostname()}:{shadowsocks.Port}");
+                aio_dial((int) NameList.TYPE_TCPMETH + offset, shadowsocks.EncryptMethod ?? string.Empty);
+                aio_dial((int) NameList.TYPE_TCPPASS + offset, shadowsocks.Password ?? string.Empty);
+            }
+            else
+            {
+                aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Socks5");
                 aio_dial((int) NameList.TYPE_TCPHOST + offset, $"127.0.0.1:{controller.Socks5LocalPort()}");
                 aio_dial((int) NameList.TYPE_TCPUSER + offset, string.Empty);
                 aio_dial((int) NameList.TYPE_TCPPASS + offset, string.Empty);
+                aio_dial((int) NameList.TYPE_TCPMETH + offset, string.Empty);
             }
-
-            aio_dial((int) NameList.TYPE_TCPMETH + offset, string.Empty);
         }
 
         private void SetName(Mode mode)
@@ -168,10 +255,16 @@ namespace Netch.Controllers
             aio_dial((int) NameList.TYPE_CLRNAME, "");
             foreach (var rule in mode.FullRule)
             {
+                if (rule.StartsWith("!"))
+                {
+                    aio_dial((int) NameList.TYPE_BYPNAME, rule.Substring(1));
+                    continue;
+                }
+
                 aio_dial((int) NameList.TYPE_ADDNAME, rule);
             }
 
-            aio_dial((int) NameList.TYPE_ADDNAME, "NTT.exe");
+            aio_dial((int) NameList.TYPE_ADDNAME, @"NTT\.exe");
         }
 
         public void Stop()
@@ -191,19 +284,19 @@ namespace Netch.Controllers
         private const int UdpNameListOffset = (int) NameList.TYPE_UDPTYPE - (int) NameList.TYPE_TCPTYPE;
 
         [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool aio_dial(int name, [MarshalAs(UnmanagedType.LPWStr)] string value);
+        private static extern bool aio_dial(int name, [MarshalAs(UnmanagedType.LPWStr)] string value);
 
         [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool aio_init();
+        private static extern bool aio_init();
 
         [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool aio_free();
+        private static extern bool aio_free();
 
         [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern ulong aio_getUP();
+        private static extern ulong aio_getUP();
 
         [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern ulong aio_getDL();
+        private static extern ulong aio_getDL();
 
 
         public enum NameList : int

Netch/Controllers/NTTController.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using Netch.Utils;
 
@@ -7,10 +8,6 @@ namespace Netch.Controllers
 {
     public class NTTController : Guard, IController
     {
-        private string _localEnd;
-        private string _publicEnd;
-        private string _result;
-        private string _bindingTest;
         public override string Name { get; protected set; } = "NTT";
         public override string MainFile { get; protected set; } = "NTT.exe";
 
@@ -20,7 +17,10 @@ namespace Netch.Controllers
         /// <returns></returns>
         public (string, string, string) Start()
         {
-            _result = _localEnd = _publicEnd = null;
+            string localEnd=null;
+            string publicEnd=null;
+            string result =null;
+            string bindingTest=null;
 
             try
             {
@@ -28,12 +28,50 @@ namespace Netch.Controllers
                 Instance.OutputDataReceived += OnOutputDataReceived;
                 Instance.ErrorDataReceived += OnOutputDataReceived;
                 Instance.Start();
-                Instance.BeginOutputReadLine();
-                Instance.BeginErrorReadLine();
-                Instance.WaitForExit();
-                if (_bindingTest == "Fail")
-                    _result = "UdpBlocked";
-                return (_result, _localEnd, _publicEnd);
+                var output = Instance.StandardOutput.ReadToEnd();
+                try
+                {
+                    File.WriteAllText(Path.Combine(Global.NetchDir, $"logging\\{Name}.log"), output);
+                }
+                catch (Exception e)
+                {
+                    Logging.Warning($"写入 {Name} 日志错误：\n" + e.Message);
+                }
+
+                foreach (var line in output.Split('\n'))
+                {
+                    var str = line.Split(':').Select(s => s.Trim()).ToArray();
+                    if (str.Length < 2)
+                        continue;
+                    var key = str[0];
+                    var value = str[1];
+                    switch (key)
+                    {
+                        case "Other address is":
+                        case "Nat mapping behavior":
+                        case "Nat filtering behavior":
+                            break;
+                        case "Binding test":
+                            bindingTest = value;
+                            break;
+                        case "Local address":
+                            localEnd = value;
+                            break;
+                        case "Mapped address":
+                            publicEnd = value;
+                            break;
+                        case "result":
+                            result = value;
+                            break;
+                        default:
+                            result = str.Last();
+                            break;
+                    }
+                }
+
+                if (bindingTest == "Fail")
+                    result = "UdpBlocked";
+                return (result, localEnd, publicEnd);
             }
             catch (Exception e)
             {
@@ -51,41 +89,6 @@ namespace Netch.Controllers
             }
         }
 
-
-        private new void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            if (string.IsNullOrEmpty(e.Data)) return;
-            Logging.Info($"[NTT] {e.Data}");
-
-            var str = e.Data.Split(':').Select(s => s.Trim()).ToArray();
-            if (str.Length < 2)
-                return;
-            var key = str[0];
-            var value = str[1];
-            switch (key)
-            {
-                case "Other address is":
-                case "Nat mapping behavior":
-                case "Nat filtering behavior":
-                    break;
-                case "Binding test":
-                    _bindingTest = value;
-                    break;
-                case "Local address":
-                    _localEnd = value;
-                    break;
-                case "Mapped address":
-                    _publicEnd = value;
-                    break;
-                case "result":
-                    _result = value;
-                    break;
-                default:
-                    _result = str.Last();
-                    break;
-            }
-        }
-
         public override void Stop()
         {
             StopInstance();

Netch/Controllers/PrivoxyController.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using Netch.Models;
 using Netch.Servers.Socks5;
+using Netch.Utils.HttpProxyHandler;
 
 namespace Netch.Controllers
 {

Netch/Controllers/TUNTAPController.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using Netch.Models;
 using Netch.Servers.Socks5;
 using Netch.Utils;
@@ -17,9 +15,7 @@ namespace Netch.Controllers
 {
     public class TUNTAPController : Guard, IModeController
     {
-        private Mode _savedMode = new Mode();
-        private Server _savedServer = new Server();
-
+        
         /// <summary>
         ///     服务器 IP 地址
         /// </summary>
@@ -41,11 +37,9 @@ namespace Netch.Controllers
 
         public bool Start(in Mode mode)
         {
-            _savedMode = mode;
-            _savedServer = MainController.ServerController.Server;
-
+            var server = MainController.Server;
             // 查询服务器 IP 地址
-            _serverAddresses = DNS.Lookup(_savedServer.Hostname);
+            _serverAddresses = DNS.Lookup(server.Hostname);
 
             // 查找出口适配器
             if (!Utils.Utils.SearchOutboundAdapter())
@@ -66,7 +60,7 @@ namespace Netch.Controllers
             }
 
 
-            SetupRouteTable();
+            SetupRouteTable(mode);
 
             Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", Name));
 
@@ -85,13 +79,27 @@ namespace Netch.Controllers
             }
             else
             {
-                var _ = DNSController.Start();
+                try
+                {
+                    MainController.PortCheckAndShowMessageBox(53, "DNS");
+                }
+                catch
+                {
+                    return false;
+                }
+
+                if (!DNSController.Start())
+                {
+                    Logging.Error("AioDNS 启动失败");
+                    return false;
+                }
+
                 dns = "127.0.0.1";
             }
 
             var argument = new StringBuilder();
-            if (_savedServer is Socks5 socks5 && !socks5.Auth())
-                argument.Append($"-proxyServer {_serverAddresses}:{_savedServer.Port} ");
+            if (server is Socks5 socks5 && !socks5.Auth())
+                argument.Append($"-proxyServer {server.AutoResolveHostname()}:{server.Port} ");
             else
                 argument.Append($"-proxyServer 127.0.0.1:{Global.Settings.Socks5LocalPort} ");
 
@@ -111,9 +119,9 @@ namespace Netch.Controllers
         {
             var tasks = new[]
             {
-                Task.Factory.StartNew(StopInstance),
-                Task.Factory.StartNew(ClearRouteTable),
-                Task.Factory.StartNew(DNSController.Stop)
+                Task.Run(StopInstance),
+                Task.Run(ClearRouteTable),
+                Task.Run(DNSController.Stop)
             };
             Task.WaitAll(tasks);
         }
@@ -126,73 +134,75 @@ namespace Netch.Controllers
         ///     设置绕行规则
         /// </summary>
         /// <returns>是否设置成功</returns>
-        private void SetupRouteTable()
+        private void SetupRouteTable(Mode mode)
         {
             Global.MainForm.StatusText(i18N.Translate("SetupBypass"));
             Logging.Info("设置路由规则");
 
             #region Rule IPs
 
-            if (_savedMode.Type == 1)
+            switch (mode.Type)
             {
-                // 代理规则
-                Logging.Info("代理 → 规则 IP");
-                RouteAction(Action.Create, _savedMode.FullRule, RouteType.TUNTAP);
+                case 1:
+                    // 代理规则
+                    Logging.Info("代理 → 规则 IP");
+                    RouteAction(Action.Create, mode.FullRule, RouteType.TUNTAP);
 
-                //处理 NAT 类型检测，由于协议的原因，无法仅通过域名确定需要代理的 IP，自己记录解析了返回的 IP，仅支持默认检测服务器
-                if (Global.Settings.STUN_Server == "stun.stunprotocol.org")
-                {
-                    try
+                    //处理 NAT 类型检测，由于协议的原因，无法仅通过域名确定需要代理的 IP，自己记录解析了返回的 IP，仅支持默认检测服务器
+                    if (Global.Settings.STUN_Server == "stun.stunprotocol.org")
                     {
-                        Logging.Info("代理 → STUN 服务器 IP");
-                        RouteAction(Action.Create,
-                            new[]
-                            {
-                                Dns.GetHostAddresses(Global.Settings.STUN_Server)[0],
-                                Dns.GetHostAddresses("stunresponse.coldthunder11.com")[0]
-                            }.Select(ip => $"{ip}/32"),
-                            RouteType.TUNTAP);
+                        try
+                        {
+                            Logging.Info("代理 → STUN 服务器 IP");
+                            RouteAction(Action.Create,
+                                new[]
+                                {
+                                    Dns.GetHostAddresses(Global.Settings.STUN_Server)[0],
+                                    Dns.GetHostAddresses("stunresponse.coldthunder11.com")[0]
+                                }.Select(ip => $"{ip}/32"),
+                                RouteType.TUNTAP);
+                        }
+                        catch
+                        {
+                            Logging.Info("NAT 类型测试域名解析失败，将不会被添加到代理列表");
+                        }
                     }
-                    catch
-                    {
-                        Logging.Info("NAT 类型测试域名解析失败，将不会被添加到代理列表");
-                    }
-                }
 
-                if (Global.Settings.TUNTAP.ProxyDNS)
-                {
-                    Logging.Info("代理 → 自定义 DNS");
-                    if (Global.Settings.TUNTAP.UseCustomDNS)
+                    if (Global.Settings.TUNTAP.ProxyDNS)
                     {
-                        RouteAction(Action.Create,
-                            Global.Settings.TUNTAP.DNS.Select(ip => $"{ip}/32"),
-                            RouteType.TUNTAP);
+                        Logging.Info("代理 → 自定义 DNS");
+                        if (Global.Settings.TUNTAP.UseCustomDNS)
+                        {
+                            RouteAction(Action.Create,
+                                Global.Settings.TUNTAP.DNS.Select(ip => $"{ip}/32"),
+                                RouteType.TUNTAP);
+                        }
+                        else
+                        {
+                            RouteAction(Action.Create,
+                                new[] {"1.1.1.1", "8.8.8.8", "9.9.9.9", "185.222.222.222"}.Select(ip => $"{ip}/32"),
+                                RouteType.TUNTAP);
+                        }
                     }
-                    else
-                    {
-                        RouteAction(Action.Create,
-                            new[] {"1.1.1.1", "8.8.8.8", "9.9.9.9", "185.222.222.222"}.Select(ip => $"{ip}/32"),
-                            RouteType.TUNTAP);
-                    }
-                }
-            }
-            else if (_savedMode.Type == 2)
-            {
-                // 绕过规则
 
-                // 将 TUN/TAP 网卡权重放到最高
-                Process.Start(new ProcessStartInfo
-                    {
-                        FileName = "netsh",
-                        Arguments = $"interface ip set interface {Global.TUNTAP.Index} metric=0",
-                        WindowStyle = ProcessWindowStyle.Hidden,
-                        UseShellExecute = true,
-                        CreateNoWindow = true
-                    }
-                );
+                    break;
+                case 2:
+                    // 绕过规则
 
-                Logging.Info("绕行 → 规则 IP");
-                RouteAction(Action.Create, _savedMode.FullRule, RouteType.Outbound);
+                    // 将 TUN/TAP 网卡权重放到最高
+                    Process.Start(new ProcessStartInfo
+                        {
+                            FileName = "netsh",
+                            Arguments = $"interface ip set interface {Global.TUNTAP.Index} metric=0",
+                            WindowStyle = ProcessWindowStyle.Hidden,
+                            UseShellExecute = true,
+                            CreateNoWindow = true
+                        }
+                    );
+
+                    Logging.Info("绕行 → 规则 IP");
+                    RouteAction(Action.Create, mode.FullRule, RouteType.Outbound);
+                    break;
             }
 
             #endregion
@@ -204,7 +214,7 @@ namespace Netch.Controllers
             Logging.Info("绕行 → 全局绕过 IP");
             RouteAction(Action.Create, Global.Settings.BypassIPs, RouteType.Outbound);
 
-            if (_savedMode.Type == 2)
+            if (mode.Type == 2)
             {
                 // 绕过规则
                 Logging.Info("代理 → 全局");

Netch/Controllers/UpdateChecker.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using Netch.Models.GitHubRelease;
 using Netch.Utils;
@@ -15,14 +16,14 @@ namespace Netch.Controllers
         public const string Name = @"Netch";
         public const string Copyright = @"Copyright © 2019 - 2020";
 
-        public const string AssemblyVersion = @"1.6.7";
+        public const string AssemblyVersion = @"1.7.0";
         private const string Suffix = @"";
 
         public static readonly string Version = $"{AssemblyVersion}{(string.IsNullOrEmpty(Suffix) ? "" : $"-{Suffix}")}";
 
         public string LatestVersionNumber;
         public string LatestVersionUrl;
-        public string LatestVersionDownloadUrl;
+        public Release LatestRelease;
 
         public event EventHandler NewVersionFound;
         public event EventHandler NewVersionFoundFailed;
@@ -38,12 +39,11 @@ namespace Netch.Controllers
                 var json = await WebUtil.DownloadStringAsync(WebUtil.CreateRequest(url));
 
                 var releases = JsonConvert.DeserializeObject<List<Release>>(json);
-                var latestRelease = VersionUtil.GetLatestRelease(releases, isPreRelease);
-                LatestVersionNumber = latestRelease.tag_name;
-                LatestVersionUrl = latestRelease.html_url;
-                LatestVersionDownloadUrl = latestRelease.assets[0].browser_download_url;
-                Logging.Info($"Github 最新发布版本: {latestRelease.tag_name}");
-                if (VersionUtil.CompareVersion(latestRelease.tag_name, Version) > 0)
+                LatestRelease = VersionUtil.GetLatestRelease(releases, isPreRelease);
+                LatestVersionNumber = LatestRelease.tag_name;
+                LatestVersionUrl = LatestRelease.html_url;
+                Logging.Info($"Github 最新发布版本: {LatestRelease.tag_name}");
+                if (VersionUtil.CompareVersion(LatestRelease.tag_name, Version) > 0)
                 {
                     Logging.Info("发现新版本");
                     NewVersionFound?.Invoke(this, new EventArgs());

Netch/Forms/MainForm.Designer.cs

@@ -87,6 +87,7 @@
             this.ProfileTable = new System.Windows.Forms.TableLayoutPanel();
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
             this.ButtomControlContainerControl = new System.Windows.Forms.ContainerControl();
+            this.updatePACToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.MenuStrip.SuspendLayout();
             this.ConfigurationGroupBox.SuspendLayout();
             this.configLayoutPanel.SuspendLayout();
@@ -196,6 +197,7 @@
             this.CleanDNSCacheToolStripMenuItem,
             this.UpdateACLToolStripMenuItem,
             this.updateACLWithProxyToolStripMenuItem,
+            this.updatePACToolStripMenuItem,
             this.UninstallServiceToolStripMenuItem,
             this.UninstallTapDriverToolStripMenuItem});
             this.OptionsToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
@@ -441,6 +443,7 @@
             this.EditServerPictureBox.Location = new System.Drawing.Point(3, 3);
             this.EditServerPictureBox.Name = "EditServerPictureBox";
             this.EditServerPictureBox.Size = new System.Drawing.Size(16, 16);
+            this.EditServerPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.EditServerPictureBox.TabIndex = 7;
             this.EditServerPictureBox.TabStop = false;
             this.EditServerPictureBox.Click += new System.EventHandler(this.EditServerPictureBox_Click);
@@ -452,6 +455,7 @@
             this.CopyLinkPictureBox.Location = new System.Drawing.Point(72, 3);
             this.CopyLinkPictureBox.Name = "CopyLinkPictureBox";
             this.CopyLinkPictureBox.Size = new System.Drawing.Size(18, 18);
+            this.CopyLinkPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.CopyLinkPictureBox.TabIndex = 14;
             this.CopyLinkPictureBox.TabStop = false;
             this.CopyLinkPictureBox.Click += new System.EventHandler(this.CopyLinkPictureBox_Click);
@@ -463,6 +467,7 @@
             this.DeleteServerPictureBox.Location = new System.Drawing.Point(26, 3);
             this.DeleteServerPictureBox.Name = "DeleteServerPictureBox";
             this.DeleteServerPictureBox.Size = new System.Drawing.Size(16, 16);
+            this.DeleteServerPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.DeleteServerPictureBox.TabIndex = 8;
             this.DeleteServerPictureBox.TabStop = false;
             this.DeleteServerPictureBox.Click += new System.EventHandler(this.DeleteServerPictureBox_Click);
@@ -474,6 +479,7 @@
             this.SpeedPictureBox.Location = new System.Drawing.Point(49, 3);
             this.SpeedPictureBox.Name = "SpeedPictureBox";
             this.SpeedPictureBox.Size = new System.Drawing.Size(16, 16);
+            this.SpeedPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.SpeedPictureBox.TabIndex = 9;
             this.SpeedPictureBox.TabStop = false;
             this.SpeedPictureBox.Click += new System.EventHandler(this.SpeedPictureBox_Click);
@@ -501,6 +507,7 @@
             this.EditModePictureBox.Location = new System.Drawing.Point(3, 3);
             this.EditModePictureBox.Name = "EditModePictureBox";
             this.EditModePictureBox.Size = new System.Drawing.Size(16, 16);
+            this.EditModePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.EditModePictureBox.TabIndex = 12;
             this.EditModePictureBox.TabStop = false;
             this.EditModePictureBox.Click += new System.EventHandler(this.EditModePictureBox_Click);
@@ -512,6 +519,7 @@
             this.DeleteModePictureBox.Location = new System.Drawing.Point(26, 3);
             this.DeleteModePictureBox.Name = "DeleteModePictureBox";
             this.DeleteModePictureBox.Size = new System.Drawing.Size(16, 16);
+            this.DeleteModePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.DeleteModePictureBox.TabIndex = 13;
             this.DeleteModePictureBox.TabStop = false;
             this.DeleteModePictureBox.Click += new System.EventHandler(this.DeleteModePictureBox_Click);
@@ -691,6 +699,13 @@
             this.ButtomControlContainerControl.TabStop = false;
             this.ButtomControlContainerControl.Text = "groupBox1";
             // 
+            // updatePACToolStripMenuItem
+            // 
+            this.updatePACToolStripMenuItem.Name = "updatePACToolStripMenuItem";
+            this.updatePACToolStripMenuItem.Size = new System.Drawing.Size(220, 22);
+            this.updatePACToolStripMenuItem.Text = "Update PAC";
+            this.updatePACToolStripMenuItem.Click += new System.EventHandler(this.updatePACToolStripMenuItem_Click);
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -797,5 +812,6 @@
 
         private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
         private System.Windows.Forms.ContainerControl ButtomControlContainerControl;
+        private System.Windows.Forms.ToolStripMenuItem updatePACToolStripMenuItem;
     }
 }

Netch/Forms/MainForm.MenuStrip.cs

@@ -3,12 +3,16 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Netch.Controllers;
 using Netch.Forms.Mode;
 using Netch.Models;
+using Netch.Properties;
 using Netch.Utils;
+using Netch.Utils.HttpProxyHandler;
+using Newtonsoft.Json;
 
 namespace Netch.Forms
 {
@@ -274,6 +278,39 @@ namespace Netch.Forms
             }
         }
 
+        private async void updatePACToolStripMenuItem_Click(object sender, EventArgs eventArgs)
+        {
+            Enabled = false;
+
+            NotifyTip(i18N.Translate("Updating in the background"));
+            try
+            {
+                var req = WebUtil.CreateRequest(Global.Settings.GFWLIST);
+
+                string gfwlist = Path.Combine(Global.NetchDir, $"bin\\gfwlist");
+                string pac = Path.Combine(Global.NetchDir, $"bin\\pac.txt");
+
+                await WebUtil.DownloadFileAsync(req, gfwlist);
+                
+                var gfwContent = File.ReadAllText(gfwlist);
+                List<string> lines = PACUtil.ParseResult(gfwContent);
+                string abpContent = PACUtil.UnGzip(Resources.abp_js);
+                abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented));
+                File.WriteAllText(pac, abpContent, Encoding.UTF8);
+                
+                NotifyTip(i18N.Translate("PAC updated successfully"));
+            }
+            catch (Exception e)
+            {
+                NotifyTip(i18N.Translate("PAC update failed") + "\n" + e.Message, info: false);
+                Logging.Error("更新 PAC 失败！" + e);
+            }
+            finally
+            {
+                Enabled = true;
+            }
+        }
+
         private async void UninstallServiceToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Enabled = false;

Netch/Forms/MainForm.Misc.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Netch.Controllers;
@@ -36,7 +37,7 @@ namespace Netch.Forms
 
         private async void NewVersionLabel_Click(object sender, EventArgs e)
         {
-            if (!_updater.LatestVersionDownloadUrl.Contains("Netch"))
+            if (!_updater.LatestRelease.assets.Any())
             {
                 Utils.Utils.Open(_updater.LatestVersionUrl);
                 return;
@@ -46,11 +47,12 @@ namespace Netch.Forms
                 return;
             NotifyTip(i18N.Translate("Start downloading new version"));
 
+            var latestVersionDownloadUrl = _updater.LatestRelease.assets[0].browser_download_url;
             var tagPage = await WebUtil.DownloadStringAsync(WebUtil.CreateRequest(_updater.LatestVersionUrl));
             var match = Regex.Match(tagPage, @"<td .*>(?<sha256>.*)</td>", RegexOptions.Singleline);
 
             // TODO Replace with regex get basename and sha256 
-            var fileName = Path.GetFileName(new Uri(_updater.LatestVersionDownloadUrl).LocalPath);
+            var fileName = Path.GetFileName(new Uri(latestVersionDownloadUrl).LocalPath);
             fileName = fileName.Insert(fileName.LastIndexOf('.'), _updater.LatestVersionNumber);
             var fileFullPath = Path.Combine(Global.NetchDir, "data", fileName);
 
@@ -70,7 +72,7 @@ namespace Netch.Forms
                 }
 
                 // TODO Replace "New Version Found" to Progress bar
-                await WebUtil.DownloadFileAsync(WebUtil.CreateRequest(_updater.LatestVersionDownloadUrl), fileFullPath);
+                await WebUtil.DownloadFileAsync(WebUtil.CreateRequest(latestVersionDownloadUrl), fileFullPath);
 
                 if (Utils.Utils.SHA256CheckSum(fileFullPath) != sha256)
                 {

Netch/Forms/MainForm.cs

@@ -294,6 +294,8 @@ namespace Netch.Forms
 
         #region MISC
 
+        private bool _resumeFlag;
+
         /// <summary>
         /// 监听电源事件，自动重启Netch服务
         /// </summary>
@@ -301,20 +303,24 @@ namespace Netch.Forms
         /// <param name="e"></param>
         private void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
         {
-            //不对Netch命令等待状态的电源事件做任何处理
-            if (!State.Equals(State.Waiting))
+            switch (e.Mode)
             {
-                switch (e.Mode)
-                {
-                    case PowerModes.Suspend: //操作系统即将挂起
-                        Logging.Info("操作系统即将挂起，自动停止===>" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+                case PowerModes.Suspend: //操作系统即将挂起
+                    if (!IsWaiting)
+                    {
+                        _resumeFlag = true;
+                        Logging.Info("操作系统即将挂起，自动停止");
                         ControlFun();
-                        break;
-                    case PowerModes.Resume: //操作系统即将从挂起状态继续
-                        Logging.Info("操作系统即将从挂起状态继续，自动重启===>" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+                    }
+                    break;
+                case PowerModes.Resume: //操作系统即将从挂起状态继续
+                    if (_resumeFlag)
+                    {
+                        _resumeFlag = false;
+                        Logging.Info("操作系统即将从挂起状态继续，自动重启");
                         ControlFun();
-                        break;
-                }
+                    }
+                    break;
             }
         }
 
@@ -360,21 +366,23 @@ namespace Netch.Forms
                 return;
             }
 
-            var selectedMode = (Models.Mode) ModeComboBox.SelectedItem;
-            switch (selectedMode.Type)
+            var mode = (Models.Mode) ModeComboBox.SelectedItem;
+            if (ModifierKeys == Keys.Control)
+            {
+                Utils.Utils.Open(ModeHelper.GetFullPath(mode.RelativePath));
+                return;
+            }
+
+            switch (mode.Type)
             {
                 case 0:
-                {
                     Hide();
-                    new Process(selectedMode).ShowDialog();
+                    new Process(mode).ShowDialog();
                     Show();
                     break;
-                }
                 default:
-                {
-                    MessageBoxX.Show($"Current not support editing {selectedMode.TypeToString()} Mode");
+                    Utils.Utils.Open(ModeHelper.GetFullPath(mode.RelativePath));
                     break;
-                }
             }
         }
 
@@ -448,7 +456,7 @@ namespace Netch.Forms
             if (WindowState == FormWindowState.Minimized)
             {
                 Visible = true;
-                ShowInTaskbar = true; // 显示在系统任务栏 
+                ShowInTaskbar = true;                 // 显示在系统任务栏 
                 WindowState = FormWindowState.Normal; // 还原窗体 
             }
 
@@ -465,7 +473,7 @@ namespace Netch.Forms
             if (WindowState == FormWindowState.Minimized)
             {
                 Visible = true;
-                ShowInTaskbar = true; //显示在系统任务栏 
+                ShowInTaskbar = true;                 //显示在系统任务栏 
                 WindowState = FormWindowState.Normal; //还原窗体
             }
 

Netch/Forms/Mode/Process.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Microsoft.WindowsAPICodePack.Dialogs;
+using Netch.Controllers;
 using Netch.Utils;
 
 namespace Netch.Forms.Mode
@@ -139,23 +140,28 @@ namespace Netch.Forms.Mode
         {
             await Task.Run(() =>
             {
-                if (!string.IsNullOrWhiteSpace(ProcessNameTextBox.Text))
-                {
-                    var process = ProcessNameTextBox.Text;
-
-                    if (!RuleListBox.Items.Contains(process))
-                    {
-                        RuleListBox.Items.Add(process);
-                    }
-
-                    Edited = true;
-                    RuleListBox.SelectedIndex = RuleListBox.Items.IndexOf(process);
-                    ProcessNameTextBox.Text = string.Empty;
-                }
-                else
+                if (string.IsNullOrWhiteSpace(ProcessNameTextBox.Text))
                 {
                     MessageBoxX.Show(i18N.Translate("Please enter an process name (xxx.exe)"));
+                    return;
                 }
+
+                if (!NFController.CheckCppRegex(ProcessNameTextBox.Text))
+                {
+                    MessageBoxX.Show("Rule does not conform to C++ regular expression syntax");
+                    return;
+                }
+
+                var process = ProcessNameTextBox.Text;
+
+                if (!RuleListBox.Items.Contains(process))
+                {
+                    RuleListBox.Items.Add(process);
+                }
+
+                Edited = true;
+                RuleListBox.SelectedIndex = RuleListBox.Items.IndexOf(process);
+                ProcessNameTextBox.Text = string.Empty;
             });
         }
 

Netch/Forms/SettingForm.Designer.cs

@@ -34,6 +34,9 @@ namespace Netch.Forms
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingForm));
             this.TabControl = new System.Windows.Forms.TabControl();
             this.GeneralTabPage = new System.Windows.Forms.TabPage();
+            this.ServerPingTypeLabel = new System.Windows.Forms.Label();
+            this.TCPingRadioBtn = new System.Windows.Forms.RadioButton();
+            this.ICMPingRadioBtn = new System.Windows.Forms.RadioButton();
             this.PortGroupBox = new System.Windows.Forms.GroupBox();
             this.Socks5PortLabel = new System.Windows.Forms.Label();
             this.Socks5PortTextBox = new System.Windows.Forms.TextBox();
@@ -56,9 +59,12 @@ namespace Netch.Forms
             this.LanguageLabel = new System.Windows.Forms.Label();
             this.LanguageComboBox = new System.Windows.Forms.ComboBox();
             this.NFTabPage = new System.Windows.Forms.TabPage();
+            this.NoProxyForTcpCheckBox = new System.Windows.Forms.CheckBox();
+            this.NoProxyForUdpCheckBox = new System.Windows.Forms.CheckBox();
             this.ModifySystemDNSCheckBox = new System.Windows.Forms.CheckBox();
             this.ModifiedDNSLabel = new System.Windows.Forms.Label();
             this.ModifiedDNSTextBox = new System.Windows.Forms.TextBox();
+            this.RedirectorSSCheckBox = new System.Windows.Forms.CheckBox();
             this.TAPTabPage = new System.Windows.Forms.TabPage();
             this.TUNTAPGroupBox = new System.Windows.Forms.GroupBox();
             this.TUNTAPAddressLabel = new System.Windows.Forms.Label();
@@ -140,6 +146,9 @@ namespace Netch.Forms
             // GeneralTabPage
             // 
             this.GeneralTabPage.BackColor = System.Drawing.SystemColors.ButtonFace;
+            this.GeneralTabPage.Controls.Add(this.ServerPingTypeLabel);
+            this.GeneralTabPage.Controls.Add(this.TCPingRadioBtn);
+            this.GeneralTabPage.Controls.Add(this.ICMPingRadioBtn);
             this.GeneralTabPage.Controls.Add(this.PortGroupBox);
             this.GeneralTabPage.Controls.Add(this.BootShadowsocksFromDLLCheckBox);
             this.GeneralTabPage.Controls.Add(this.ResolveServerHostnameCheckBox);
@@ -154,13 +163,46 @@ namespace Netch.Forms
             this.GeneralTabPage.Controls.Add(this.AclAddrTextBox);
             this.GeneralTabPage.Controls.Add(this.LanguageLabel);
             this.GeneralTabPage.Controls.Add(this.LanguageComboBox);
-            this.GeneralTabPage.Location = new System.Drawing.Point(4, 29);
+            this.GeneralTabPage.Location = new System.Drawing.Point(4, 25);
             this.GeneralTabPage.Name = "GeneralTabPage";
             this.GeneralTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.GeneralTabPage.Size = new System.Drawing.Size(461, 321);
+            this.GeneralTabPage.Size = new System.Drawing.Size(461, 325);
             this.GeneralTabPage.TabIndex = 0;
             this.GeneralTabPage.Text = "General";
             // 
+            // ServerPingTypeLabel
+            // 
+            this.ServerPingTypeLabel.AutoSize = true;
+            this.ServerPingTypeLabel.Location = new System.Drawing.Point(217, 160);
+            this.ServerPingTypeLabel.Name = "ServerPingTypeLabel";
+            this.ServerPingTypeLabel.Size = new System.Drawing.Size(89, 12);
+            this.ServerPingTypeLabel.TabIndex = 16;
+            this.ServerPingTypeLabel.Text = "ServerPingType";
+            // 
+            // TCPingRadioBtn
+            // 
+            this.TCPingRadioBtn.AutoSize = true;
+            this.TCPingRadioBtn.Location = new System.Drawing.Point(376, 158);
+            this.TCPingRadioBtn.Name = "TCPingRadioBtn";
+            this.TCPingRadioBtn.Size = new System.Drawing.Size(59, 16);
+            this.TCPingRadioBtn.TabIndex = 15;
+            this.TCPingRadioBtn.TabStop = true;
+            this.TCPingRadioBtn.Text = "TCPing";
+            this.TCPingRadioBtn.UseVisualStyleBackColor = true;
+            this.TCPingRadioBtn.CheckedChanged += new System.EventHandler(this.TCPingRadioBtn_CheckedChanged);
+            // 
+            // ICMPingRadioBtn
+            // 
+            this.ICMPingRadioBtn.AutoSize = true;
+            this.ICMPingRadioBtn.Location = new System.Drawing.Point(312, 158);
+            this.ICMPingRadioBtn.Name = "ICMPingRadioBtn";
+            this.ICMPingRadioBtn.Size = new System.Drawing.Size(65, 16);
+            this.ICMPingRadioBtn.TabIndex = 14;
+            this.ICMPingRadioBtn.TabStop = true;
+            this.ICMPingRadioBtn.Text = "ICMPing";
+            this.ICMPingRadioBtn.UseVisualStyleBackColor = true;
+            this.ICMPingRadioBtn.CheckedChanged += new System.EventHandler(this.ICMPingRadioBtn_CheckedChanged);
+            // 
             // PortGroupBox
             // 
             this.PortGroupBox.Controls.Add(this.Socks5PortLabel);
@@ -182,7 +224,7 @@ namespace Netch.Forms
             this.Socks5PortLabel.AutoSize = true;
             this.Socks5PortLabel.Location = new System.Drawing.Point(9, 25);
             this.Socks5PortLabel.Name = "Socks5PortLabel";
-            this.Socks5PortLabel.Size = new System.Drawing.Size(49, 17);
+            this.Socks5PortLabel.Size = new System.Drawing.Size(41, 12);
             this.Socks5PortLabel.TabIndex = 0;
             this.Socks5PortLabel.Text = "Socks5";
             // 
@@ -190,7 +232,7 @@ namespace Netch.Forms
             // 
             this.Socks5PortTextBox.Location = new System.Drawing.Point(120, 22);
             this.Socks5PortTextBox.Name = "Socks5PortTextBox";
-            this.Socks5PortTextBox.Size = new System.Drawing.Size(90, 23);
+            this.Socks5PortTextBox.Size = new System.Drawing.Size(90, 21);
             this.Socks5PortTextBox.TabIndex = 1;
             this.Socks5PortTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -199,7 +241,7 @@ namespace Netch.Forms
             this.HTTPPortLabel.AutoSize = true;
             this.HTTPPortLabel.Location = new System.Drawing.Point(9, 54);
             this.HTTPPortLabel.Name = "HTTPPortLabel";
-            this.HTTPPortLabel.Size = new System.Drawing.Size(38, 17);
+            this.HTTPPortLabel.Size = new System.Drawing.Size(29, 12);
             this.HTTPPortLabel.TabIndex = 2;
             this.HTTPPortLabel.Text = "HTTP";
             // 
@@ -207,7 +249,7 @@ namespace Netch.Forms
             // 
             this.HTTPPortTextBox.Location = new System.Drawing.Point(120, 51);
             this.HTTPPortTextBox.Name = "HTTPPortTextBox";
-            this.HTTPPortTextBox.Size = new System.Drawing.Size(90, 23);
+            this.HTTPPortTextBox.Size = new System.Drawing.Size(90, 21);
             this.HTTPPortTextBox.TabIndex = 3;
             this.HTTPPortTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -216,7 +258,7 @@ namespace Netch.Forms
             this.RedirectorLabel.AutoSize = true;
             this.RedirectorLabel.Location = new System.Drawing.Point(9, 83);
             this.RedirectorLabel.Name = "RedirectorLabel";
-            this.RedirectorLabel.Size = new System.Drawing.Size(95, 17);
+            this.RedirectorLabel.Size = new System.Drawing.Size(89, 12);
             this.RedirectorLabel.TabIndex = 4;
             this.RedirectorLabel.Text = "Redirector TCP";
             // 
@@ -224,7 +266,7 @@ namespace Netch.Forms
             // 
             this.RedirectorTextBox.Location = new System.Drawing.Point(120, 80);
             this.RedirectorTextBox.Name = "RedirectorTextBox";
-            this.RedirectorTextBox.Size = new System.Drawing.Size(90, 23);
+            this.RedirectorTextBox.Size = new System.Drawing.Size(90, 21);
             this.RedirectorTextBox.TabIndex = 5;
             this.RedirectorTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -233,7 +275,7 @@ namespace Netch.Forms
             this.AllowDevicesCheckBox.AutoSize = true;
             this.AllowDevicesCheckBox.Location = new System.Drawing.Point(6, 107);
             this.AllowDevicesCheckBox.Name = "AllowDevicesCheckBox";
-            this.AllowDevicesCheckBox.Size = new System.Drawing.Size(206, 21);
+            this.AllowDevicesCheckBox.Size = new System.Drawing.Size(204, 16);
             this.AllowDevicesCheckBox.TabIndex = 6;
             this.AllowDevicesCheckBox.Text = "Allow other Devices to connect";
             this.AllowDevicesCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -244,7 +286,7 @@ namespace Netch.Forms
             this.BootShadowsocksFromDLLCheckBox.AutoSize = true;
             this.BootShadowsocksFromDLLCheckBox.Location = new System.Drawing.Point(267, 15);
             this.BootShadowsocksFromDLLCheckBox.Name = "BootShadowsocksFromDLLCheckBox";
-            this.BootShadowsocksFromDLLCheckBox.Size = new System.Drawing.Size(66, 21);
+            this.BootShadowsocksFromDLLCheckBox.Size = new System.Drawing.Size(60, 16);
             this.BootShadowsocksFromDLLCheckBox.TabIndex = 1;
             this.BootShadowsocksFromDLLCheckBox.Text = "SS DLL";
             this.BootShadowsocksFromDLLCheckBox.UseVisualStyleBackColor = true;
@@ -252,9 +294,9 @@ namespace Netch.Forms
             // ResolveServerHostnameCheckBox
             // 
             this.ResolveServerHostnameCheckBox.AutoSize = true;
-            this.ResolveServerHostnameCheckBox.Location = new System.Drawing.Point(266, 42);
+            this.ResolveServerHostnameCheckBox.Location = new System.Drawing.Point(267, 37);
             this.ResolveServerHostnameCheckBox.Name = "ResolveServerHostnameCheckBox";
-            this.ResolveServerHostnameCheckBox.Size = new System.Drawing.Size(176, 21);
+            this.ResolveServerHostnameCheckBox.Size = new System.Drawing.Size(162, 16);
             this.ResolveServerHostnameCheckBox.TabIndex = 2;
             this.ResolveServerHostnameCheckBox.Text = "Resolve Server Hostname";
             this.ResolveServerHostnameCheckBox.UseVisualStyleBackColor = true;
@@ -264,7 +306,7 @@ namespace Netch.Forms
             this.ProfileCountLabel.AutoSize = true;
             this.ProfileCountLabel.Location = new System.Drawing.Point(12, 160);
             this.ProfileCountLabel.Name = "ProfileCountLabel";
-            this.ProfileCountLabel.Size = new System.Drawing.Size(79, 17);
+            this.ProfileCountLabel.Size = new System.Drawing.Size(77, 12);
             this.ProfileCountLabel.TabIndex = 3;
             this.ProfileCountLabel.Text = "ProfileCount";
             // 
@@ -272,7 +314,7 @@ namespace Netch.Forms
             // 
             this.ProfileCountTextBox.Location = new System.Drawing.Point(120, 157);
             this.ProfileCountTextBox.Name = "ProfileCountTextBox";
-            this.ProfileCountTextBox.Size = new System.Drawing.Size(90, 23);
+            this.ProfileCountTextBox.Size = new System.Drawing.Size(90, 21);
             this.ProfileCountTextBox.TabIndex = 4;
             this.ProfileCountTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -281,7 +323,7 @@ namespace Netch.Forms
             this.TcpingAtStartedCheckBox.AutoSize = true;
             this.TcpingAtStartedCheckBox.Location = new System.Drawing.Point(15, 186);
             this.TcpingAtStartedCheckBox.Name = "TcpingAtStartedCheckBox";
-            this.TcpingAtStartedCheckBox.Size = new System.Drawing.Size(145, 21);
+            this.TcpingAtStartedCheckBox.Size = new System.Drawing.Size(156, 16);
             this.TcpingAtStartedCheckBox.TabIndex = 5;
             this.TcpingAtStartedCheckBox.Text = "Delay test after start";
             this.TcpingAtStartedCheckBox.UseVisualStyleBackColor = true;
@@ -289,9 +331,9 @@ namespace Netch.Forms
             // DetectionIntervalLabel
             // 
             this.DetectionIntervalLabel.AutoSize = true;
-            this.DetectionIntervalLabel.Location = new System.Drawing.Point(228, 187);
+            this.DetectionIntervalLabel.Location = new System.Drawing.Point(217, 187);
             this.DetectionIntervalLabel.Name = "DetectionIntervalLabel";
-            this.DetectionIntervalLabel.Size = new System.Drawing.Size(136, 17);
+            this.DetectionIntervalLabel.Size = new System.Drawing.Size(143, 12);
             this.DetectionIntervalLabel.TabIndex = 6;
             this.DetectionIntervalLabel.Text = "Detection interval(sec)";
             // 
@@ -299,7 +341,7 @@ namespace Netch.Forms
             // 
             this.DetectionIntervalTextBox.Location = new System.Drawing.Point(366, 184);
             this.DetectionIntervalTextBox.Name = "DetectionIntervalTextBox";
-            this.DetectionIntervalTextBox.Size = new System.Drawing.Size(68, 23);
+            this.DetectionIntervalTextBox.Size = new System.Drawing.Size(68, 21);
             this.DetectionIntervalTextBox.TabIndex = 7;
             this.DetectionIntervalTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -308,7 +350,7 @@ namespace Netch.Forms
             this.STUNServerLabel.AutoSize = true;
             this.STUNServerLabel.Location = new System.Drawing.Point(12, 216);
             this.STUNServerLabel.Name = "STUNServerLabel";
-            this.STUNServerLabel.Size = new System.Drawing.Size(82, 17);
+            this.STUNServerLabel.Size = new System.Drawing.Size(71, 12);
             this.STUNServerLabel.TabIndex = 8;
             this.STUNServerLabel.Text = "STUN Server";
             // 
@@ -317,7 +359,7 @@ namespace Netch.Forms
             this.STUN_ServerComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
             this.STUN_ServerComboBox.Location = new System.Drawing.Point(120, 213);
             this.STUN_ServerComboBox.Name = "STUN_ServerComboBox";
-            this.STUN_ServerComboBox.Size = new System.Drawing.Size(314, 25);
+            this.STUN_ServerComboBox.Size = new System.Drawing.Size(314, 20);
             this.STUN_ServerComboBox.TabIndex = 9;
             // 
             // AclLabel
@@ -325,7 +367,7 @@ namespace Netch.Forms
             this.AclLabel.AutoSize = true;
             this.AclLabel.Location = new System.Drawing.Point(12, 248);
             this.AclLabel.Name = "AclLabel";
-            this.AclLabel.Size = new System.Drawing.Size(78, 17);
+            this.AclLabel.Size = new System.Drawing.Size(65, 12);
             this.AclLabel.TabIndex = 10;
             this.AclLabel.Text = "Custom ACL";
             // 
@@ -333,7 +375,7 @@ namespace Netch.Forms
             // 
             this.AclAddrTextBox.Location = new System.Drawing.Point(120, 245);
             this.AclAddrTextBox.Name = "AclAddrTextBox";
-            this.AclAddrTextBox.Size = new System.Drawing.Size(315, 23);
+            this.AclAddrTextBox.Size = new System.Drawing.Size(315, 21);
             this.AclAddrTextBox.TabIndex = 11;
             this.AclAddrTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -342,7 +384,7 @@ namespace Netch.Forms
             this.LanguageLabel.AutoSize = true;
             this.LanguageLabel.Location = new System.Drawing.Point(12, 277);
             this.LanguageLabel.Name = "LanguageLabel";
-            this.LanguageLabel.Size = new System.Drawing.Size(65, 17);
+            this.LanguageLabel.Size = new System.Drawing.Size(53, 12);
             this.LanguageLabel.TabIndex = 12;
             this.LanguageLabel.Text = "Language";
             // 
@@ -352,28 +394,53 @@ namespace Netch.Forms
             this.LanguageComboBox.FormattingEnabled = true;
             this.LanguageComboBox.Location = new System.Drawing.Point(120, 274);
             this.LanguageComboBox.Name = "LanguageComboBox";
-            this.LanguageComboBox.Size = new System.Drawing.Size(121, 25);
+            this.LanguageComboBox.Size = new System.Drawing.Size(121, 20);
             this.LanguageComboBox.TabIndex = 13;
             // 
             // NFTabPage
             // 
             this.NFTabPage.BackColor = System.Drawing.SystemColors.ButtonFace;
+            this.NFTabPage.Controls.Add(this.NoProxyForTcpCheckBox);
+            this.NFTabPage.Controls.Add(this.NoProxyForUdpCheckBox);
             this.NFTabPage.Controls.Add(this.ModifySystemDNSCheckBox);
             this.NFTabPage.Controls.Add(this.ModifiedDNSLabel);
             this.NFTabPage.Controls.Add(this.ModifiedDNSTextBox);
-            this.NFTabPage.Location = new System.Drawing.Point(4, 29);
+            this.NFTabPage.Controls.Add(this.RedirectorSSCheckBox);
+            this.NFTabPage.Location = new System.Drawing.Point(4, 25);
             this.NFTabPage.Name = "NFTabPage";
             this.NFTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.NFTabPage.Size = new System.Drawing.Size(461, 321);
+            this.NFTabPage.Size = new System.Drawing.Size(461, 325);
             this.NFTabPage.TabIndex = 1;
             this.NFTabPage.Text = "Process Mode";
             // 
+            // NoProxyForTcpCheckBox
+            // 
+            this.NoProxyForTcpCheckBox.AutoSize = true;
+            this.NoProxyForTcpCheckBox.Location = new System.Drawing.Point(8, 82);
+            this.NoProxyForTcpCheckBox.Name = "NoProxyForTcpCheckBox";
+            this.NoProxyForTcpCheckBox.Size = new System.Drawing.Size(120, 16);
+            this.NoProxyForTcpCheckBox.TabIndex = 4;
+            this.NoProxyForTcpCheckBox.Text = "No Proxy for Tcp";
+            this.NoProxyForTcpCheckBox.UseVisualStyleBackColor = true;
+            this.NoProxyForTcpCheckBox.CheckedChanged += new System.EventHandler(this.NoProxyForTcpCheckBox_CheckedChanged);
+            // 
+            // NoProxyForUdpCheckBox
+            // 
+            this.NoProxyForUdpCheckBox.AutoSize = true;
+            this.NoProxyForUdpCheckBox.Location = new System.Drawing.Point(8, 60);
+            this.NoProxyForUdpCheckBox.Name = "NoProxyForUdpCheckBox";
+            this.NoProxyForUdpCheckBox.Size = new System.Drawing.Size(120, 16);
+            this.NoProxyForUdpCheckBox.TabIndex = 3;
+            this.NoProxyForUdpCheckBox.Text = "No Proxy for Udp";
+            this.NoProxyForUdpCheckBox.UseVisualStyleBackColor = true;
+            this.NoProxyForUdpCheckBox.CheckedChanged += new System.EventHandler(this.NoProxyForUdpCheckBox_CheckedChanged);
+            // 
             // ModifySystemDNSCheckBox
             // 
             this.ModifySystemDNSCheckBox.AutoSize = true;
             this.ModifySystemDNSCheckBox.Location = new System.Drawing.Point(8, 16);
             this.ModifySystemDNSCheckBox.Name = "ModifySystemDNSCheckBox";
-            this.ModifySystemDNSCheckBox.Size = new System.Drawing.Size(143, 21);
+            this.ModifySystemDNSCheckBox.Size = new System.Drawing.Size(126, 16);
             this.ModifySystemDNSCheckBox.TabIndex = 0;
             this.ModifySystemDNSCheckBox.Text = "Modify System DNS";
             this.ModifySystemDNSCheckBox.UseVisualStyleBackColor = true;
@@ -382,29 +449,40 @@ namespace Netch.Forms
             // ModifiedDNSLabel
             // 
             this.ModifiedDNSLabel.AutoSize = true;
-            this.ModifiedDNSLabel.Location = new System.Drawing.Point(24, 41);
+            this.ModifiedDNSLabel.Location = new System.Drawing.Point(223, 17);
             this.ModifiedDNSLabel.Name = "ModifiedDNSLabel";
-            this.ModifiedDNSLabel.Size = new System.Drawing.Size(34, 17);
+            this.ModifiedDNSLabel.Size = new System.Drawing.Size(23, 12);
             this.ModifiedDNSLabel.TabIndex = 2;
             this.ModifiedDNSLabel.Text = "DNS";
             // 
             // ModifiedDNSTextBox
             // 
-            this.ModifiedDNSTextBox.Location = new System.Drawing.Point(99, 38);
+            this.ModifiedDNSTextBox.Location = new System.Drawing.Point(264, 14);
             this.ModifiedDNSTextBox.Name = "ModifiedDNSTextBox";
-            this.ModifiedDNSTextBox.Size = new System.Drawing.Size(194, 23);
+            this.ModifiedDNSTextBox.Size = new System.Drawing.Size(194, 21);
             this.ModifiedDNSTextBox.TabIndex = 1;
             this.ModifiedDNSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
+            // RedirectorSSCheckBox
+            // 
+            this.RedirectorSSCheckBox.AutoSize = true;
+            this.RedirectorSSCheckBox.Location = new System.Drawing.Point(8, 38);
+            this.RedirectorSSCheckBox.Name = "RedirectorSSCheckBox";
+            this.RedirectorSSCheckBox.Size = new System.Drawing.Size(102, 16);
+            this.RedirectorSSCheckBox.TabIndex = 0;
+            this.RedirectorSSCheckBox.Text = "Redirector SS";
+            this.RedirectorSSCheckBox.UseVisualStyleBackColor = true;
+            this.RedirectorSSCheckBox.CheckedChanged += new System.EventHandler(this.ModifySystemDNSCheckBox_CheckedChanged);
+            // 
             // TAPTabPage
             // 
             this.TAPTabPage.BackColor = System.Drawing.SystemColors.ButtonFace;
             this.TAPTabPage.Controls.Add(this.TUNTAPGroupBox);
             this.TAPTabPage.Controls.Add(this.GlobalBypassIPsButton);
-            this.TAPTabPage.Location = new System.Drawing.Point(4, 29);
+            this.TAPTabPage.Location = new System.Drawing.Point(4, 25);
             this.TAPTabPage.Name = "TAPTabPage";
             this.TAPTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.TAPTabPage.Size = new System.Drawing.Size(461, 321);
+            this.TAPTabPage.Size = new System.Drawing.Size(461, 325);
             this.TAPTabPage.TabIndex = 2;
             this.TAPTabPage.Text = "TUN/TAP";
             // 
@@ -434,7 +512,7 @@ namespace Netch.Forms
             this.TUNTAPAddressLabel.AutoSize = true;
             this.TUNTAPAddressLabel.Location = new System.Drawing.Point(9, 25);
             this.TUNTAPAddressLabel.Name = "TUNTAPAddressLabel";
-            this.TUNTAPAddressLabel.Size = new System.Drawing.Size(56, 17);
+            this.TUNTAPAddressLabel.Size = new System.Drawing.Size(47, 12);
             this.TUNTAPAddressLabel.TabIndex = 0;
             this.TUNTAPAddressLabel.Text = "Address";
             // 
@@ -442,7 +520,7 @@ namespace Netch.Forms
             // 
             this.TUNTAPAddressTextBox.Location = new System.Drawing.Point(120, 22);
             this.TUNTAPAddressTextBox.Name = "TUNTAPAddressTextBox";
-            this.TUNTAPAddressTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPAddressTextBox.Size = new System.Drawing.Size(294, 21);
             this.TUNTAPAddressTextBox.TabIndex = 1;
             this.TUNTAPAddressTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -451,7 +529,7 @@ namespace Netch.Forms
             this.TUNTAPNetmaskLabel.AutoSize = true;
             this.TUNTAPNetmaskLabel.Location = new System.Drawing.Point(9, 54);
             this.TUNTAPNetmaskLabel.Name = "TUNTAPNetmaskLabel";
-            this.TUNTAPNetmaskLabel.Size = new System.Drawing.Size(60, 17);
+            this.TUNTAPNetmaskLabel.Size = new System.Drawing.Size(47, 12);
             this.TUNTAPNetmaskLabel.TabIndex = 2;
             this.TUNTAPNetmaskLabel.Text = "Netmask";
             // 
@@ -459,7 +537,7 @@ namespace Netch.Forms
             // 
             this.TUNTAPNetmaskTextBox.Location = new System.Drawing.Point(120, 51);
             this.TUNTAPNetmaskTextBox.Name = "TUNTAPNetmaskTextBox";
-            this.TUNTAPNetmaskTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPNetmaskTextBox.Size = new System.Drawing.Size(294, 21);
             this.TUNTAPNetmaskTextBox.TabIndex = 3;
             this.TUNTAPNetmaskTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -468,7 +546,7 @@ namespace Netch.Forms
             this.TUNTAPGatewayLabel.AutoSize = true;
             this.TUNTAPGatewayLabel.Location = new System.Drawing.Point(9, 83);
             this.TUNTAPGatewayLabel.Name = "TUNTAPGatewayLabel";
-            this.TUNTAPGatewayLabel.Size = new System.Drawing.Size(57, 17);
+            this.TUNTAPGatewayLabel.Size = new System.Drawing.Size(47, 12);
             this.TUNTAPGatewayLabel.TabIndex = 4;
             this.TUNTAPGatewayLabel.Text = "Gateway";
             // 
@@ -476,7 +554,7 @@ namespace Netch.Forms
             // 
             this.TUNTAPGatewayTextBox.Location = new System.Drawing.Point(120, 80);
             this.TUNTAPGatewayTextBox.Name = "TUNTAPGatewayTextBox";
-            this.TUNTAPGatewayTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPGatewayTextBox.Size = new System.Drawing.Size(294, 21);
             this.TUNTAPGatewayTextBox.TabIndex = 5;
             this.TUNTAPGatewayTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -485,7 +563,7 @@ namespace Netch.Forms
             this.TUNTAPDNSLabel.AutoSize = true;
             this.TUNTAPDNSLabel.Location = new System.Drawing.Point(9, 112);
             this.TUNTAPDNSLabel.Name = "TUNTAPDNSLabel";
-            this.TUNTAPDNSLabel.Size = new System.Drawing.Size(34, 17);
+            this.TUNTAPDNSLabel.Size = new System.Drawing.Size(23, 12);
             this.TUNTAPDNSLabel.TabIndex = 6;
             this.TUNTAPDNSLabel.Text = "DNS";
             // 
@@ -493,7 +571,7 @@ namespace Netch.Forms
             // 
             this.TUNTAPDNSTextBox.Location = new System.Drawing.Point(120, 110);
             this.TUNTAPDNSTextBox.Name = "TUNTAPDNSTextBox";
-            this.TUNTAPDNSTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPDNSTextBox.Size = new System.Drawing.Size(294, 21);
             this.TUNTAPDNSTextBox.TabIndex = 7;
             this.TUNTAPDNSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -502,7 +580,7 @@ namespace Netch.Forms
             this.UseCustomDNSCheckBox.AutoSize = true;
             this.UseCustomDNSCheckBox.Location = new System.Drawing.Point(10, 139);
             this.UseCustomDNSCheckBox.Name = "UseCustomDNSCheckBox";
-            this.UseCustomDNSCheckBox.Size = new System.Drawing.Size(127, 21);
+            this.UseCustomDNSCheckBox.Size = new System.Drawing.Size(108, 16);
             this.UseCustomDNSCheckBox.TabIndex = 8;
             this.UseCustomDNSCheckBox.Text = "Use Custom DNS";
             this.UseCustomDNSCheckBox.UseVisualStyleBackColor = true;
@@ -513,7 +591,7 @@ namespace Netch.Forms
             this.ProxyDNSCheckBox.AutoSize = true;
             this.ProxyDNSCheckBox.Location = new System.Drawing.Point(261, 139);
             this.ProxyDNSCheckBox.Name = "ProxyDNSCheckBox";
-            this.ProxyDNSCheckBox.Size = new System.Drawing.Size(153, 21);
+            this.ProxyDNSCheckBox.Size = new System.Drawing.Size(138, 16);
             this.ProxyDNSCheckBox.TabIndex = 9;
             this.ProxyDNSCheckBox.Text = "Proxy DNS in Mode 2";
             this.ProxyDNSCheckBox.UseVisualStyleBackColor = true;
@@ -523,7 +601,7 @@ namespace Netch.Forms
             this.UseFakeDNSCheckBox.AutoSize = true;
             this.UseFakeDNSCheckBox.Location = new System.Drawing.Point(10, 160);
             this.UseFakeDNSCheckBox.Name = "UseFakeDNSCheckBox";
-            this.UseFakeDNSCheckBox.Size = new System.Drawing.Size(110, 21);
+            this.UseFakeDNSCheckBox.Size = new System.Drawing.Size(96, 16);
             this.UseFakeDNSCheckBox.TabIndex = 10;
             this.UseFakeDNSCheckBox.Text = "Use Fake DNS";
             this.UseFakeDNSCheckBox.UseVisualStyleBackColor = true;
@@ -535,7 +613,7 @@ namespace Netch.Forms
             this.ICSCheckBox.Enabled = false;
             this.ICSCheckBox.Location = new System.Drawing.Point(261, 160);
             this.ICSCheckBox.Name = "ICSCheckBox";
-            this.ICSCheckBox.Size = new System.Drawing.Size(151, 21);
+            this.ICSCheckBox.Size = new System.Drawing.Size(138, 16);
             this.ICSCheckBox.TabIndex = 11;
             this.ICSCheckBox.Text = "Tap Network Sharing";
             this.ICSCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -558,10 +636,10 @@ namespace Netch.Forms
             this.v2rayTabPage.Controls.Add(this.TLSAllowInsecureCheckBox);
             this.v2rayTabPage.Controls.Add(this.UseMuxCheckBox);
             this.v2rayTabPage.Controls.Add(this.KCPGroupBox);
-            this.v2rayTabPage.Location = new System.Drawing.Point(4, 29);
+            this.v2rayTabPage.Location = new System.Drawing.Point(4, 25);
             this.v2rayTabPage.Name = "v2rayTabPage";
             this.v2rayTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.v2rayTabPage.Size = new System.Drawing.Size(461, 321);
+            this.v2rayTabPage.Size = new System.Drawing.Size(461, 325);
             this.v2rayTabPage.TabIndex = 3;
             this.v2rayTabPage.Text = "V2Ray";
             // 
@@ -570,7 +648,7 @@ namespace Netch.Forms
             this.TLSAllowInsecureCheckBox.AutoSize = true;
             this.TLSAllowInsecureCheckBox.Location = new System.Drawing.Point(6, 15);
             this.TLSAllowInsecureCheckBox.Name = "TLSAllowInsecureCheckBox";
-            this.TLSAllowInsecureCheckBox.Size = new System.Drawing.Size(131, 21);
+            this.TLSAllowInsecureCheckBox.Size = new System.Drawing.Size(126, 16);
             this.TLSAllowInsecureCheckBox.TabIndex = 0;
             this.TLSAllowInsecureCheckBox.Text = "TLS AllowInsecure";
             this.TLSAllowInsecureCheckBox.UseVisualStyleBackColor = true;
@@ -580,7 +658,7 @@ namespace Netch.Forms
             this.UseMuxCheckBox.AutoSize = true;
             this.UseMuxCheckBox.Location = new System.Drawing.Point(148, 15);
             this.UseMuxCheckBox.Name = "UseMuxCheckBox";
-            this.UseMuxCheckBox.Size = new System.Drawing.Size(78, 21);
+            this.UseMuxCheckBox.Size = new System.Drawing.Size(66, 16);
             this.UseMuxCheckBox.TabIndex = 1;
             this.UseMuxCheckBox.Text = "Use Mux";
             this.UseMuxCheckBox.UseVisualStyleBackColor = true;
@@ -612,7 +690,7 @@ namespace Netch.Forms
             this.mtuLabel.AutoSize = true;
             this.mtuLabel.Location = new System.Drawing.Point(6, 26);
             this.mtuLabel.Name = "mtuLabel";
-            this.mtuLabel.Size = new System.Drawing.Size(30, 17);
+            this.mtuLabel.Size = new System.Drawing.Size(23, 12);
             this.mtuLabel.TabIndex = 0;
             this.mtuLabel.Text = "mtu";
             // 
@@ -620,7 +698,7 @@ namespace Netch.Forms
             // 
             this.mtuTextBox.Location = new System.Drawing.Point(103, 17);
             this.mtuTextBox.Name = "mtuTextBox";
-            this.mtuTextBox.Size = new System.Drawing.Size(90, 23);
+            this.mtuTextBox.Size = new System.Drawing.Size(90, 21);
             this.mtuTextBox.TabIndex = 1;
             this.mtuTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -629,7 +707,7 @@ namespace Netch.Forms
             this.ttiLabel.AutoSize = true;
             this.ttiLabel.Location = new System.Drawing.Point(224, 26);
             this.ttiLabel.Name = "ttiLabel";
-            this.ttiLabel.Size = new System.Drawing.Size(19, 17);
+            this.ttiLabel.Size = new System.Drawing.Size(23, 12);
             this.ttiLabel.TabIndex = 2;
             this.ttiLabel.Text = "tti";
             // 
@@ -637,7 +715,7 @@ namespace Netch.Forms
             // 
             this.ttiTextBox.Location = new System.Drawing.Point(331, 17);
             this.ttiTextBox.Name = "ttiTextBox";
-            this.ttiTextBox.Size = new System.Drawing.Size(90, 23);
+            this.ttiTextBox.Size = new System.Drawing.Size(90, 21);
             this.ttiTextBox.TabIndex = 3;
             this.ttiTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -646,7 +724,7 @@ namespace Netch.Forms
             this.uplinkCapacityLabel.AutoSize = true;
             this.uplinkCapacityLabel.Location = new System.Drawing.Point(6, 68);
             this.uplinkCapacityLabel.Name = "uplinkCapacityLabel";
-            this.uplinkCapacityLabel.Size = new System.Drawing.Size(92, 17);
+            this.uplinkCapacityLabel.Size = new System.Drawing.Size(89, 12);
             this.uplinkCapacityLabel.TabIndex = 4;
             this.uplinkCapacityLabel.Text = "uplinkCapacity";
             // 
@@ -654,7 +732,7 @@ namespace Netch.Forms
             // 
             this.uplinkCapacityTextBox.Location = new System.Drawing.Point(103, 59);
             this.uplinkCapacityTextBox.Name = "uplinkCapacityTextBox";
-            this.uplinkCapacityTextBox.Size = new System.Drawing.Size(90, 23);
+            this.uplinkCapacityTextBox.Size = new System.Drawing.Size(90, 21);
             this.uplinkCapacityTextBox.TabIndex = 5;
             this.uplinkCapacityTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -663,7 +741,7 @@ namespace Netch.Forms
             this.downlinkCapacityLabel.AutoSize = true;
             this.downlinkCapacityLabel.Location = new System.Drawing.Point(224, 68);
             this.downlinkCapacityLabel.Name = "downlinkCapacityLabel";
-            this.downlinkCapacityLabel.Size = new System.Drawing.Size(109, 17);
+            this.downlinkCapacityLabel.Size = new System.Drawing.Size(101, 12);
             this.downlinkCapacityLabel.TabIndex = 6;
             this.downlinkCapacityLabel.Text = "downlinkCapacity";
             // 
@@ -671,7 +749,7 @@ namespace Netch.Forms
             // 
             this.downlinkCapacityTextBox.Location = new System.Drawing.Point(331, 65);
             this.downlinkCapacityTextBox.Name = "downlinkCapacityTextBox";
-            this.downlinkCapacityTextBox.Size = new System.Drawing.Size(90, 23);
+            this.downlinkCapacityTextBox.Size = new System.Drawing.Size(90, 21);
             this.downlinkCapacityTextBox.TabIndex = 7;
             this.downlinkCapacityTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -680,7 +758,7 @@ namespace Netch.Forms
             this.readBufferSizeLabel.AutoSize = true;
             this.readBufferSizeLabel.Location = new System.Drawing.Point(6, 109);
             this.readBufferSizeLabel.Name = "readBufferSizeLabel";
-            this.readBufferSizeLabel.Size = new System.Drawing.Size(93, 17);
+            this.readBufferSizeLabel.Size = new System.Drawing.Size(89, 12);
             this.readBufferSizeLabel.TabIndex = 8;
             this.readBufferSizeLabel.Text = "readBufferSize";
             // 
@@ -688,7 +766,7 @@ namespace Netch.Forms
             // 
             this.readBufferSizeTextBox.Location = new System.Drawing.Point(103, 100);
             this.readBufferSizeTextBox.Name = "readBufferSizeTextBox";
-            this.readBufferSizeTextBox.Size = new System.Drawing.Size(90, 23);
+            this.readBufferSizeTextBox.Size = new System.Drawing.Size(90, 21);
             this.readBufferSizeTextBox.TabIndex = 9;
             this.readBufferSizeTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -697,7 +775,7 @@ namespace Netch.Forms
             this.writeBufferSizeLabel.AutoSize = true;
             this.writeBufferSizeLabel.Location = new System.Drawing.Point(224, 109);
             this.writeBufferSizeLabel.Name = "writeBufferSizeLabel";
-            this.writeBufferSizeLabel.Size = new System.Drawing.Size(94, 17);
+            this.writeBufferSizeLabel.Size = new System.Drawing.Size(95, 12);
             this.writeBufferSizeLabel.TabIndex = 10;
             this.writeBufferSizeLabel.Text = "writeBufferSize";
             // 
@@ -705,7 +783,7 @@ namespace Netch.Forms
             // 
             this.writeBufferSizeTextBox.Location = new System.Drawing.Point(331, 106);
             this.writeBufferSizeTextBox.Name = "writeBufferSizeTextBox";
-            this.writeBufferSizeTextBox.Size = new System.Drawing.Size(90, 23);
+            this.writeBufferSizeTextBox.Size = new System.Drawing.Size(90, 21);
             this.writeBufferSizeTextBox.TabIndex = 11;
             this.writeBufferSizeTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -714,7 +792,7 @@ namespace Netch.Forms
             this.congestionCheckBox.AutoSize = true;
             this.congestionCheckBox.Location = new System.Drawing.Point(8, 139);
             this.congestionCheckBox.Name = "congestionCheckBox";
-            this.congestionCheckBox.Size = new System.Drawing.Size(91, 21);
+            this.congestionCheckBox.Size = new System.Drawing.Size(84, 16);
             this.congestionCheckBox.TabIndex = 12;
             this.congestionCheckBox.Text = "congestion";
             this.congestionCheckBox.UseVisualStyleBackColor = true;
@@ -730,10 +808,10 @@ namespace Netch.Forms
             this.OtherTabPage.Controls.Add(this.CheckUpdateWhenOpenedCheckBox);
             this.OtherTabPage.Controls.Add(this.CheckBetaUpdateCheckBox);
             this.OtherTabPage.Controls.Add(this.UpdateSubscribeatWhenOpenedCheckBox);
-            this.OtherTabPage.Location = new System.Drawing.Point(4, 29);
+            this.OtherTabPage.Location = new System.Drawing.Point(4, 25);
             this.OtherTabPage.Name = "OtherTabPage";
             this.OtherTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.OtherTabPage.Size = new System.Drawing.Size(461, 321);
+            this.OtherTabPage.Size = new System.Drawing.Size(461, 325);
             this.OtherTabPage.TabIndex = 4;
             this.OtherTabPage.Text = "Others";
             // 
@@ -742,7 +820,7 @@ namespace Netch.Forms
             this.ExitWhenClosedCheckBox.AutoSize = true;
             this.ExitWhenClosedCheckBox.Location = new System.Drawing.Point(6, 6);
             this.ExitWhenClosedCheckBox.Name = "ExitWhenClosedCheckBox";
-            this.ExitWhenClosedCheckBox.Size = new System.Drawing.Size(123, 21);
+            this.ExitWhenClosedCheckBox.Size = new System.Drawing.Size(120, 16);
             this.ExitWhenClosedCheckBox.TabIndex = 0;
             this.ExitWhenClosedCheckBox.Text = "Exit when closed";
             this.ExitWhenClosedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -751,9 +829,9 @@ namespace Netch.Forms
             // StopWhenExitedCheckBox
             // 
             this.StopWhenExitedCheckBox.AutoSize = true;
-            this.StopWhenExitedCheckBox.Location = new System.Drawing.Point(200, 7);
+            this.StopWhenExitedCheckBox.Location = new System.Drawing.Point(200, 6);
             this.StopWhenExitedCheckBox.Name = "StopWhenExitedCheckBox";
-            this.StopWhenExitedCheckBox.Size = new System.Drawing.Size(127, 21);
+            this.StopWhenExitedCheckBox.Size = new System.Drawing.Size(120, 16);
             this.StopWhenExitedCheckBox.TabIndex = 1;
             this.StopWhenExitedCheckBox.Text = "Stop when exited";
             this.StopWhenExitedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -762,9 +840,9 @@ namespace Netch.Forms
             // StartWhenOpenedCheckBox
             // 
             this.StartWhenOpenedCheckBox.AutoSize = true;
-            this.StartWhenOpenedCheckBox.Location = new System.Drawing.Point(6, 33);
+            this.StartWhenOpenedCheckBox.Location = new System.Drawing.Point(6, 28);
             this.StartWhenOpenedCheckBox.Name = "StartWhenOpenedCheckBox";
-            this.StartWhenOpenedCheckBox.Size = new System.Drawing.Size(137, 21);
+            this.StartWhenOpenedCheckBox.Size = new System.Drawing.Size(126, 16);
             this.StartWhenOpenedCheckBox.TabIndex = 2;
             this.StartWhenOpenedCheckBox.Text = "Start when opened";
             this.StartWhenOpenedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -773,9 +851,9 @@ namespace Netch.Forms
             // MinimizeWhenStartedCheckBox
             // 
             this.MinimizeWhenStartedCheckBox.AutoSize = true;
-            this.MinimizeWhenStartedCheckBox.Location = new System.Drawing.Point(200, 33);
+            this.MinimizeWhenStartedCheckBox.Location = new System.Drawing.Point(200, 28);
             this.MinimizeWhenStartedCheckBox.Name = "MinimizeWhenStartedCheckBox";
-            this.MinimizeWhenStartedCheckBox.Size = new System.Drawing.Size(158, 21);
+            this.MinimizeWhenStartedCheckBox.Size = new System.Drawing.Size(150, 16);
             this.MinimizeWhenStartedCheckBox.TabIndex = 3;
             this.MinimizeWhenStartedCheckBox.Text = "Minimize when started";
             this.MinimizeWhenStartedCheckBox.UseVisualStyleBackColor = true;
@@ -783,9 +861,9 @@ namespace Netch.Forms
             // RunAtStartupCheckBox
             // 
             this.RunAtStartupCheckBox.AutoSize = true;
-            this.RunAtStartupCheckBox.Location = new System.Drawing.Point(6, 60);
+            this.RunAtStartupCheckBox.Location = new System.Drawing.Point(6, 50);
             this.RunAtStartupCheckBox.Name = "RunAtStartupCheckBox";
-            this.RunAtStartupCheckBox.Size = new System.Drawing.Size(109, 21);
+            this.RunAtStartupCheckBox.Size = new System.Drawing.Size(108, 16);
             this.RunAtStartupCheckBox.TabIndex = 4;
             this.RunAtStartupCheckBox.Text = "Run at startup";
             this.RunAtStartupCheckBox.UseVisualStyleBackColor = true;
@@ -793,9 +871,9 @@ namespace Netch.Forms
             // CheckUpdateWhenOpenedCheckBox
             // 
             this.CheckUpdateWhenOpenedCheckBox.AutoSize = true;
-            this.CheckUpdateWhenOpenedCheckBox.Location = new System.Drawing.Point(200, 60);
+            this.CheckUpdateWhenOpenedCheckBox.Location = new System.Drawing.Point(200, 50);
             this.CheckUpdateWhenOpenedCheckBox.Name = "CheckUpdateWhenOpenedCheckBox";
-            this.CheckUpdateWhenOpenedCheckBox.Size = new System.Drawing.Size(190, 21);
+            this.CheckUpdateWhenOpenedCheckBox.Size = new System.Drawing.Size(168, 16);
             this.CheckUpdateWhenOpenedCheckBox.TabIndex = 5;
             this.CheckUpdateWhenOpenedCheckBox.Text = "Check update when opened";
             this.CheckUpdateWhenOpenedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -804,9 +882,9 @@ namespace Netch.Forms
             // CheckBetaUpdateCheckBox
             // 
             this.CheckBetaUpdateCheckBox.AutoSize = true;
-            this.CheckBetaUpdateCheckBox.Location = new System.Drawing.Point(200, 87);
+            this.CheckBetaUpdateCheckBox.Location = new System.Drawing.Point(200, 72);
             this.CheckBetaUpdateCheckBox.Name = "CheckBetaUpdateCheckBox";
-            this.CheckBetaUpdateCheckBox.Size = new System.Drawing.Size(137, 21);
+            this.CheckBetaUpdateCheckBox.Size = new System.Drawing.Size(126, 16);
             this.CheckBetaUpdateCheckBox.TabIndex = 6;
             this.CheckBetaUpdateCheckBox.Text = "Check Beta update";
             this.CheckBetaUpdateCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -815,9 +893,9 @@ namespace Netch.Forms
             // UpdateSubscribeatWhenOpenedCheckBox
             // 
             this.UpdateSubscribeatWhenOpenedCheckBox.AutoSize = true;
-            this.UpdateSubscribeatWhenOpenedCheckBox.Location = new System.Drawing.Point(200, 109);
+            this.UpdateSubscribeatWhenOpenedCheckBox.Location = new System.Drawing.Point(200, 94);
             this.UpdateSubscribeatWhenOpenedCheckBox.Name = "UpdateSubscribeatWhenOpenedCheckBox";
-            this.UpdateSubscribeatWhenOpenedCheckBox.Size = new System.Drawing.Size(224, 21);
+            this.UpdateSubscribeatWhenOpenedCheckBox.Size = new System.Drawing.Size(204, 16);
             this.UpdateSubscribeatWhenOpenedCheckBox.TabIndex = 7;
             this.UpdateSubscribeatWhenOpenedCheckBox.Text = "Update subscribeat when opened";
             this.UpdateSubscribeatWhenOpenedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -831,10 +909,10 @@ namespace Netch.Forms
             this.AioDNSTabPage.Controls.Add(this.ChinaDNSTextBox);
             this.AioDNSTabPage.Controls.Add(this.OtherDNSLabel);
             this.AioDNSTabPage.Controls.Add(this.OtherDNSTextBox);
-            this.AioDNSTabPage.Location = new System.Drawing.Point(4, 29);
+            this.AioDNSTabPage.Location = new System.Drawing.Point(4, 25);
             this.AioDNSTabPage.Name = "AioDNSTabPage";
             this.AioDNSTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.AioDNSTabPage.Size = new System.Drawing.Size(461, 321);
+            this.AioDNSTabPage.Size = new System.Drawing.Size(461, 325);
             this.AioDNSTabPage.TabIndex = 5;
             this.AioDNSTabPage.Text = "AioDNS";
             this.AioDNSTabPage.UseVisualStyleBackColor = true;
@@ -844,7 +922,7 @@ namespace Netch.Forms
             this.AioDNSRuleRuleLabel.AutoSize = true;
             this.AioDNSRuleRuleLabel.Location = new System.Drawing.Point(16, 27);
             this.AioDNSRuleRuleLabel.Name = "AioDNSRuleRuleLabel";
-            this.AioDNSRuleRuleLabel.Size = new System.Drawing.Size(56, 17);
+            this.AioDNSRuleRuleLabel.Size = new System.Drawing.Size(59, 12);
             this.AioDNSRuleRuleLabel.TabIndex = 0;
             this.AioDNSRuleRuleLabel.Text = "Rule File";
             // 
@@ -853,40 +931,40 @@ namespace Netch.Forms
             this.AioDNSRulePathTextBox.Enabled = false;
             this.AioDNSRulePathTextBox.Location = new System.Drawing.Point(147, 24);
             this.AioDNSRulePathTextBox.Name = "AioDNSRulePathTextBox";
-            this.AioDNSRulePathTextBox.Size = new System.Drawing.Size(201, 23);
+            this.AioDNSRulePathTextBox.Size = new System.Drawing.Size(201, 21);
             this.AioDNSRulePathTextBox.TabIndex = 1;
             // 
             // ChinaDNSLabel
             // 
             this.ChinaDNSLabel.AutoSize = true;
-            this.ChinaDNSLabel.Location = new System.Drawing.Point(16, 73);
+            this.ChinaDNSLabel.Location = new System.Drawing.Point(16, 64);
             this.ChinaDNSLabel.Name = "ChinaDNSLabel";
-            this.ChinaDNSLabel.Size = new System.Drawing.Size(70, 17);
+            this.ChinaDNSLabel.Size = new System.Drawing.Size(59, 12);
             this.ChinaDNSLabel.TabIndex = 2;
             this.ChinaDNSLabel.Text = "China DNS";
             // 
             // ChinaDNSTextBox
             // 
-            this.ChinaDNSTextBox.Location = new System.Drawing.Point(147, 70);
+            this.ChinaDNSTextBox.Location = new System.Drawing.Point(147, 61);
             this.ChinaDNSTextBox.Name = "ChinaDNSTextBox";
-            this.ChinaDNSTextBox.Size = new System.Drawing.Size(201, 23);
+            this.ChinaDNSTextBox.Size = new System.Drawing.Size(201, 21);
             this.ChinaDNSTextBox.TabIndex = 3;
             this.ChinaDNSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // OtherDNSLabel
             // 
             this.OtherDNSLabel.AutoSize = true;
-            this.OtherDNSLabel.Location = new System.Drawing.Point(16, 109);
+            this.OtherDNSLabel.Location = new System.Drawing.Point(16, 103);
             this.OtherDNSLabel.Name = "OtherDNSLabel";
-            this.OtherDNSLabel.Size = new System.Drawing.Size(71, 17);
+            this.OtherDNSLabel.Size = new System.Drawing.Size(59, 12);
             this.OtherDNSLabel.TabIndex = 4;
             this.OtherDNSLabel.Text = "Other DNS";
             // 
             // OtherDNSTextBox
             // 
-            this.OtherDNSTextBox.Location = new System.Drawing.Point(147, 106);
+            this.OtherDNSTextBox.Location = new System.Drawing.Point(147, 100);
             this.OtherDNSTextBox.Name = "OtherDNSTextBox";
-            this.OtherDNSTextBox.Size = new System.Drawing.Size(201, 23);
+            this.OtherDNSTextBox.Size = new System.Drawing.Size(201, 21);
             this.OtherDNSTextBox.TabIndex = 5;
             this.OtherDNSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -952,6 +1030,7 @@ namespace Netch.Forms
             this.PerformLayout();
 
         }
+        private System.Windows.Forms.CheckBox NoProxyForTcpCheckBox;
 
         #endregion
 
@@ -1032,5 +1111,10 @@ namespace Netch.Forms
         private System.Windows.Forms.TextBox ChinaDNSTextBox;
         private System.Windows.Forms.TextBox ModifiedDNSTextBox;
         private System.Windows.Forms.Label ModifiedDNSLabel;
+        private System.Windows.Forms.CheckBox RedirectorSSCheckBox;
+        private System.Windows.Forms.CheckBox NoProxyForUdpCheckBox;
+        private System.Windows.Forms.Label ServerPingTypeLabel;
+        private System.Windows.Forms.RadioButton TCPingRadioBtn;
+        private System.Windows.Forms.RadioButton ICMPingRadioBtn;
     }
 }

Netch/Forms/SettingForm.cs

@@ -59,6 +59,14 @@ namespace Netch.Forms
                 c => Global.Settings.ResolveServerHostname = c,
                 Global.Settings.ResolveServerHostname);
 
+            BindRadioBox(ICMPingRadioBtn,
+                c => Global.Settings.ServerTCPing = c,
+                !Global.Settings.ServerTCPing);
+
+            BindRadioBox(TCPingRadioBtn,
+                c => Global.Settings.ServerTCPing = c,
+                Global.Settings.ServerTCPing);
+
             BindTextBox<int>(ProfileCountTextBox,
                 i => i > -1,
                 i => Global.Settings.ProfileCount = i,
@@ -97,6 +105,18 @@ namespace Netch.Forms
                 s => Global.Settings.ModifiedDNS = s,
                 Global.Settings.ModifiedDNS);
 
+            BindCheckBox(RedirectorSSCheckBox,
+                s => Global.Settings.RedirectorSS = s,
+                Global.Settings.RedirectorSS);
+
+            BindCheckBox(NoProxyForUdpCheckBox,
+                s => Global.Settings.ProcessNoProxyForUdp = s,
+                Global.Settings.ProcessNoProxyForUdp);
+
+            BindCheckBox(NoProxyForTcpCheckBox,
+                s => Global.Settings.ProcessNoProxyForTcp = s,
+                Global.Settings.ProcessNoProxyForTcp);
+
             #endregion
 
             #region TUN/TAP
@@ -120,7 +140,11 @@ namespace Netch.Forms
 
             BindTextBox(TUNTAPDNSTextBox,
                 s => !UseCustomDNSCheckBox.Checked || DNS.TrySplit(s, out _, 2),
-                s => Global.Settings.TUNTAP.DNS = DNS.Split(s).ToList(),
+                s =>
+                {
+                    if (UseCustomDNSCheckBox.Checked)
+                        Global.Settings.TUNTAP.DNS = DNS.Split(s).ToList();
+                },
                 DNS.Join(Global.Settings.TUNTAP.DNS));
 
             BindCheckBox(ProxyDNSCheckBox,
@@ -298,10 +322,11 @@ namespace Netch.Forms
                 return;
             }
 
+            #endregion
 
             #region CheckSTUN
 
-            var stunFlag = true;
+            var errFlag = false;
             var stunServer = string.Empty;
             ushort stunServerPort = 3478;
 
@@ -313,15 +338,15 @@ namespace Netch.Forms
                 if (stun.Length > 1)
                     if (!ushort.TryParse(stun[1], out stunServerPort))
                     {
-                        stunFlag = false;
+                        errFlag = true;
                     }
             }
             else
             {
-                stunFlag = false;
+                errFlag = true;
             }
 
-            if (!stunFlag)
+            if (errFlag)
             {
                 Utils.Utils.ChangeControlForeColor(STUN_ServerComboBox, Color.Red);
                 return;
@@ -329,8 +354,6 @@ namespace Netch.Forms
 
             #endregion
 
-            #endregion
-
             #region Save
 
             foreach (var pair in _saveActions)
@@ -406,7 +429,13 @@ namespace Netch.Forms
         {
             control.Checked = value;
             _checkActions.Add(control, s => true);
-            _saveActions.Add(control, c => save.Invoke(((CheckBox) c).Checked));
+            _saveActions.Add(control, c => save.Invoke(((CheckBox)c).Checked));
+        }
+        private void BindRadioBox(RadioButton control, Action<bool> save, bool value)
+        {
+            control.Checked = value;
+            _checkActions.Add(control, s => true);
+            _saveActions.Add(control, c => save.Invoke(((RadioButton)c).Checked));
         }
 
         private readonly Dictionary<Control, Func<string, bool>> _checkActions = new Dictionary<Control, Func<string, bool>>();
@@ -417,5 +446,25 @@ namespace Netch.Forms
         {
             ModifiedDNSTextBox.Enabled = ModifySystemDNSCheckBox.Checked;
         }
+
+        private void NoProxyForUdpCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            if (NoProxyForUdpCheckBox.Checked) NoProxyForTcpCheckBox.Checked = false;
+        }
+
+        private void NoProxyForTcpCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            if (NoProxyForTcpCheckBox.Checked) NoProxyForUdpCheckBox.Checked = false;
+        }
+
+        private void ICMPingRadioBtn_CheckedChanged(object sender, EventArgs e)
+        {
+            if (ICMPingRadioBtn.Checked) TCPingRadioBtn.Checked = false;
+        }
+
+        private void TCPingRadioBtn_CheckedChanged(object sender, EventArgs e)
+        {
+            if (TCPingRadioBtn.Checked) ICMPingRadioBtn.Checked = false;
+        }
     }
 }

Netch/Forms/SettingForm.resx

@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -57,8 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing.Common" name="System.Drawing.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing.Common" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAMAAAAAAAEAIAAoIAQANgAAAEBAAAABACAAKEIAAF4gBAAgIAAAAQAgAKgQAACGYgQAKAAAAAAB
         AAAAAgAAAQAgAAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

Netch/Models/Mode.cs

@@ -33,20 +33,6 @@ namespace Netch.Models
         /// </summary>
         public int Type = 0;
 
-        public bool SupportSocks5Auth => Type switch
-        {
-            0 => true,
-            _ => false
-        };
-
-        public bool TestNatRequired => Type switch
-        {
-            0 => true,
-            1 => true,
-            2 => true,
-            _ => false
-        };
-
         /// <summary>
         ///    绕过中国（0. 不绕过 1. 绕过）
         /// </summary>
@@ -131,44 +117,15 @@ namespace Netch.Models
         /// <returns>模式文件字符串</returns>
         public string ToFileString()
         {
-            StringBuilder fileString = new StringBuilder();
-
-            switch (Type)
-            {
-                case 0:
-                    // 进程模式
-                    fileString.Append($"# {Remark}");
-                    break;
-                case 1:
-                    // TUN/TAP 规则内 IP CIDR，无 Bypass China 设置
-                    fileString.Append($"# {Remark}, {Type}, 0");
-                    break;
-                default:
-                    fileString.Append($"# {Remark}, {Type}, {(BypassChina ? 1 : 0)}");
-                    break;
-            }
-
-            if (Rule.Any())
-            {
-                fileString.Append(Global.EOF);
-                fileString.Append(string.Join(Global.EOF, Rule));
-            }
-
-            return fileString.ToString();
-        }
-
-        public string TypeToString()
-        {
-            return Type switch
-            {
-                0 => "Process",
-                1 => "TUNTAP",
-                2 => "TUNTAP",
-                3 => "SYSTEM",
-                4 => "S5",
-                5 => "S5+HTTP",
-                _ => "ERROR",
-            };
+            return $"# {Remark}, {Type}, {(BypassChina ? 1 : 0)}{Global.EOF}{string.Join(Global.EOF, Rule)}";
         }
     }
+    public static class ModeExtension
+    {
+        ///     是否会转发 UDP
+        public static bool TestNatRequired(this Mode mode) => mode.Type is 0 or 1 or 2;
+
+        ///     Socks5 分流是否能被有效实施
+        public static bool ClientRouting(this Mode mode) => mode.Type is not (1 or 2);
+    }
 }

Netch/Models/Server.cs

@@ -4,7 +4,7 @@ using Netch.Utils;
 
 namespace Netch.Models
 {
-    public class Server:ICloneable
+    public class Server : ICloneable
     {
         /// <summary>
         ///     备注
@@ -47,14 +47,12 @@ namespace Netch.Models
         /// <returns>备注</returns>
         public override string ToString()
         {
-            if (string.IsNullOrWhiteSpace(Remark))
-            {
-                Remark = $"{Hostname}:{Port}";
-            }
+            var remark = string.IsNullOrWhiteSpace(Remark) ? $"{Hostname}:{Port}" : Remark;
 
-            Group = Group.Equals("None") || Group.Equals("") ? "NONE" : Group;
+            if (Group.Equals("None") || Group.Equals(""))
+                Group = "NONE";
 
-            return $"[{ServerHelper.GetUtilByTypeName(Type)?.ShortName ?? "WTF"}][{Group}] {Remark}";
+            return $"[{ServerHelper.GetUtilByTypeName(Type)?.ShortName ?? "WTF"}][{Group}] {remark}";
         }
 
         public object Clone()
@@ -83,7 +81,7 @@ namespace Netch.Models
                     {
                         try
                         {
-                            return await Utils.Utils.TCPingAsync(destination, Port);
+                            return Global.Settings.ServerTCPing ? await Utils.Utils.TCPingAsync(destination, Port) : await Utils.Utils.ICMPing(destination, Port);
                         }
                         catch (Exception)
                         {

Netch/Models/Setting.cs

@@ -68,7 +68,7 @@ namespace Netch.Models
 
         public KcpConfig KcpConfig = new KcpConfig();
 
-        public bool UseMux = true;
+        public bool UseMux = false;
     }
 
     public class AioDNSConfig
@@ -78,6 +78,8 @@ namespace Netch.Models
         public string ChinaDNS = "223.5.5.5";
 
         public string OtherDNS = "1.1.1.1";
+
+        public string Protocol = "tcp";
     }
 
     /// <summary>
@@ -85,6 +87,11 @@ namespace Netch.Models
     /// </summary>
     public class Setting
     {
+
+        public V2rayConfig V2RayConfig = new V2rayConfig();
+
+        public AioDNSConfig AioDNS = new AioDNSConfig();
+        
         /// <summary>
         ///		服务器选择位置
         /// </summary>
@@ -155,6 +162,16 @@ namespace Netch.Models
         /// </summary>
         public int RequestTimeout = 10000;
 
+        /// <summary>
+        ///     PAC URL
+        /// </summary>
+        public string Pac_Url = "";
+
+        /// <summary>
+        ///     PAC端口
+        /// </summary>
+        public int Pac_Port = 2803;
+
         /// <summary>
         ///		HTTP 本地端口
         /// </summary>
@@ -240,6 +257,11 @@ namespace Netch.Models
         /// </summary>
         public string ACL = "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/banAD.acl";
 
+        /// <summary>
+        ///     GFWList
+        /// </summary>
+        public string GFWLIST = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
+
         /// <summary>
         ///     是否使用DLL启动Shadowsocks
         /// </summary>
@@ -250,8 +272,24 @@ namespace Netch.Models
         /// </summary>
         public string Language = "System";
 
-        public V2rayConfig V2RayConfig = new V2rayConfig();
+        /// <summary>
+        /// 服务器测试方式 false.ICMPing true.TCPing
+        /// </summary>
+        public bool ServerTCPing = true;
 
-        public AioDNSConfig AioDNS = new AioDNSConfig();
+        /// <summary>
+        /// 是否使用RDR内置SS
+        /// </summary>
+        public bool RedirectorSS = false;
+
+        /// <summary>
+        /// 不代理UDP
+        /// </summary>
+        public bool ProcessNoProxyForUdp = false;
+
+        /// <summary>
+        /// 不代理TCP
+        /// </summary>
+        public bool ProcessNoProxyForTcp = false;
     }
 }

Netch/NativeMethods.cs

@@ -28,30 +28,6 @@ namespace Netch
         [DllImport("NetchCore", CallingConvention = CallingConvention.Cdecl, EntryPoint = "DeleteRoute")]
         public static extern bool DeleteRoute(string address, int cidr, string gateway, int index, int metric = 0);
 
-        /// <summary>
-        ///     设置直连
-        /// </summary>
-        /// <returns>是否成功</returns>
-        [DllImport("sysproxy", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool SetDIRECT();
-
-        /// <summary>
-        ///     设置全局
-        /// </summary>
-        /// <param name="remote">地址</param>
-        /// <param name="bypass">绕过</param>
-        /// <returns>是否成功</returns>
-        [DllImport("sysproxy", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool SetGlobal([MarshalAs(UnmanagedType.LPTStr)] string remote, [MarshalAs(UnmanagedType.LPTStr)] string bypass);
-
-        /// <summary>
-        ///     设置自动代理
-        /// </summary>
-        /// <param name="remote">URL</param>
-        /// <returns>是否成功</returns>
-        [DllImport("sysproxy", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool SetURL([MarshalAs(UnmanagedType.LPTStr)] string remote);
-
         [DllImport("dnsapi", EntryPoint = "DnsFlushResolverCache")]
         public static extern uint FlushDNSResolverCache();
 

Netch/Netch.cs

@@ -20,8 +20,10 @@ namespace Netch
         {
             if (args.Contains("-console"))
             {
-                NativeMethods.AllocConsole();
-                NativeMethods.AttachConsole(-1);
+                if (!NativeMethods.AttachConsole(-1))
+                {
+                    NativeMethods.AllocConsole();
+                }
             }
 
             // 创建互斥体防止多次运行

Netch/Netch.csproj

@@ -66,13 +66,14 @@
 
     <ItemGroup>
         <PackageReference Include="ILMerge" Version="3.0.41" />
-        <PackageReference Include="MaxMind.GeoIP2" Version="3.3.0" />
+        <PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
         <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.62" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
         <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
         <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
-        <PackageReference Include="WindowsJobAPI" Version="5.0.0" />
+        <PackageReference Include="WindowsJobAPI" Version="5.0.1" />
+        <PackageReference Include="WindowsProxy" Version="5.0.0" />
     </ItemGroup>
 
     <ItemGroup>

Netch/Properties/Resources.Designer.cs

@@ -60,6 +60,16 @@ namespace Netch.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] abp_js {
+            get {
+                object obj = ResourceManager.GetObject("abp_js", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

Netch/Properties/Resources.resx

@@ -1,145 +1,172 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    <!-- 
+      Microsoft ResX Schema 
+      
+      Version 2.0
+      
+      The primary goals of this format is to allow a simple XML format 
+      that is mostly human readable. The generation and parsing of the 
+      various data types are done through the TypeConverter classes 
+      associated with the data types.
+      
+      Example:
+      
+      ... ado.net/XML headers & schema ...
+      <resheader name="resmimetype">text/microsoft-resx</resheader>
+      <resheader name="version">2.0</resheader>
+      <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+      <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+      <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+      <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+      <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+          <value>[base64 mime encoded serialized .NET Framework object]</value>
+      </data>
+      <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+          <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+          <comment>This is a comment</comment>
+      </data>
+                  
+      There are any number of "resheader" rows that contain simple 
+      name/value pairs.
+      
+      Each data row contains a name, and value. The row also contains a 
+      type or mimetype. Type corresponds to a .NET class that support 
+      text/value conversion through the TypeConverter architecture. 
+      Classes that don't support this are serialized and stored with the 
+      mimetype set.
+      
+      The mimetype is used for serialized objects, and tells the 
+      ResXResourceReader how to depersist the object. This is currently not 
+      extensible. For a given mimetype the value must be set accordingly:
+      
+      Note - application/x-microsoft.net.object.binary.base64 is the format 
+      that the ResXResourceWriter will generate, however the reader can 
+      read any of the formats listed below.
+      
+      mimetype: application/x-microsoft.net.object.binary.base64
+      value   : The object must be serialized with 
+              : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+              : and then encoded with base64 encoding.
+      
+      mimetype: application/x-microsoft.net.object.soap.base64
+      value   : The object must be serialized with 
+              : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+              : and then encoded with base64 encoding.
+  
+      mimetype: application/x-microsoft.net.object.bytearray.base64
+      value   : The object must be serialized into a byte array 
+              : using a System.ComponentModel.TypeConverter
+              : and then encoded with base64 encoding.
+      -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="metadata">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                            </xsd:sequence>
+                            <xsd:attribute name="name" use="required" type="xsd:string"/>
+                            <xsd:attribute name="type" type="xsd:string"/>
+                            <xsd:attribute name="mimetype" type="xsd:string"/>
+                            <xsd:attribute ref="xml:space"/>
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="assembly">
+                        <xsd:complexType>
+                            <xsd:attribute name="alias" type="xsd:string"/>
+                            <xsd:attribute name="name" type="xsd:string"/>
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+                            <xsd:attribute ref="xml:space"/>
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required"/>
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>2.0</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
+    </resheader>
+    <assembly alias="System.Windows.Forms"
+              name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+    <data name="defaultTUNTAP" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\defaultTUNTAP;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
     </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
+    <data name="zh_CN" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\zh-CN;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
+    </data>
+    <data name="speed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\speed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a
+        </value>
+    </data>
+    <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a
+        </value>
+    </data>
+    <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a
+        </value>
+    </data>
+    <data name="Netch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\Netch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a
+        </value>
+    </data>
+    <data name="Sponsor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\Sponsor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a
+        </value>
+    </data>
+    <data name="CopyLink" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a
+        </value>
+    </data>
+    <data name="abp_js" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>..\Resources\abp.js.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a
+        </value>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="defaultTUNTAP" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\defaultTUNTAP;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="zh_CN" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zh-CN;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="speed" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\speed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Netch" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Netch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Sponsor" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Sponsor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="CopyLink" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>

Netch/Resources/zh-CN

@@ -81,10 +81,16 @@
     "Modes have been reload": "模式已重载",
     "Clean DNS Cache": "清理 DNS 缓存",
     "DNS cache cleanup succeeded": "DNS 缓存清理成功",
+    
+    "Update PAC": "更新 PAC",
+    "PAC updated successfully": "PAC 更新成功",
+    "PAC update failed": "PAC 更新失败",
+    
     "Update ACL": "更新 ACL 规则",
     "Update ACL with proxy": "使用代理更新 ACL 规则",
     "ACL updated successfully": "ACL 更新成功",
     "ACL update failed": "ACL 更新失败",
+    
     "Open Directory": "打开目录",
 
     "About": "关于",
@@ -155,6 +161,8 @@
     "Update subscribeat when opened": "自动更新订阅",
     "SS DLL": "SS DLL",
     "Modify System DNS": "修改系统 DNS",
+    "No Proxy for Udp": "不代理Udp流量",
+    "No Proxy for Tcp": "不代理Tcp流量",
     "ProfileCount": "快捷配置数量",
     "ProfileCount value illegal. Try again.": "快捷配置数值非法。请重试。",
     "STUN_ServerPort value illegal. Try again.": "STUN 端口数值非法。请重试。",
@@ -163,6 +171,7 @@
     "Failed to set the system proxy, it may be caused by the lack of dependent programs. Do you want to jump to Netch's official website to download dependent programs?": "设置系统代理失败，可能是缺少依赖导致，是否跳转 Netch 官网下载依赖程序？",
     "Delay test after start": "启动后延迟测试",
     "Enable": "启用",
+    "ServerPingType": "测速方式",
     "Detection interval(sec)": "检测间隔（秒）",
     "STUN Server": "STUN 服务器",
     "STUN Server Port": "STUN 服务器端口",

Netch/Servers/Shadowsocks/SSController.cs

@@ -11,19 +11,16 @@ namespace Netch.Servers.Shadowsocks
         public override string Name { get; protected set; } = "Shadowsocks";
         public override string MainFile { get; protected set; } = "Shadowsocks.exe";
 
-        public Server Server { get; set; }
         public ushort? Socks5LocalPort { get; set; }
         public string LocalAddress { get; set; }
 
-        private Mode _savedMode;
         public bool DllFlag;
 
         public bool Start(in Server s, in Mode mode)
         {
-            _savedMode = mode;
-            Server = s;
             var server = (Shadowsocks) s;
-            DllFlag = Global.Settings.BootShadowsocksFromDLL && (_savedMode.Type == 0 || _savedMode.Type == 1 || _savedMode.Type == 2);
+
+            DllFlag = Global.Settings.BootShadowsocksFromDLL && mode.Type is 0 or 1 or 2 && !server.HasPlugin();
 
             //从DLL启动Shaowsocks
             if (DllFlag)
@@ -82,7 +79,6 @@ namespace Netch.Servers.Shadowsocks
                 ShadowsocksDLL.Stop();
             else
                 StopInstance();
-            _savedMode = null;
         }
 
         private class ShadowsocksDLL

Netch/Servers/Shadowsocks/Shadowsocks.cs

@@ -29,6 +29,8 @@ namespace Netch.Servers.Shadowsocks
         {
             Type = "SS";
         }
+
+        public bool HasPlugin() => !string.IsNullOrWhiteSpace(Plugin) && !string.IsNullOrWhiteSpace(PluginOption);
     }
 
     public static class SSGlobal

Netch/Servers/ShadowsocksR/SSRController.cs

@@ -11,13 +11,11 @@ namespace Netch.Servers.ShadowsocksR
 
         public override string Name { get; protected set; } = "ShadowsocksR";
 
-        public Server Server { get; set; }
         public ushort? Socks5LocalPort { get; set; }
         public string LocalAddress { get; set; }
 
         public bool Start(in Server s, in Mode mode)
         {
-            Server = s;
             var server = (ShadowsocksR) s;
 
             #region Argument

Netch/Servers/ShadowsocksR/SSRUtil.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Netch.Controllers;
 using Netch.Models;
+using Netch.Servers.Shadowsocks;
 using Netch.Servers.ShadowsocksR.Form;
 using Netch.Utils;
 using Newtonsoft.Json.Linq;
@@ -100,6 +101,22 @@ namespace Netch.Servers.ShadowsocksR
 
             var group = paramsDict.ContainsKey("group") ? ShareLink.URLSafeBase64Decode(paramsDict["group"]) : string.Empty;
 
+            if (SSGlobal.EncryptMethods.Contains(method) && protocol == "origin" && obfs == "plain")
+            {
+                return new[]
+                {
+                    new Shadowsocks.Shadowsocks
+                    {
+                        Hostname = serverAddr,
+                        Port = serverPort,
+                        EncryptMethod = method,
+                        Password = password,
+                        Remark = remarks,
+                        Group = group
+                    }
+                };
+            }
+
             return new[]
             {
                 new ShadowsocksR

Netch/Servers/Socks5/S5Controller.cs

@@ -12,9 +12,8 @@ namespace Netch.Servers.Socks5
 
         public bool Start(in Server s, in Mode mode)
         {
-            Server = s;
             var server = (Socks5) s;
-            if (server.Auth() && !mode.SupportSocks5Auth)
+            if (server.Auth())
             {
                 File.WriteAllText("data\\last.json", V2rayConfigUtils.GenerateClientConfig(s, mode));
                 if (StartInstanceAuto("-config ..\\data\\last.json"))
@@ -34,7 +33,6 @@ namespace Netch.Servers.Socks5
                 StopInstance();
         }
 
-        public Server Server { get; set; }
         public ushort? Socks5LocalPort { get; set; }
 
         public string LocalAddress { get; set; }

Netch/Servers/Trojan/TrojanController.cs

@@ -18,16 +18,14 @@ namespace Netch.Servers.Trojan
 
         public override string MainFile { get; protected set; } = "Trojan.exe";
         public override string Name { get; protected set; } = "Trojan";
-        public Server Server { get; set; }
         public ushort? Socks5LocalPort { get; set; }
         public string LocalAddress { get; set; }
 
 
         public bool Start(in Server s, in Mode mode)
         {
-            Server = s;
             var server = (Trojan) s;
-            File.WriteAllText("data\\last.json", JsonConvert.SerializeObject(new TrojanConfig
+            var trojanConfig = new TrojanConfig
             {
                 local_addr = this.LocalAddress(),
                 local_port = this.Socks5LocalPort(),
@@ -37,8 +35,15 @@ namespace Netch.Servers.Trojan
                 {
                     server.Password
                 }
-            }));
+            };
 
+            if (!string.IsNullOrWhiteSpace(server.Host))
+                trojanConfig.ssl.sni = server.Host;
+
+            File.WriteAllText("data\\last.json", JsonConvert.SerializeObject(trojanConfig, Formatting.Indented, new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            }));
             return StartInstanceAuto("-c ..\\data\\last.json");
         }
 

Netch/Servers/VLESS/VLESS.cs

@@ -14,17 +14,17 @@ namespace Netch.Servers.VLESS
         /// <summary>
         ///     加密方式
         /// </summary>
-        public new string EncryptMethod { get; set; } = "none";
+        public override string EncryptMethod { get; set; } = "none";
 
         /// <summary>
         ///		传输协议
         /// </summary>
-        public new string TransferProtocol { get; set; } = VLESSGlobal.TransferProtocols[0];
+        public override string TransferProtocol { get; set; } = VLESSGlobal.TransferProtocols[0];
 
         /// <summary>
         ///		伪装类型
         /// </summary>
-        public new string FakeType { get; set; } = VLESSGlobal.FakeTypes[0];
+        public override string FakeType { get; set; } = VLESSGlobal.FakeTypes[0];
 
         /// <summary>
         ///     

Netch/Servers/VLESS/VLESSController.cs

@@ -10,14 +10,12 @@ namespace Netch.Servers.VLESS
         public override string Name { get; protected set; } = "VLESS";
         public override string MainFile { get; protected set; } = "v2ray.exe";
 
-        public Server Server { get; set; }
         public ushort? Socks5LocalPort { get; set; }
 
         public string LocalAddress { get; set; }
 
         public  bool Start(in Server s,in Mode mode)
         {
-            Server = s;
             File.WriteAllText("data\\last.json", V2rayConfigUtils.GenerateClientConfig(s, mode));
             return StartInstanceAuto("-config ..\\data\\last.json");
         }

Netch/Servers/VLESS/VLESSUtil.cs

@@ -15,24 +15,7 @@ namespace Netch.Servers.VLESS
 
         public Server ParseJObject(in JObject j)
         {
-            var server = j.ToObject<VLESS>();
-            if (server == null)
-                return null;
-
-            if (server.TLSSecure != null)
-            {
-                if ((bool) server.TLSSecure)
-                {
-                    server.TLSSecureType = "tls";
-                    server.TLSSecure = null;
-                }
-                else
-                {
-                    server.TLSSecure = null;
-                }
-            }
-
-            return server;
+            return j.ToObject<VLESS>();
         }
 
         public void Edit(Server s)

Netch/Servers/VMess/Models/V2rayConfig.cs

@@ -195,8 +195,6 @@ namespace Netch.Servers.VMess.Models
 
     public class TcpSettings
     {
-        public bool connectionReuse { get; set; }
-
         public Header header { get; set; }
     }
 
@@ -257,8 +255,6 @@ namespace Netch.Servers.VMess.Models
 
     public class WsSettings
     {
-        public bool connectionReuse { get; set; }
-
         public string path { get; set; }
 
         public Headers headers { get; set; }

Netch/Servers/VMess/Utils/V2rayConfigUtils.cs

@@ -77,21 +77,25 @@ namespace Netch.Servers.VMess.Utils
 
                 if (mode.BypassChina)
                 {
-                    if (mode.Type > 2)
+                    switch (mode.Type)
                     {
-                        directRuleObject.domain.Add("geosite:cn");
-                    }
-
-                    if (mode.Type == 1 || mode.Type == 2)
-                    {
-                        if (Global.Flags.SupportFakeDns && Global.Settings.TUNTAP.UseFakeDNS)
-                            directRuleObject.domain.Add("geosite:cn");
-                        else
+                        case 0:
                             directRuleObject.ip.Add("geoip:cn");
+                            break;
+                        case 1:
+                        case 2:
+                            if (Global.Flags.SupportFakeDns && Global.Settings.TUNTAP.UseFakeDNS)
+                                directRuleObject.domain.Add("geosite:cn");
+                            else
+                                directRuleObject.ip.Add("geoip:cn");
+                            break;
+                        default:
+                            directRuleObject.domain.Add("geosite:cn");
+                            break;
                     }
                 }
 
-                if (mode.Type <= 2)
+                if (mode.Type is 0 or 1 or 2)
                 {
                     blockRuleObject.ip.Add("geoip:private");
                 }
@@ -306,7 +310,6 @@ namespace Netch.Servers.VMess.Utils
                     case "ws":
                         var wsSettings = new WsSettings
                         {
-                            connectionReuse = true,
                             headers = !string.IsNullOrWhiteSpace(server.Host)
                                 ? new Headers {Host = server.Host}
                                 : null,
@@ -351,7 +354,6 @@ namespace Netch.Servers.VMess.Utils
                         {
                             var tcpSettings = new TcpSettings
                             {
-                                connectionReuse = true,
                                 header = new Header
                                 {
                                     type = server.FakeType,

Netch/Servers/VMess/VMess.cs

@@ -24,18 +24,18 @@ namespace Netch.Servers.VMess
         /// <summary>
         ///     加密方式
         /// </summary>
-        public string EncryptMethod { get; set; } = VMessGlobal.EncryptMethods[0];
+        public virtual string EncryptMethod { get; set; } = VMessGlobal.EncryptMethods[0];
 
 
         /// <summary>
         ///		传输协议
         /// </summary>
-        public string TransferProtocol { get; set; } = VMessGlobal.TransferProtocols[0];
+        public virtual string TransferProtocol { get; set; } = VMessGlobal.TransferProtocols[0];
 
         /// <summary>
         ///		伪装类型
         /// </summary>
-        public string FakeType { get; set; } = VMessGlobal.FakeTypes[0];
+        public virtual string FakeType { get; set; } = VMessGlobal.FakeTypes[0];
 
         /// <summary>
         ///     QUIC
@@ -62,12 +62,6 @@ namespace Netch.Servers.VMess
         /// </summary>
         public string QUICSecret { get; set; } = string.Empty;
 
-        /// <summary>
-        ///		TLS 底层传输安全
-        /// </summary>
-        [Obsolete]
-        public bool? TLSSecure { get; set; }
-
         /// <summary>
         ///		TLS 底层传输安全
         /// </summary>
@@ -76,7 +70,7 @@ namespace Netch.Servers.VMess
         /// <summary>
         ///		Mux 多路复用
         /// </summary>
-        public bool? UseMux { get; set; } = true;
+        public bool? UseMux { get; set; } = false;
     }
 
     public class VMessGlobal

Netch/Servers/VMess/VMessController.cs

@@ -15,14 +15,12 @@ namespace Netch.Servers.VMess
 
         public override string Name { get; protected set; } = "VMess";
         public override string MainFile { get; protected set; } = "v2ray.exe";
-        public Server Server { get; set; }
         public ushort? Socks5LocalPort { get; set; }
         public string LocalAddress { get; set; }
 
 
         public  bool Start(in Server s,in Mode mode)
         {
-            Server = s;
             File.WriteAllText("data\\last.json", V2rayConfigUtils.GenerateClientConfig(s, mode));
             return StartInstanceAuto("-config ..\\data\\last.json");
         }

Netch/Servers/VMess/VMessUtil.cs

@@ -20,24 +20,7 @@ namespace Netch.Servers.VMess
 
         public Server ParseJObject(in JObject j)
         {
-            var server = j.ToObject<VMess>();
-            if (server == null)
-                return null;
-
-            if (server.TLSSecure != null)
-            {
-                if ((bool) server.TLSSecure)
-                {
-                    server.TLSSecureType = "tls";
-                    server.TLSSecure = null;
-                }
-                else
-                {
-                    server.TLSSecure = null;
-                }
-            }
-
-            return server;
+            return j.ToObject<VMess>();
         }
 
         public void Edit(Server s)

Netch/Utils/HttpProxyHandler/HttpWebServer.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Net;
+using System.Text;
+using System.Threading;
+
+namespace Netch.Utils.HttpProxyHandler
+{
+    public class HttpWebServer
+    {
+        private HttpListener _listener;
+        private Func<HttpListenerRequest, string> _responderMethod;
+
+        public HttpWebServer(string[] prefixes, Func<HttpListenerRequest, string> method)
+        {
+            try
+            {
+                _listener = new HttpListener();
+
+                if (!HttpListener.IsSupported)
+                    throw new NotSupportedException(
+                        "Needs Windows XP SP2, Server 2003 or later.");
+
+                // URI prefixes are required, for example 
+                // "http://localhost:8080/index/".
+                if (prefixes == null || prefixes.Length == 0)
+                    throw new ArgumentException("prefixes");
+
+                // A responder method is required
+                if (method == null)
+                    throw new ArgumentException("method");
+
+                foreach (string s in prefixes)
+                    _listener.Prefixes.Add(s);
+
+                _responderMethod = method;
+                _listener.Start();
+            }
+            catch (Exception ex)
+            {
+                Logging.Error("HttpWebServer():" + ex.Message);
+            }
+        }
+
+        public HttpWebServer(Func<HttpListenerRequest, string> method, params string[] prefixes)
+            : this(prefixes, method)
+        {
+        }
+
+        public void Run()
+        {
+            ThreadPool.QueueUserWorkItem((o) =>
+            {
+                Logging.Info("Webserver running...");
+                try
+                {
+                    while (_listener.IsListening)
+                    {
+                        ThreadPool.QueueUserWorkItem((c) =>
+                        {
+                            var ctx = c as HttpListenerContext;
+                            try
+                            {
+                                string rstr = _responderMethod(ctx.Request);
+                                byte[] buf = Encoding.UTF8.GetBytes(rstr);
+                                ctx.Response.StatusCode = 200;
+                                ctx.Response.ContentType = "application/x-ns-proxy-autoconfig";
+                                ctx.Response.ContentLength64 = buf.Length;
+                                ctx.Response.OutputStream.Write(buf, 0, buf.Length);
+                            }
+                            catch
+                            {
+                            } // suppress any exceptions
+                            finally
+                            {
+                                // always close the stream
+                                ctx.Response.OutputStream.Close();
+                            }
+                        }, _listener.GetContext());
+                    }
+                }
+                catch (Exception ex)
+                {
+                    //Logging.Error(ex.Message, ex);
+                    Logging.Error(ex.Message);
+                } // suppress any exceptions
+            });
+        }
+
+        public void Stop()
+        {
+            if (_listener != null)
+            {
+                _listener.Stop();
+                _listener.Close();
+                _listener = null;
+            }
+        }
+    }
+}

Netch/Utils/HttpProxyHandler/PACServerHandle.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using WindowsProxy;
+
+namespace Netch.Utils.HttpProxyHandler
+{
+    /// <summary>
+    /// 提供PAC功能支持
+    /// </summary>
+    class PACServerHandle
+    {
+        private static Hashtable httpWebServer = new Hashtable();
+        private static Hashtable pacList = new Hashtable();
+
+        public static void InitPACServer(string address)
+        {
+            try
+            {
+                if (!pacList.ContainsKey(address))
+                {
+                    pacList.Add(address, GetPacList(address));
+                }
+
+                string prefixes = string.Format("http://{0}:{1}/pac/", address, Global.Settings.Pac_Port);
+
+                HttpWebServer ws = new HttpWebServer(SendResponse, prefixes);
+                ws.Run();
+
+                if (!httpWebServer.ContainsKey(address) && ws != null)
+                {
+                    httpWebServer.Add(address, ws);
+                }
+                Global.Settings.Pac_Url = GetPacUrl();
+
+                using var service = new ProxyService
+                {
+                    AutoConfigUrl = Global.Settings.Pac_Url
+                };
+                service.Pac();
+
+                Logging.Info(service.Set(service.Query()) + "");
+                Logging.Info($"Webserver InitServer OK: {Global.Settings.Pac_Url}");
+            }
+            catch (Exception ex)
+            {
+                Logging.Error("Webserver InitServer " + ex.Message);
+            }
+        }
+
+        public static string SendResponse(HttpListenerRequest request)
+        {
+            try
+            {
+                string[] arrAddress = request.UserHostAddress.Split(':');
+                string address = "127.0.0.1";
+                if (arrAddress.Length > 0)
+                {
+                    address = arrAddress[0];
+                }
+                return pacList[address].ToString();
+            }
+            catch (Exception ex)
+            {
+                Logging.Error("Webserver SendResponse " + ex.Message);
+                return ex.Message;
+            }
+        }
+
+        public static void Stop()
+        {
+            try
+            {
+                if (httpWebServer == null)
+                {
+                    return;
+                }
+                foreach (var key in httpWebServer.Keys)
+                {
+                    Logging.Info("Webserver Stop " + key.ToString());
+                    ((HttpWebServer)httpWebServer[key]).Stop();
+                }
+                httpWebServer.Clear();
+            }
+            catch (Exception ex)
+            {
+                Logging.Error("Webserver Stop " + ex.Message);
+            }
+        }
+
+        private static string GetPacList(string address)
+        {
+            try
+            {
+                List<string> lstProxy = new List<string>();
+                lstProxy.Add(string.Format("PROXY {0}:{1};", address, Global.Settings.HTTPLocalPort));
+
+                var proxy = string.Join("", lstProxy.ToArray());
+                string strPacfile = Path.Combine(Global.NetchDir, $"bin\\pac.txt");
+
+                var pac = File.ReadAllText(strPacfile, Encoding.UTF8).Replace("__PROXY__", proxy);
+                return pac;
+            }
+            catch
+            { }
+            return "No pac content";
+        }
+
+        /// <summary>
+        /// 获取PAC地址
+        /// </summary>
+        /// <returns></returns>
+        public static string GetPacUrl()
+        {
+            string pacUrl = string.Format("http://127.0.0.1:{0}/pac/?t={1}", Global.Settings.Pac_Port,
+                          DateTime.Now.ToString("yyyyMMddHHmmssfff"));
+
+            return pacUrl;
+        }
+    }
+}

Netch/Utils/HttpProxyHandler/PACUtil.cs

@@ -0,0 +1,56 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Net;
+using System.Text;
+using Netch.Forms;
+using Netch.Properties;
+
+namespace Netch.Utils.HttpProxyHandler
+{
+    /// <summary>
+    /// 提供PAC功能支持
+    /// </summary>
+    class PACUtil
+    {
+        private static readonly IEnumerable<char> IgnoredLineBegins = new[] {'!', '['};
+
+        public static List<string> ParseResult(string response)
+        {
+            byte[] bytes = Convert.FromBase64String(response);
+            string content = Encoding.ASCII.GetString(bytes);
+            List<string> valid_lines = new List<string>();
+            using (var sr = new StringReader(content))
+            {
+                foreach (var line in sr.NonWhiteSpaceLines())
+                {
+                    if (line.BeginWithAny(IgnoredLineBegins))
+                        continue;
+                    valid_lines.Add(line);
+                }
+            }
+            return valid_lines;
+        }
+
+        public static string UnGzip(byte[] buf)
+        {
+            byte[] buffer = new byte[1024];
+            int n;
+            using (MemoryStream sb = new MemoryStream())
+            {
+                using (GZipStream input = new GZipStream(new MemoryStream(buf),
+                    CompressionMode.Decompress,
+                    false))
+                {
+                    while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
+                    {
+                        sb.Write(buffer, 0, n);
+                    }
+                }
+                return System.Text.Encoding.UTF8.GetString(sb.ToArray());
+            }
+        }
+    }
+}

Netch/Utils/ModeHelper.cs

@@ -5,6 +5,8 @@ using System.Linq;
 using Netch.Controllers;
 using Netch.Forms;
 using Netch.Models;
+using Netch.Servers.Shadowsocks;
+using Netch.Servers.Socks5;
 
 namespace Netch.Utils
 {
@@ -66,17 +68,19 @@ namespace Netch.Utils
 
                 if (i == 0)
                 {
+                    if (text.First() != '#')
+                        return;
                     try
                     {
-                        var splited = text.Substring(text.IndexOf('#') + 1).Split(',').Select(s => s.Trim()).ToArray();
+                        var splited = text.Substring(1).Split(',').Select(s => s.Trim()).ToArray();
 
                         mode.Remark = splited[0];
 
-                        var result = int.TryParse(splited.ElementAtOrDefault(1), out var type);
-                        mode.Type = result ? type : 0;
+                        var typeResult = int.TryParse(splited.ElementAtOrDefault(1), out var type);
+                        mode.Type = typeResult ? type : 0;
 
-                        var result1 = int.TryParse(splited.ElementAtOrDefault(2), out var bypassChina);
-                        mode.BypassChina = result1 && bypassChina == 1;
+                        var bypassChinaResult = int.TryParse(splited.ElementAtOrDefault(2), out var bypassChina);
+                        mode.BypassChina = mode.ClientRouting() && bypassChinaResult && bypassChina == 1;
                     }
                     catch
                     {
@@ -135,6 +139,21 @@ namespace Netch.Utils
             Global.MainForm.InitMode();
         }
 
+
+        public static bool SkipServerController(Server server, Mode mode)
+        {
+            return mode.Type switch
+            {
+                0 => server switch
+                {
+                    Socks5 => true,
+                    Shadowsocks shadowsocks when !shadowsocks.HasPlugin() && Global.Settings.RedirectorSS => true,
+                    _ => false
+                },
+                _ => false
+            };
+        }
+
         public static IModeController GetModeControllerByType(int type, out ushort? port, out string portName, out PortType portType)
         {
             IModeController modeController;

Netch/Utils/ShareLink.cs

@@ -235,12 +235,6 @@ namespace Netch.Utils
         public static string GetNetchLink(Server s)
         {
             var server = (Server) s.Clone();
-            if (server is VMess vmess)
-            {
-                vmess.TLSSecure = !string.IsNullOrEmpty(vmess.TLSSecureType);
-                vmess.TLSSecureType = null;
-            }
-
             return "Netch://" + URLSafeBase64Encode(JsonConvert.SerializeObject(server, new JsonSerializerSettings {NullValueHandling = NullValueHandling.Ignore}));
         }
     }

Netch/Utils/StringEx.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Netch.Utils
+{
+    static class StringEx
+    {
+        public static bool IsNullOrEmpty(this string value)
+        {
+            return string.IsNullOrEmpty(value);
+        }
+
+        public static bool IsNullOrWhiteSpace(this string value)
+        {
+            return string.IsNullOrWhiteSpace(value);
+        }
+
+        public static bool BeginWithAny(this string s, IEnumerable<char> chars)
+        {
+            if (s.IsNullOrEmpty()) return false;
+            return chars.Contains(s[0]);
+        }
+
+        public static bool IsWhiteSpace(this string value)
+        {
+            foreach (var c in value)
+            {
+                if (char.IsWhiteSpace(c)) continue;
+
+                return false;
+            }
+            return true;
+        }
+
+        public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
+        {
+            string line;
+            while ((line = reader.ReadLine()) != null)
+            {
+                if (line.IsWhiteSpace()) continue;
+                yield return line;
+            }
+        }
+    }
+}

Netch/Utils/Utils.cs

@@ -56,6 +56,18 @@ namespace Netch.Utils
             return timeout;
         }
 
+        public static async Task<int> ICMPing(IPAddress ip, int timeout = 1000)
+        {
+            var reply = new Ping().Send(ip, timeout);
+
+            if (reply?.Status == IPStatus.Success)
+            {
+                return Convert.ToInt32(reply.RoundtripTime);
+            }
+
+            return timeout;
+        }
+
         public static string GetCityCode(string Hostname)
         {
             if (Hostname.Contains(":"))

Netch/Utils/WebUtil.cs

@@ -8,8 +8,13 @@ namespace Netch.Utils
 {
     public static class WebUtil
     {
+        static WebUtil()
+        {
+            ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
+        }
+
         public const string DefaultUserAgent =
-            @"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36";
+            @"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36 Edg/87.0.664.55";
 
         private static int DefaultGetTimeout => Global.Settings.RequestTimeout;
 
@@ -94,4 +99,4 @@ namespace Netch.Utils
             fileStream.Flush();
         }
     }
-}
+}

README.md

@@ -41,9 +41,7 @@ As well, Netch avoid the restricted NAT problem caused by SSTap. You can use an
 
 - [RabbitHosts](https://rabbithosts.com/cart.php)
 - [ManSora](https://www.mansora.co/cart.php)
-- [ExCloud](https://excloud.net/cart.php)
 - [NyanCat](https://nyancat.info/register)
-- [YoYu](https://home.yoyu.ltd/cart.php)
 
 ## Donate
 - XMR *48ju3ELNZEa6wwPBMexCJ9G218BGY2XwhH6B6bmkFuJ3QgM4hPw2Pra35jPtuBZSc7SLNWeBpiWJZWjQeMAiLnTx2tH2Efx*
@@ -65,6 +63,7 @@ As well, Netch avoid the restricted NAT problem caused by SSTap. You can use an
 - [v2ray-core](https://github.com/v2ray/v2ray-core)
 - [trojan](https://github.com/trojan-gfw/trojan)
 - [ACL4SSR](https://github.com/ACL4SSR/ACL4SSR)
+- [GFWList](https://github.com/gfwlist/gfwlist)
 - [dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
 - [tap-windows6](https://github.com/OpenVPN/tap-windows6)
 - [Privoxy](https://www.privoxy.org/)

docs/README.zh-CN.md

@@ -44,9 +44,7 @@ Netch 是一款 Windows 平台的开源游戏加速工具，Netch 可以实现
 
 - [RabbitHosts](https://rabbithosts.com/cart.php)
 - [ManSora](https://www.mansora.co/cart.php)
-- [ExCloud](https://excloud.net/cart.php)
 - [NyanCat](https://nyancat.info/register)
-- [YoYu](https://home.yoyu.ltd/cart.php)
 
 ## 捐赠
 - XMR *48ju3ELNZEa6wwPBMexCJ9G218BGY2XwhH6B6bmkFuJ3QgM4hPw2Pra35jPtuBZSc7SLNWeBpiWJZWjQeMAiLnTx2tH2Efx*
@@ -74,6 +72,7 @@ Netch 支持多种语言，在启动时会根据系统语言选择自身语言
 - [v2ray-core](https://github.com/v2ray/v2ray-core)
 - [trojan](https://github.com/trojan-gfw/trojan)
 - [ACL4SSR](https://github.com/ACL4SSR/ACL4SSR)
+- [GFWList](https://github.com/gfwlist/gfwlist)
 - [dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
 - [tap-windows6](https://github.com/OpenVPN/tap-windows6)
 - [Privoxy](https://www.privoxy.org/)