Merge pull request #252 from henning724/master

添加配置(profile)相关提示框

.github/workflows/dotnetcore.yml

@@ -0,0 +1,71 @@
+name: GitHub Actions & Netch CI
+
+on: [push]
+
+jobs:
+  build:
+    name: Build
+    runs-on: windows-latest
+       
+    steps:   
+    - uses: actions/checkout@v2
+      
+    - name: Get tag name
+      uses: olegtarasov/get-tag@v1
+
+    - name: submodules-init
+      uses: snickerbockers/submodules-init@v4
+  
+    - uses: nuget/setup-nuget@v1
+    - run: nuget restore Netch.sln
+     
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v1.0.0
+
+    - name: Build .NET 4.8 Netch
+      shell: pwsh
+      run: |
+        .\build.ps1
+        New-Item -ItemType Directory -Path C:\builtfiles -Force > $null
+        Compress-Archive -Path Netch\bin\x64\Release\win-x64\* -DestinationPath C:\builtfiles\Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip
+        echo "::set-env name=Netch64_SHA256::$(.\getSHA256.ps1 C:\builtfiles\Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip)"
+        Compress-Archive -Path Netch\bin\x86\Release\win-x86\* -DestinationPath C:\builtfiles\Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip
+        echo "::set-env name=Netch86_SHA256::$(.\getSHA256.ps1 C:\builtfiles\Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip)"
+
+    - name: Upload Netch.x64
+      uses: actions/upload-artifact@v1
+      with:
+        name: Netch.x64
+        path: Netch\bin\x64\Release\win-x64
+        
+    - name: Upload Netch.x86
+      uses: actions/upload-artifact@v1
+      with:
+        name: Netch.x86
+        path: Netch\bin\x86\Release\win-x86
+
+     # Create a new release: create a tag, then 'git push origin <tagname>', wait for it to build      
+    - name: Create a new GitHub release if a new tag is pushed
+      uses: softprops/action-gh-release@v1
+      with:
+        name: ${{ env.GITHUB_TAG_NAME }}
+        prerelease: true
+        draft: false
+        files: |
+          C:\builtfiles\Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip
+          C:\builtfiles\Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip
+        body: |
+          
+          [![](https://img.shields.io/badge/Telegram-Channel-blue)](https://t.me/Netch) [![](https://img.shields.io/badge/Telegram-Group-green)](https://t.me/Netch_Discuss_Group)
+          
+          ## 更新日志：
+          * 这是 GitHub Action 自动化部署，更新日志应该很快会手动更新:D
+          
+          ## 文件校验
+          | 文件名 | SHA256 |
+          | :- | :- |
+          | <sub>Netch.x64-${{ env.GITHUB_TAG_NAME }}.zip</sub> | <sub>${{ env.Netch64_SHA256 }}</sub> |
+          | <sub>Netch.x86-${{ env.GITHUB_TAG_NAME }}.zip</sub> | <sub>${{ env.Netch86_SHA256 }}</sub> |
+      if: startsWith(github.ref, 'refs/tags/')
+      env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

GetSHA256.ps1

@@ -0,0 +1,5 @@
+param([string]$file)
+$hash = [Security.Cryptography.HashAlgorithm]::Create( "SHA256" )
+$stream = ([IO.StreamReader]$file).BaseStream
+-join ($hash.ComputeHash($stream) | ForEach { "{0:X2}" -f $_ })
+$stream.Close()

Netch/Controllers/DNSController.cs

@@ -1,14 +1,89 @@
-using System;
+using Netch.Forms;
+using System;
+using System.Diagnostics;
+using System.IO;
 using System.Net;
+using System.Threading;
 
 namespace Netch.Controllers
 {
     public class DNSController
     {
-        public static DNS.Server.DnsServer Server = new DNS.Server.DnsServer(new Resolver());
+        /// <summary>
+        ///		进程实例
+        /// </summary>
+        public Process Instance;
+
+        /// <summary>
+        /// 启动NatTypeTester
+        /// </summary>
+        /// <returns></returns>
+        public bool Start()
+        {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Starting dns2tcp Service")}");
+            try
+            {
+                if (!File.Exists("bin\\dns2tcp.exe"))
+                {
+                    return false;
+                }
+
+                Instance = MainController.GetProcess();
+                Instance.StartInfo.FileName = "bin\\dns2tcp.exe";
+
+                Instance.StartInfo.Arguments = " -L 127.0.0.1:53 -R 1.1.1.1:53";
+
+                Instance.OutputDataReceived += OnOutputDataReceived;
+                Instance.ErrorDataReceived += OnOutputDataReceived;
+
+                Instance.Start();
+                Instance.BeginOutputReadLine();
+                Instance.BeginErrorReadLine();
+                return true;
+            }
+            catch (Exception)
+            {
+                Utils.Logging.Info("dns2tcp 进程出错");
+                Stop();
+                return false;
+            }
+        }
+
+        /// <summary>
+        ///		停止
+        /// </summary>
+        public void Stop()
+        {
+            try
+            {
+                if (Instance != null && !Instance.HasExited)
+                {
+                    Instance.Kill();
+                }
+            }
+            catch (Exception e)
+            {
+                Utils.Logging.Info(e.ToString());
+            }
+        }
+
+        public void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            if (!string.IsNullOrWhiteSpace(e.Data))
+            {
+                if (File.Exists("logging\\dns2tcp.log"))
+                {
+                    File.Delete("logging\\dns2tcp.log");
+                }
+                File.AppendAllText("logging\\dns2tcp.log", $"{e.Data}\r\n");
+            }
+        }
+
+       /* public static DNS.Server.DnsServer Server = new DNS.Server.DnsServer(new Resolver());
 
         public bool Start()
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting LocalDns service")}");
             try
             {
                 _ = Server.Listen(new IPEndPoint(IPAddress.IPv6Any, 53));
@@ -32,6 +107,6 @@ namespace Netch.Controllers
             {
                 Utils.Logging.Info(e.ToString());
             }
-        }
+        }*/
     }
 }

Netch/Controllers/MainController.cs

@@ -1,11 +1,15 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 
 namespace Netch.Controllers
 {
     public class MainController
     {
+        [DllImport("dnsapi", EntryPoint = "DnsFlushResolverCache")]
+        public static extern UInt32 FlushDNSResolverCache();
         public static Process GetProcess()
         {
             var process = new Process();
@@ -51,6 +55,11 @@ namespace Netch.Controllers
         /// </summary>
         public TUNTAPController pTUNTAPController;
 
+        /// <summary>
+        ///		NTT 控制器
+        /// </summary>
+        public NTTController pNTTController;
+
         /// <summary>
         ///		启动
         /// </summary>
@@ -59,6 +68,8 @@ namespace Netch.Controllers
         /// <returns>是否启动成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            FlushDNSResolverCache();
+
             var result = false;
             switch (server.Type)
             {
@@ -106,8 +117,18 @@ namespace Netch.Controllers
                     {
                         pNFController = new NFController();
                     }
+                    if (pNTTController == null)
+                    {
+                        pNTTController = new NTTController();
+                    }
                     // 进程代理模式，启动 NF 控制器
                     result = pNFController.Start(server, mode);
+
+                    Task.Run(() =>
+                    {
+                        pNTTController.Start();
+                    });
+
                 }
                 else if (mode.Type == 1)
                 {
@@ -115,8 +136,17 @@ namespace Netch.Controllers
                     {
                         pTUNTAPController = new TUNTAPController();
                     }
+                    if (pNTTController == null)
+                    {
+                        pNTTController = new NTTController();
+                    }
                     // TUN/TAP 黑名单代理模式，启动 TUN/TAP 控制器
                     result = pTUNTAPController.Start(server, mode);
+
+                    Task.Run(() =>
+                    {
+                        pNTTController.Start();
+                    });
                 }
                 else if (mode.Type == 2)
                 {
@@ -124,8 +154,17 @@ namespace Netch.Controllers
                     {
                         pTUNTAPController = new TUNTAPController();
                     }
+                    if (pNTTController == null)
+                    {
+                        pNTTController = new NTTController();
+                    }
                     // TUN/TAP 白名单代理模式，启动 TUN/TAP 控制器
                     result = pTUNTAPController.Start(server, mode);
+
+                    Task.Run(() =>
+                    {
+                        pNTTController.Start();
+                    });
                 }
                 else if (mode.Type == 3 || mode.Type == 5)
                 {
@@ -171,7 +210,7 @@ namespace Netch.Controllers
             {
                 pVMessController.Stop();
             }
-            
+
             if (pNFController != null)
             {
                 pNFController.Stop();
@@ -184,10 +223,15 @@ namespace Netch.Controllers
             {
                 pHTTPController.Stop();
             }
-            
+
+            if (pNTTController != null)
+            {
+                pNTTController.Stop();
+            }
         }
 
-        public void KillProcess(string name) {
+        public void KillProcess(string name)
+        {
             var processes = Process.GetProcessesByName(name);
             foreach (var p in processes)
             {
@@ -198,7 +242,7 @@ namespace Netch.Controllers
             }
         }
 
-        private static bool IsChildProcess(Process process,string name)
+        private static bool IsChildProcess(Process process, string name)
         {
             bool result;
             try

Netch/Controllers/NFController.cs

@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.ServiceProcess;
@@ -39,6 +40,7 @@ namespace Netch.Controllers
         /// <returns>是否成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Redirector")}");
             if (!File.Exists("bin\\Redirector.exe"))
             {
                 return false;
@@ -47,9 +49,26 @@ namespace Netch.Controllers
             // 生成驱动文件路径
             var driver = string.Format("{0}\\drivers\\netfilter2.sys", Environment.SystemDirectory);
 
-            // 检查驱动是否存在
-            if (!File.Exists(driver))
+            if (File.Exists(driver))
             {
+                //为了防止小白一直问如何卸载老驱动核心，每次启动时卸载删除一次驱动，保证系统使用最新驱动核心(简单粗暴 但有效:D。增加启动成功率，驱动在被其他加速器占用的情况下可能会导致启动失败
+                try
+                {
+                    var service = new ServiceController("netfilter2");
+                    if (service.Status == ServiceControllerStatus.Running)
+                    {
+                        service.Stop();
+                        service.WaitForStatus(ServiceControllerStatus.Stopped);
+                    }
+                    nfapinet.NFAPI.nf_unRegisterDriver("netfilter2");
+
+                    File.Delete(driver);
+                }
+                catch (Exception)
+                {
+                    // 跳过
+                }
+
                 // 生成系统版本
                 var version = $"{Environment.OSVersion.Version.Major.ToString()}.{Environment.OSVersion.Version.Minor.ToString()}";
 
@@ -92,12 +111,17 @@ namespace Netch.Controllers
                     return false;
                 }
             }
+            // 检查驱动是否存在
+            /*if (!File.Exists(driver))
+            {
+            }*/
 
             try
             {
                 var service = new ServiceController("netfilter2");
                 if (service.Status == ServiceControllerStatus.Stopped)
                 {
+                    MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting netfilter2 Service")}");
                     service.Start();
                 }
             }
@@ -113,7 +137,8 @@ namespace Netch.Controllers
                 }
             }
 
-            var processes = "";
+            var processes = "NTT.exe,";
+
             foreach (var proc in mode.Rule)
             {
                 processes += proc;
@@ -147,7 +172,7 @@ namespace Netch.Controllers
                 }
             }
 
-            Instance.StartInfo.Arguments = fallback + $" -t {Global.Settings.RedirectorTCPPort}";
+            Instance.StartInfo.Arguments = fallback;
             Instance.OutputDataReceived += OnOutputDataReceived;
             Instance.ErrorDataReceived += OnOutputDataReceived;
             State = Models.State.Starting;
@@ -155,7 +180,6 @@ namespace Netch.Controllers
             Instance.BeginOutputReadLine();
             Instance.BeginErrorReadLine();
 
-            var IsFallback = false;
             for (var i = 0; i < 1000; i++)
             {
                 Thread.Sleep(10);
@@ -164,33 +188,6 @@ namespace Netch.Controllers
                 {
                     return true;
                 }
-
-                if (State == Models.State.Stopped)
-                {
-                    if (!IsFallback)
-                    {
-                        IsFallback = true;
-                        Stop();
-                        Utils.Logging.Info($"尝试去除 \"-t {Global.Settings.RedirectorTCPPort}\" 参数后启动 \"bin\\Redirector.exe\"");
-                        Instance.StartInfo.Arguments = fallback;
-                        Utils.Logging.Info($"当前 \"bin\\Redirector.exe\" 启动参数为 \"{Instance.StartInfo.Arguments}\"");
-                        Global.Settings.RedirectorTCPPort = 2800;
-                        Instance.CancelOutputRead();
-                        Instance.CancelErrorRead();
-                        Instance.OutputDataReceived += OnOutputDataReceived;
-                        Instance.ErrorDataReceived += OnOutputDataReceived;
-                        State = Models.State.Starting;
-                        Instance.Start();
-                        Instance.BeginOutputReadLine();
-                        Instance.BeginErrorReadLine();
-                    }
-                    else
-                    {
-                        Utils.Logging.Info("NF 进程启动失败");
-                        Stop();
-                        return false;
-                    }
-                }
             }
 
             Utils.Logging.Info("NF 进程启动超时");
@@ -229,7 +226,7 @@ namespace Netch.Controllers
                     {
                         State = Models.State.Stopped;
                     }
-                    else if (e.Data.Contains("Started"))
+                    else if (e.Data.Contains("Started") || e.Data.Contains("Redirect to"))
                     {
                         State = Models.State.Started;
                     }

Netch/Controllers/NTTController.cs

@@ -0,0 +1,95 @@
+using Netch.Forms;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+
+namespace Netch.Controllers
+{
+    public class NTTController
+    {
+        /// <summary>
+        ///		进程实例
+        /// </summary>
+        public Process Instance;
+
+        /// <summary>
+        ///		当前状态
+        /// </summary>
+        public Models.State State = Models.State.Waiting;
+
+        /// <summary>
+        /// 启动NatTypeTester
+        /// </summary>
+        /// <returns></returns>
+        public (bool, string, string, string) Start()
+        {
+            MainForm.Instance.NatTypeStatusText($"{Utils.i18N.Translate("Starting NatTester")}");
+            try
+            {
+                if (!File.Exists("bin\\NTT.exe"))
+                {
+                    return (false, null, null, null);
+                }
+
+                Instance = MainController.GetProcess();
+                Instance.StartInfo.FileName = "bin\\NTT.exe";
+
+                Instance.StartInfo.Arguments = $" {Global.Settings.STUN_Server} {Global.Settings.STUN_Server_Port}";
+
+                Instance.OutputDataReceived += OnOutputDataReceived;
+                Instance.ErrorDataReceived += OnOutputDataReceived;
+
+                State = Models.State.Starting;
+                Instance.Start();
+                Instance.BeginOutputReadLine();
+                Instance.BeginErrorReadLine();
+                Instance.WaitForExit();
+
+                string[] result = File.ReadAllText("logging\\NTT.log").ToString().Split('#');
+                var natType = result[0];
+                var localEnd = result[1];
+                var publicEnd = result[2];
+                MainForm.Instance.NatTypeStatusText(natType);
+
+                return (true, natType, localEnd, publicEnd);
+            }
+            catch (Exception)
+            {
+                Utils.Logging.Info("NTT 进程出错");
+                Stop();
+                return (false, null, null, null);
+            }
+        }
+
+        /// <summary>
+        ///		停止
+        /// </summary>
+        public void Stop()
+        {
+            try
+            {
+                if (Instance != null && !Instance.HasExited)
+                {
+                    Instance.Kill();
+                }
+            }
+            catch (Exception e)
+            {
+                Utils.Logging.Info(e.ToString());
+            }
+        }
+
+        public void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            if (!string.IsNullOrWhiteSpace(e.Data))
+            {
+                if (File.Exists("logging\\NTT.log"))
+                {
+                    File.Delete("logging\\NTT.log");
+                }
+                File.AppendAllText("logging\\NTT.log", $"{e.Data}\r\n");
+            }
+        }
+    }
+}

Netch/Controllers/SSController.cs

@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -25,6 +26,7 @@ namespace Netch.Controllers
         /// <returns>是否启动成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Shadowsocks")}");
             if (!File.Exists("bin\\Shadowsocks.exe"))
             {
                 return false;

Netch/Controllers/SSRController.cs

@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -25,6 +26,7 @@ namespace Netch.Controllers
         /// <returns>是否启动成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting ShadowsocksR")}");
             if (!File.Exists("bin\\ShadowsocksR.exe"))
             {
                 return false;

Netch/Controllers/TUNTAPController.cs

@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Text;
 using System.Threading;
+using Netch.Forms;
+using Netch.Utils;
 
 namespace Netch.Controllers
 {
@@ -31,10 +34,13 @@ namespace Netch.Controllers
         public Models.Mode SavedMode = new Models.Mode();
 
         /// <summary>
-        ///     本地 DNS 服务控制器
+        ///		本地 DNS 服务控制器
         /// </summary>
         public DNSController pDNSController = new DNSController();
 
+        // ByPassLan IP
+        List<string> BypassLanIPs = new List<string>() { "10.0.0.0/8", "172.16.0.0/16", "192.168.0.0/24" };
+
         /// <summary>
         ///     配置 TUNTAP 适配器
         /// </summary>
@@ -61,6 +67,7 @@ namespace Netch.Controllers
         /// </summary>
         public bool SetupBypass()
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("SetupBypass")}");
             // 让服务器 IP 走直连
             foreach (var address in ServerAddresses)
             {
@@ -98,6 +105,17 @@ namespace Netch.Controllers
                 }
             }
 
+            foreach (var ip in BypassLanIPs)
+            {
+                var info = ip.Split('/');
+                var address = IPAddress.Parse(info[0]);
+
+                if (!IPAddress.IsLoopback(address))
+                {
+                    NativeMethods.CreateRoute(address.ToString(), int.Parse(info[1]), Global.Adapter.Gateway.ToString(), Global.Adapter.Index);
+                }
+            }
+
             if (SavedMode.Type == 2) // 处理仅规则内走直连
             {
                 // 将 TUN/TAP 网卡权重放到最高
@@ -154,6 +172,54 @@ namespace Netch.Controllers
                         }
                     }
                 }
+                //处理NAT类型检测，由于协议的原因，无法仅通过域名确定需要代理的IP，自己记录解析了返回的IP，仅支持默认检测服务器
+                if (Global.Settings.STUN_Server == "stun.stunprotocol.org")
+                {
+                    try
+                    {
+                        var nttAddress = Dns.GetHostAddresses(Global.Settings.STUN_Server)[0];
+                        if (int.TryParse("32", out var prefix))
+                        {
+                            NativeMethods.CreateRoute(nttAddress.ToString(), prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                        var nttrAddress = Dns.GetHostAddresses("stunresponse.coldthunder11.com")[0];
+                        if (int.TryParse("32", out var prefixr))
+                        {
+                            NativeMethods.CreateRoute(nttrAddress.ToString(), prefixr, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                    }
+                    catch
+                    {
+                        Logging.Info("NAT类型测试域名解析失败，将不会被添加到代理列表。");
+                    }
+                }
+                //处理DNS代理
+                if (Global.Settings.TUNTAP.ProxyDNS)
+                {
+                    if (Global.Settings.TUNTAP.UseCustomDNS)
+                    {
+                        string dns = "";
+                        foreach (var value in Global.Settings.TUNTAP.DNS)
+                        {
+                            dns += value;
+                            dns += ',';
+                        }
+
+                        dns = dns.Trim();
+                        dns = dns.Substring(0, dns.Length - 1);
+                        if (int.TryParse("32", out var prefix))
+                        {
+                            NativeMethods.CreateRoute(dns, prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                    }
+                    else
+                    {
+                        if (int.TryParse("32", out var prefix))
+                        {
+                            NativeMethods.CreateRoute("1.1.1.1", prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                    }
+                }
             }
             return true;
         }
@@ -195,6 +261,49 @@ namespace Netch.Controllers
                         }
                     }
                 }
+                if (Global.Settings.STUN_Server == "stun.stunprotocol.org")
+                {
+                    try
+                    {
+                        var nttAddress = Dns.GetHostAddresses(Global.Settings.STUN_Server)[0];
+                        if (int.TryParse("32", out var prefix))
+                        {
+                            NativeMethods.DeleteRoute(nttAddress.ToString(), prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                        var nttrAddress = Dns.GetHostAddresses("stunresponse.coldthunder11.com")[0];
+                        if (int.TryParse("32", out var prefixr))
+                        {
+                            NativeMethods.DeleteRoute(nttrAddress.ToString(), prefixr, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                    }
+                    catch { }
+                }
+                if (Global.Settings.TUNTAP.ProxyDNS)
+                {
+                    if (Global.Settings.TUNTAP.UseCustomDNS)
+                    {
+                        string dns = "";
+                        foreach (var value in Global.Settings.TUNTAP.DNS)
+                        {
+                            dns += value;
+                            dns += ',';
+                        }
+
+                        dns = dns.Trim();
+                        dns = dns.Substring(0, dns.Length - 1);
+                        if (int.TryParse("32", out var prefix))
+                        {
+                            NativeMethods.DeleteRoute(dns, prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                    }
+                    else
+                    {
+                        if (int.TryParse("32", out var prefix))
+                        {
+                            NativeMethods.DeleteRoute("1.1.1.1", prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                        }
+                    }
+                }
             }
 
             foreach (var ip in Global.Settings.BypassIPs)
@@ -207,6 +316,16 @@ namespace Netch.Controllers
                     NativeMethods.DeleteRoute(address.ToString(), int.Parse(info[1]), Global.Adapter.Gateway.ToString(), Global.Adapter.Index);
                 }
             }
+            foreach (var ip in BypassLanIPs)
+            {
+                var info = ip.Split('/');
+                var address = IPAddress.Parse(info[0]);
+
+                if (!IPAddress.IsLoopback(address))
+                {
+                    NativeMethods.DeleteRoute(address.ToString(), int.Parse(info[1]), Global.Adapter.Gateway.ToString(), Global.Adapter.Index);
+                }
+            }
 
             if (SavedMode.BypassChina)
             {
@@ -240,6 +359,7 @@ namespace Netch.Controllers
         /// <returns>是否成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Tap")}");
             foreach (var proc in Process.GetProcessesByName("tun2socks"))
             {
                 try
@@ -269,12 +389,16 @@ namespace Netch.Controllers
             {
                 return false;
             }
-            
+
+            Logging.Info("设置绕行规则");
             SetupBypass();
+            Logging.Info("设置绕行规则完毕");
 
             Instance = new Process();
             Instance.StartInfo.WorkingDirectory = string.Format("{0}\\bin", Directory.GetCurrentDirectory());
             Instance.StartInfo.FileName = string.Format("{0}\\bin\\tun2socks.exe", Directory.GetCurrentDirectory());
+            var adapterName = TUNTAP.GetName(Global.TUNTAP.ComponentID);
+            Logging.Info($"tun2sock使用适配器：{adapterName}");
 
             string dns;
             if (Global.Settings.TUNTAP.UseCustomDNS)
@@ -293,15 +417,16 @@ namespace Netch.Controllers
             {
                 pDNSController.Start();
                 dns = "127.0.0.1";
+                //dns = "1.1.1.1,1.0.0.1";
             }
 
             if (server.Type == "Socks5")
             {
-                Instance.StartInfo.Arguments = string.Format("-proxyServer {0}:{1} -tunAddr {2} -tunMask {3} -tunGw {4} -tunDns {5} -tunName \"{6}\"", server.Hostname, server.Port, Global.Settings.TUNTAP.Address, Global.Settings.TUNTAP.Netmask, Global.Settings.TUNTAP.Gateway, dns, Global.TUNTAP.Adapter.Name);
+                Instance.StartInfo.Arguments = string.Format("-proxyServer {0}:{1} -tunAddr {2} -tunMask {3} -tunGw {4} -tunDns {5} -tunName \"{6}\"", server.Hostname, server.Port, Global.Settings.TUNTAP.Address, Global.Settings.TUNTAP.Netmask, Global.Settings.TUNTAP.Gateway, dns, adapterName);
             }
             else
             {
-                Instance.StartInfo.Arguments = string.Format("-proxyServer 127.0.0.1:{0} -tunAddr {1} -tunMask {2} -tunGw {3} -tunDns {4} -tunName \"{5}\"", Global.Settings.Socks5LocalPort, Global.Settings.TUNTAP.Address, Global.Settings.TUNTAP.Netmask, Global.Settings.TUNTAP.Gateway, dns, Global.TUNTAP.Adapter.Name);
+                Instance.StartInfo.Arguments = string.Format("-proxyServer 127.0.0.1:{0} -tunAddr {1} -tunMask {2} -tunGw {3} -tunDns {4} -tunName \"{5}\"", Global.Settings.Socks5LocalPort, Global.Settings.TUNTAP.Address, Global.Settings.TUNTAP.Netmask, Global.Settings.TUNTAP.Gateway, dns, adapterName);
             }
 
             Instance.StartInfo.CreateNoWindow = true;
@@ -353,6 +478,7 @@ namespace Netch.Controllers
                 //pDNSController.Stop();
                 //修复点击停止按钮后再启动，DNS服务没监听的BUG
                 ClearBypass();
+                pDNSController.Stop();
             }
             catch (Exception e)
             {

Netch/Controllers/UpdateChecker.cs

@@ -26,7 +26,7 @@ namespace Netch.Controllers
 
         public const string Name = @"Netch";
         public const string Copyright = @"Copyright © 2019 - 2020";
-        public const string Version = @"1.3.8";
+        public const string Version = @"1.4.0";
 
         public async void Check(bool notifyNoFound, bool isPreRelease)
         {

Netch/Controllers/VMessController.cs

@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -26,6 +27,7 @@ namespace Netch.Controllers
         /// <returns>是否启动成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting V2ray")}");
             if (!File.Exists("bin\\v2ray.exe") || !File.Exists("bin\\v2ctl.exe"))
             {
                 return false;

Netch/Forms/MainForm.Designer.cs

@@ -78,6 +78,7 @@ namespace Netch.Forms
             this.SettingsButton = new System.Windows.Forms.Button();
             this.ProfileGroupBox = new System.Windows.Forms.GroupBox();
             this.ProfileTable = new System.Windows.Forms.TableLayoutPanel();
+            this.NatTypeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
             this.MenuStrip.SuspendLayout();
             this.ConfigurationGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CopyLinkPictureBox)).BeginInit();
@@ -421,7 +422,8 @@ namespace Netch.Forms
             this.StatusLabel,
             this.UsedBandwidthLabel,
             this.DownloadSpeedLabel,
-            this.UploadSpeedLabel});
+            this.UploadSpeedLabel,
+            this.NatTypeStatusLabel});
             this.StatusStrip.Location = new System.Drawing.Point(0, 254);
             this.StatusStrip.Name = "StatusStrip";
             this.StatusStrip.Size = new System.Drawing.Size(629, 22);
@@ -534,6 +536,12 @@ namespace Netch.Forms
             this.ProfileTable.Size = new System.Drawing.Size(599, 43);
             this.ProfileTable.TabIndex = 0;
             // 
+            // NatTypeStatusLabel
+            // 
+            this.NatTypeStatusLabel.Name = "NatTypeStatusLabel";
+            this.NatTypeStatusLabel.Size = new System.Drawing.Size(109, 17);
+            this.NatTypeStatusLabel.Text = "";
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -623,5 +631,6 @@ namespace Netch.Forms
         private System.Windows.Forms.PictureBox EditModePictureBox;
         private System.Windows.Forms.PictureBox DeleteModePictureBox;
         private System.Windows.Forms.PictureBox CopyLinkPictureBox;
+        private System.Windows.Forms.ToolStripStatusLabel NatTypeStatusLabel;
     }
 }

Netch/Forms/MainForm.cs

@@ -41,6 +41,11 @@ namespace Netch.Forms
 
         public List<Button> ProfileButtons = new List<Button>();
 
+        /// <summary>
+        /// 主窗体的静态实例
+        /// </summary>
+        public static MainForm Instance = null;
+
         public MainForm()
         {
             InitializeComponent();
@@ -48,6 +53,7 @@ namespace Netch.Forms
 
             CheckForIllegalCrossThreadCalls = false;
             // MenuStrip.Renderer = new Override.ToolStripProfessionalRender();
+            Instance = this;
         }
 
         private void CheckUpdate()
@@ -232,60 +238,66 @@ namespace Netch.Forms
 
         private void ComboBox_DrawItem(object sender, DrawItemEventArgs e)
         {
-            var cbx = sender as ComboBox;
-
-            // 绘制背景颜色
-            e.Graphics.FillRectangle(new SolidBrush(Color.White), e.Bounds);
-
-            if (e.Index >= 0)
+            try
             {
-                // 绘制 备注/名称 字符串
-                e.Graphics.DrawString(cbx.Items[e.Index].ToString(), cbx.Font, new SolidBrush(Color.Black), e.Bounds);
 
-                if (cbx.Items[e.Index] is Models.Server)
+                var cbx = sender as ComboBox;
+
+                // 绘制背景颜色
+                e.Graphics.FillRectangle(new SolidBrush(Color.White), e.Bounds);
+
+                if (e.Index >= 0)
                 {
-                    var item = cbx.Items[e.Index] as Models.Server;
+                    // 绘制 备注/名称 字符串
+                    e.Graphics.DrawString(cbx.Items[e.Index].ToString(), cbx.Font, new SolidBrush(Color.Black), e.Bounds);
 
-                    // 计算延迟底色
-                    SolidBrush brush;
-                    if (item.Delay > 200)
+                    if (cbx.Items[e.Index] is Models.Server)
                     {
-                        // 红色
-                        brush = new SolidBrush(Color.Red);
+                        var item = cbx.Items[e.Index] as Models.Server;
+
+                        // 计算延迟底色
+                        SolidBrush brush;
+                        if (item.Delay > 200)
+                        {
+                            // 红色
+                            brush = new SolidBrush(Color.Red);
+                        }
+                        else if (item.Delay > 80)
+                        {
+                            // 黄色
+                            brush = new SolidBrush(Color.Yellow);
+                        }
+                        else if (item.Delay >= 0)
+                        {
+                            // 绿色
+                            brush = new SolidBrush(Color.FromArgb(50, 255, 56));
+                        }
+                        else
+                        {
+                            // 灰色
+                            brush = new SolidBrush(Color.Gray);
+                        }
+
+                        // 绘制延迟底色
+                        e.Graphics.FillRectangle(brush, ServerComboBox.Size.Width - 60, e.Bounds.Y, 60, e.Bounds.Height);
+
+                        // 绘制延迟字符串
+                        e.Graphics.DrawString(item.Delay.ToString(), cbx.Font, new SolidBrush(Color.Black), ServerComboBox.Size.Width - 58, e.Bounds.Y);
                     }
-                    else if (item.Delay > 80)
+                    else if (cbx.Items[e.Index] is Models.Mode)
                     {
-                        // 黄色
-                        brush = new SolidBrush(Color.Yellow);
+                        var item = cbx.Items[e.Index] as Models.Mode;
+
+                        // 绘制延迟底色
+                        e.Graphics.FillRectangle(new SolidBrush(Color.Gray), ServerComboBox.Size.Width - 60, e.Bounds.Y, 60, e.Bounds.Height);
+
+                        // 绘制延迟字符串
+                        e.Graphics.DrawString(item.Rule.Count.ToString(), cbx.Font, new SolidBrush(Color.Black), ServerComboBox.Size.Width - 58, e.Bounds.Y);
                     }
-                    else if (item.Delay >= 0)
-                    {
-                        // 绿色
-                        brush = new SolidBrush(Color.FromArgb(50, 255, 56));
-                    }
-                    else
-                    {
-                        // 灰色
-                        brush = new SolidBrush(Color.Gray);
-                    }
-
-                    // 绘制延迟底色
-                    e.Graphics.FillRectangle(brush, ServerComboBox.Size.Width - 60, e.Bounds.Y, 60, e.Bounds.Height);
-
-                    // 绘制延迟字符串
-                    e.Graphics.DrawString(item.Delay.ToString(), cbx.Font, new SolidBrush(Color.Black), ServerComboBox.Size.Width - 58, e.Bounds.Y);
-                }
-                else if (cbx.Items[e.Index] is Models.Mode)
-                {
-                    var item = cbx.Items[e.Index] as Models.Mode;
-
-                    // 绘制延迟底色
-                    e.Graphics.FillRectangle(new SolidBrush(Color.Gray), ServerComboBox.Size.Width - 60, e.Bounds.Y, 60, e.Bounds.Height);
-
-                    // 绘制延迟字符串
-                    e.Graphics.DrawString(item.Rule.Count.ToString(), cbx.Font, new SolidBrush(Color.Black), ServerComboBox.Size.Width - 58, e.Bounds.Y);
                 }
             }
+            catch (Exception)
+            { }
         }
 
         private void MainForm_Load(object sender, EventArgs e)
@@ -476,6 +488,7 @@ namespace Netch.Forms
 
             if (Global.Settings.SubscribeLink.Count > 0)
             {
+                StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting update subscription")}";
                 DeletePictureBox.Enabled = false;
 
                 UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = false;
@@ -556,8 +569,10 @@ namespace Netch.Forms
                         MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = true;
                         ControlButton.Text = Utils.i18N.Translate("Start");
                         MainController.Stop();
+                        NatTypeStatusLabel.Text = "";
                     }
                     Utils.Configuration.Save();
+                    StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Subscription updated")}";
                 }).ContinueWith(task =>
                 {
                     BeginInvoke(new Action(() =>
@@ -759,6 +774,7 @@ namespace Netch.Forms
 
         private void ControlButton_Click(object sender, EventArgs e)
         {
+            SaveConfigs();
             if (State == Models.State.Waiting || State == Models.State.Stopped)
             {
                 // 当前 ServerComboBox 中至少有一项
@@ -786,7 +802,10 @@ namespace Netch.Forms
                     var mode = ModeComboBox.SelectedItem as Models.Mode;
 
                     MainController = new MainController();
-                    if (MainController.Start(server, mode))
+
+                    var startResult = MainController.Start(server, mode);
+
+                    if (startResult)
                     {
                         // UsedBandwidthLabel.Visible = UploadSpeedLabel.Visible = DownloadSpeedLabel.Visible = true;
                         // MainController.pNFController.OnBandwidthUpdated += OnBandwidthUpdated;
@@ -856,6 +875,25 @@ namespace Netch.Forms
                         }
 
                         State = Models.State.Started;
+                        // 自动检测延迟
+                        Task.Run(() =>
+                        {
+                            while (true)
+                            {
+                                if (State == Models.State.Started)
+                                {
+                                    server.Test();
+                                    // 重载服务器列表
+                                    InitServer();
+
+                                    Thread.Sleep(1000);
+                                }
+                                else
+                                {
+                                    break;
+                                }
+                            }
+                        });
                     }
                     else
                     {
@@ -883,6 +921,7 @@ namespace Netch.Forms
                     var mode = ModeComboBox.SelectedItem as Models.Mode;
 
                     MainController.Stop();
+                    NatTypeStatusLabel.Text = "";
 
                     // LastUploadBandwidth = 0;
                     // LastDownloadBandwidth = 0;
@@ -998,6 +1037,10 @@ namespace Netch.Forms
                 {
                     MessageBox.Show(Utils.i18N.Translate("Please select an mode first"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
+                else if (ProfileNameText.Text == "")
+                {
+                    MessageBox.Show(Utils.i18N.Translate("Please enter a profile name first"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
                 else
                 {
                     SaveProfile(index);
@@ -1006,6 +1049,11 @@ namespace Netch.Forms
             }
             else
             {
+                if (ProfileButtons[index].Text == Utils.i18N.Translate("Error") || ProfileButtons[index].Text == Utils.i18N.Translate("None"))
+                {
+                    MessageBox.Show(Utils.i18N.Translate("No saved profile here. Save a profile first by Ctrl+Click on the button"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+
                 try
                 {
                     ProfileNameText.Text = LoadProfile(index);
@@ -1201,5 +1249,20 @@ namespace Netch.Forms
                 MessageBox.Show(Utils.i18N.Translate("Please select a server first"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
+        public void StatusText(string text)
+        {
+            StatusLabel.Text = text;
+        }
+        public void NatTypeStatusText(string text)
+        {
+            if (!string.IsNullOrWhiteSpace(text))
+            {
+                NatTypeStatusLabel.Text = "NAT" + Utils.i18N.Translate(": ") + text;
+            }
+            else
+            {
+                NatTypeStatusLabel.Text = "NAT" + Utils.i18N.Translate(": ") + Utils.i18N.Translate("Test failed");
+            }
+        }
     }
 }

Netch/Forms/SettingForm.Designer.cs

@@ -30,14 +30,13 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingForm));
             this.PortGroupBox = new System.Windows.Forms.GroupBox();
-            this.RedirectorLabel = new System.Windows.Forms.Label();
-            this.RedirectorTextBox = new System.Windows.Forms.TextBox();
             this.AllowDevicesCheckBox = new System.Windows.Forms.CheckBox();
             this.HTTPPortLabel = new System.Windows.Forms.Label();
             this.HTTPPortTextBox = new System.Windows.Forms.TextBox();
             this.Socks5PortLabel = new System.Windows.Forms.Label();
             this.Socks5PortTextBox = new System.Windows.Forms.TextBox();
             this.TUNTAPGroupBox = new System.Windows.Forms.GroupBox();
+            this.TUNTAPProxyDNSCheckBox = new System.Windows.Forms.CheckBox();
             this.TUNTAPUseCustomDNSCheckBox = new System.Windows.Forms.CheckBox();
             this.TUNTAPDNSLabel = new System.Windows.Forms.Label();
             this.TUNTAPDNSTextBox = new System.Windows.Forms.TextBox();
@@ -50,7 +49,11 @@
             this.ControlButton = new System.Windows.Forms.Button();
             this.GlobalBypassIPsButton = new System.Windows.Forms.Button();
             this.BehaviorGroupBox = new System.Windows.Forms.GroupBox();
+            this.STUN_ServerPortTextBox = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
             this.RunAtStartup = new System.Windows.Forms.CheckBox();
+            this.STUN_ServerTextBox = new System.Windows.Forms.TextBox();
             this.MinimizeWhenStartedCheckBox = new System.Windows.Forms.CheckBox();
             this.ProfileCount_Label = new System.Windows.Forms.Label();
             this.ProfileCount_TextBox = new System.Windows.Forms.TextBox();
@@ -65,43 +68,27 @@
             // 
             // PortGroupBox
             // 
-            this.PortGroupBox.Controls.Add(this.RedirectorLabel);
-            this.PortGroupBox.Controls.Add(this.RedirectorTextBox);
             this.PortGroupBox.Controls.Add(this.AllowDevicesCheckBox);
             this.PortGroupBox.Controls.Add(this.HTTPPortLabel);
             this.PortGroupBox.Controls.Add(this.HTTPPortTextBox);
             this.PortGroupBox.Controls.Add(this.Socks5PortLabel);
             this.PortGroupBox.Controls.Add(this.Socks5PortTextBox);
-            this.PortGroupBox.Location = new System.Drawing.Point(12, 12);
+            this.PortGroupBox.Location = new System.Drawing.Point(18, 18);
+            this.PortGroupBox.Margin = new System.Windows.Forms.Padding(4);
             this.PortGroupBox.Name = "PortGroupBox";
-            this.PortGroupBox.Size = new System.Drawing.Size(420, 140);
+            this.PortGroupBox.Padding = new System.Windows.Forms.Padding(4);
+            this.PortGroupBox.Size = new System.Drawing.Size(630, 210);
             this.PortGroupBox.TabIndex = 0;
             this.PortGroupBox.TabStop = false;
             this.PortGroupBox.Text = "Local Port";
             // 
-            // RedirectorLabel
-            // 
-            this.RedirectorLabel.AutoSize = true;
-            this.RedirectorLabel.Location = new System.Drawing.Point(9, 110);
-            this.RedirectorLabel.Name = "RedirectorLabel";
-            this.RedirectorLabel.Size = new System.Drawing.Size(95, 17);
-            this.RedirectorLabel.TabIndex = 6;
-            this.RedirectorLabel.Text = "Redirector TCP";
-            // 
-            // RedirectorTextBox
-            // 
-            this.RedirectorTextBox.Location = new System.Drawing.Point(120, 107);
-            this.RedirectorTextBox.Name = "RedirectorTextBox";
-            this.RedirectorTextBox.Size = new System.Drawing.Size(294, 23);
-            this.RedirectorTextBox.TabIndex = 7;
-            this.RedirectorTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
             // AllowDevicesCheckBox
             // 
             this.AllowDevicesCheckBox.AutoSize = true;
-            this.AllowDevicesCheckBox.Location = new System.Drawing.Point(120, 80);
+            this.AllowDevicesCheckBox.Location = new System.Drawing.Point(180, 120);
+            this.AllowDevicesCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.AllowDevicesCheckBox.Name = "AllowDevicesCheckBox";
-            this.AllowDevicesCheckBox.Size = new System.Drawing.Size(206, 21);
+            this.AllowDevicesCheckBox.Size = new System.Drawing.Size(301, 28);
             this.AllowDevicesCheckBox.TabIndex = 5;
             this.AllowDevicesCheckBox.Text = "Allow other Devices to connect";
             this.AllowDevicesCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -110,39 +97,44 @@
             // HTTPPortLabel
             // 
             this.HTTPPortLabel.AutoSize = true;
-            this.HTTPPortLabel.Location = new System.Drawing.Point(9, 54);
+            this.HTTPPortLabel.Location = new System.Drawing.Point(14, 81);
+            this.HTTPPortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.HTTPPortLabel.Name = "HTTPPortLabel";
-            this.HTTPPortLabel.Size = new System.Drawing.Size(38, 17);
+            this.HTTPPortLabel.Size = new System.Drawing.Size(55, 24);
             this.HTTPPortLabel.TabIndex = 3;
             this.HTTPPortLabel.Text = "HTTP";
             // 
             // HTTPPortTextBox
             // 
-            this.HTTPPortTextBox.Location = new System.Drawing.Point(120, 51);
+            this.HTTPPortTextBox.Location = new System.Drawing.Point(180, 76);
+            this.HTTPPortTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.HTTPPortTextBox.Name = "HTTPPortTextBox";
-            this.HTTPPortTextBox.Size = new System.Drawing.Size(294, 23);
+            this.HTTPPortTextBox.Size = new System.Drawing.Size(439, 31);
             this.HTTPPortTextBox.TabIndex = 4;
             this.HTTPPortTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // Socks5PortLabel
             // 
             this.Socks5PortLabel.AutoSize = true;
-            this.Socks5PortLabel.Location = new System.Drawing.Point(9, 25);
+            this.Socks5PortLabel.Location = new System.Drawing.Point(14, 38);
+            this.Socks5PortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Socks5PortLabel.Name = "Socks5PortLabel";
-            this.Socks5PortLabel.Size = new System.Drawing.Size(49, 17);
+            this.Socks5PortLabel.Size = new System.Drawing.Size(69, 24);
             this.Socks5PortLabel.TabIndex = 0;
             this.Socks5PortLabel.Text = "Socks5";
             // 
             // Socks5PortTextBox
             // 
-            this.Socks5PortTextBox.Location = new System.Drawing.Point(120, 22);
+            this.Socks5PortTextBox.Location = new System.Drawing.Point(180, 33);
+            this.Socks5PortTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.Socks5PortTextBox.Name = "Socks5PortTextBox";
-            this.Socks5PortTextBox.Size = new System.Drawing.Size(294, 23);
+            this.Socks5PortTextBox.Size = new System.Drawing.Size(439, 31);
             this.Socks5PortTextBox.TabIndex = 1;
             this.Socks5PortTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // TUNTAPGroupBox
             // 
+            this.TUNTAPGroupBox.Controls.Add(this.TUNTAPProxyDNSCheckBox);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPUseCustomDNSCheckBox);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPDNSLabel);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPDNSTextBox);
@@ -152,19 +144,33 @@
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPNetmaskTextBox);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPAddressLabel);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPAddressTextBox);
-            this.TUNTAPGroupBox.Location = new System.Drawing.Point(12, 158);
+            this.TUNTAPGroupBox.Location = new System.Drawing.Point(18, 237);
+            this.TUNTAPGroupBox.Margin = new System.Windows.Forms.Padding(4);
             this.TUNTAPGroupBox.Name = "TUNTAPGroupBox";
-            this.TUNTAPGroupBox.Size = new System.Drawing.Size(420, 164);
+            this.TUNTAPGroupBox.Padding = new System.Windows.Forms.Padding(4);
+            this.TUNTAPGroupBox.Size = new System.Drawing.Size(630, 281);
             this.TUNTAPGroupBox.TabIndex = 3;
             this.TUNTAPGroupBox.TabStop = false;
             this.TUNTAPGroupBox.Text = "TUN/TAP";
             // 
+            // TUNTAPProxyDNSCheckBox
+            // 
+            this.TUNTAPProxyDNSCheckBox.AutoSize = true;
+            this.TUNTAPProxyDNSCheckBox.Location = new System.Drawing.Point(180, 243);
+            this.TUNTAPProxyDNSCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.TUNTAPProxyDNSCheckBox.Name = "TUNTAPProxyDNSCheckBox";
+            this.TUNTAPProxyDNSCheckBox.Size = new System.Drawing.Size(221, 28);
+            this.TUNTAPProxyDNSCheckBox.TabIndex = 10;
+            this.TUNTAPProxyDNSCheckBox.Text = "Proxy DNS in Mode 2";
+            this.TUNTAPProxyDNSCheckBox.UseVisualStyleBackColor = true;
+            // 
             // TUNTAPUseCustomDNSCheckBox
             // 
             this.TUNTAPUseCustomDNSCheckBox.AutoSize = true;
-            this.TUNTAPUseCustomDNSCheckBox.Location = new System.Drawing.Point(120, 138);
+            this.TUNTAPUseCustomDNSCheckBox.Location = new System.Drawing.Point(180, 207);
+            this.TUNTAPUseCustomDNSCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.TUNTAPUseCustomDNSCheckBox.Name = "TUNTAPUseCustomDNSCheckBox";
-            this.TUNTAPUseCustomDNSCheckBox.Size = new System.Drawing.Size(127, 21);
+            this.TUNTAPUseCustomDNSCheckBox.Size = new System.Drawing.Size(182, 28);
             this.TUNTAPUseCustomDNSCheckBox.TabIndex = 9;
             this.TUNTAPUseCustomDNSCheckBox.Text = "Use Custom DNS";
             this.TUNTAPUseCustomDNSCheckBox.UseVisualStyleBackColor = true;
@@ -173,77 +179,86 @@
             // TUNTAPDNSLabel
             // 
             this.TUNTAPDNSLabel.AutoSize = true;
-            this.TUNTAPDNSLabel.Location = new System.Drawing.Point(9, 112);
+            this.TUNTAPDNSLabel.Location = new System.Drawing.Point(14, 168);
+            this.TUNTAPDNSLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.TUNTAPDNSLabel.Name = "TUNTAPDNSLabel";
-            this.TUNTAPDNSLabel.Size = new System.Drawing.Size(34, 17);
+            this.TUNTAPDNSLabel.Size = new System.Drawing.Size(49, 24);
             this.TUNTAPDNSLabel.TabIndex = 7;
             this.TUNTAPDNSLabel.Text = "DNS";
             // 
             // TUNTAPDNSTextBox
             // 
-            this.TUNTAPDNSTextBox.Location = new System.Drawing.Point(120, 110);
+            this.TUNTAPDNSTextBox.Location = new System.Drawing.Point(180, 165);
+            this.TUNTAPDNSTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.TUNTAPDNSTextBox.Name = "TUNTAPDNSTextBox";
-            this.TUNTAPDNSTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPDNSTextBox.Size = new System.Drawing.Size(439, 31);
             this.TUNTAPDNSTextBox.TabIndex = 8;
             this.TUNTAPDNSTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // TUNTAPGatewayLabel
             // 
             this.TUNTAPGatewayLabel.AutoSize = true;
-            this.TUNTAPGatewayLabel.Location = new System.Drawing.Point(9, 83);
+            this.TUNTAPGatewayLabel.Location = new System.Drawing.Point(14, 124);
+            this.TUNTAPGatewayLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.TUNTAPGatewayLabel.Name = "TUNTAPGatewayLabel";
-            this.TUNTAPGatewayLabel.Size = new System.Drawing.Size(57, 17);
+            this.TUNTAPGatewayLabel.Size = new System.Drawing.Size(84, 24);
             this.TUNTAPGatewayLabel.TabIndex = 5;
             this.TUNTAPGatewayLabel.Text = "Gateway";
             // 
             // TUNTAPGatewayTextBox
             // 
-            this.TUNTAPGatewayTextBox.Location = new System.Drawing.Point(120, 80);
+            this.TUNTAPGatewayTextBox.Location = new System.Drawing.Point(180, 120);
+            this.TUNTAPGatewayTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.TUNTAPGatewayTextBox.Name = "TUNTAPGatewayTextBox";
-            this.TUNTAPGatewayTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPGatewayTextBox.Size = new System.Drawing.Size(439, 31);
             this.TUNTAPGatewayTextBox.TabIndex = 6;
             this.TUNTAPGatewayTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // TUNTAPNetmaskLabel
             // 
             this.TUNTAPNetmaskLabel.AutoSize = true;
-            this.TUNTAPNetmaskLabel.Location = new System.Drawing.Point(9, 54);
+            this.TUNTAPNetmaskLabel.Location = new System.Drawing.Point(14, 81);
+            this.TUNTAPNetmaskLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.TUNTAPNetmaskLabel.Name = "TUNTAPNetmaskLabel";
-            this.TUNTAPNetmaskLabel.Size = new System.Drawing.Size(60, 17);
+            this.TUNTAPNetmaskLabel.Size = new System.Drawing.Size(87, 24);
             this.TUNTAPNetmaskLabel.TabIndex = 3;
             this.TUNTAPNetmaskLabel.Text = "Netmask";
             // 
             // TUNTAPNetmaskTextBox
             // 
-            this.TUNTAPNetmaskTextBox.Location = new System.Drawing.Point(120, 51);
+            this.TUNTAPNetmaskTextBox.Location = new System.Drawing.Point(180, 76);
+            this.TUNTAPNetmaskTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.TUNTAPNetmaskTextBox.Name = "TUNTAPNetmaskTextBox";
-            this.TUNTAPNetmaskTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPNetmaskTextBox.Size = new System.Drawing.Size(439, 31);
             this.TUNTAPNetmaskTextBox.TabIndex = 4;
             this.TUNTAPNetmaskTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // TUNTAPAddressLabel
             // 
             this.TUNTAPAddressLabel.AutoSize = true;
-            this.TUNTAPAddressLabel.Location = new System.Drawing.Point(9, 25);
+            this.TUNTAPAddressLabel.Location = new System.Drawing.Point(14, 38);
+            this.TUNTAPAddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.TUNTAPAddressLabel.Name = "TUNTAPAddressLabel";
-            this.TUNTAPAddressLabel.Size = new System.Drawing.Size(56, 17);
+            this.TUNTAPAddressLabel.Size = new System.Drawing.Size(80, 24);
             this.TUNTAPAddressLabel.TabIndex = 1;
             this.TUNTAPAddressLabel.Text = "Address";
             // 
             // TUNTAPAddressTextBox
             // 
-            this.TUNTAPAddressTextBox.Location = new System.Drawing.Point(120, 22);
+            this.TUNTAPAddressTextBox.Location = new System.Drawing.Point(180, 33);
+            this.TUNTAPAddressTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.TUNTAPAddressTextBox.Name = "TUNTAPAddressTextBox";
-            this.TUNTAPAddressTextBox.Size = new System.Drawing.Size(294, 23);
+            this.TUNTAPAddressTextBox.Size = new System.Drawing.Size(439, 31);
             this.TUNTAPAddressTextBox.TabIndex = 2;
             this.TUNTAPAddressTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // ControlButton
             // 
             this.ControlButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ControlButton.Location = new System.Drawing.Point(357, 549);
+            this.ControlButton.Location = new System.Drawing.Point(536, 1018);
+            this.ControlButton.Margin = new System.Windows.Forms.Padding(4);
             this.ControlButton.Name = "ControlButton";
-            this.ControlButton.Size = new System.Drawing.Size(75, 23);
+            this.ControlButton.Size = new System.Drawing.Size(112, 34);
             this.ControlButton.TabIndex = 11;
             this.ControlButton.Text = "Save";
             this.ControlButton.UseVisualStyleBackColor = true;
@@ -252,9 +267,10 @@
             // GlobalBypassIPsButton
             // 
             this.GlobalBypassIPsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.GlobalBypassIPsButton.Location = new System.Drawing.Point(12, 549);
+            this.GlobalBypassIPsButton.Location = new System.Drawing.Point(18, 1018);
+            this.GlobalBypassIPsButton.Margin = new System.Windows.Forms.Padding(4);
             this.GlobalBypassIPsButton.Name = "GlobalBypassIPsButton";
-            this.GlobalBypassIPsButton.Size = new System.Drawing.Size(128, 23);
+            this.GlobalBypassIPsButton.Size = new System.Drawing.Size(192, 34);
             this.GlobalBypassIPsButton.TabIndex = 10;
             this.GlobalBypassIPsButton.Text = "Global Bypass IPs";
             this.GlobalBypassIPsButton.UseVisualStyleBackColor = true;
@@ -262,7 +278,11 @@
             // 
             // BehaviorGroupBox
             // 
+            this.BehaviorGroupBox.Controls.Add(this.STUN_ServerPortTextBox);
+            this.BehaviorGroupBox.Controls.Add(this.label2);
+            this.BehaviorGroupBox.Controls.Add(this.label1);
             this.BehaviorGroupBox.Controls.Add(this.RunAtStartup);
+            this.BehaviorGroupBox.Controls.Add(this.STUN_ServerTextBox);
             this.BehaviorGroupBox.Controls.Add(this.MinimizeWhenStartedCheckBox);
             this.BehaviorGroupBox.Controls.Add(this.ProfileCount_Label);
             this.BehaviorGroupBox.Controls.Add(this.ProfileCount_TextBox);
@@ -270,29 +290,71 @@
             this.BehaviorGroupBox.Controls.Add(this.StartWhenOpenedCheckBox);
             this.BehaviorGroupBox.Controls.Add(this.StopWhenExitedCheckBox);
             this.BehaviorGroupBox.Controls.Add(this.ExitWhenClosedCheckBox);
-            this.BehaviorGroupBox.Location = new System.Drawing.Point(12, 330);
+            this.BehaviorGroupBox.Location = new System.Drawing.Point(18, 526);
+            this.BehaviorGroupBox.Margin = new System.Windows.Forms.Padding(4);
             this.BehaviorGroupBox.Name = "BehaviorGroupBox";
-            this.BehaviorGroupBox.Size = new System.Drawing.Size(420, 213);
+            this.BehaviorGroupBox.Padding = new System.Windows.Forms.Padding(4);
+            this.BehaviorGroupBox.Size = new System.Drawing.Size(630, 468);
             this.BehaviorGroupBox.TabIndex = 8;
             this.BehaviorGroupBox.TabStop = false;
             this.BehaviorGroupBox.Text = "Behavior";
             // 
+            // STUN_ServerPortTextBox
+            // 
+            this.STUN_ServerPortTextBox.Location = new System.Drawing.Point(180, 356);
+            this.STUN_ServerPortTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.STUN_ServerPortTextBox.Name = "STUN_ServerPortTextBox";
+            this.STUN_ServerPortTextBox.Size = new System.Drawing.Size(439, 31);
+            this.STUN_ServerPortTextBox.TabIndex = 8;
+            this.STUN_ServerPortTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(14, 364);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(157, 24);
+            this.label2.TabIndex = 12;
+            this.label2.Text = "STUN Server Port";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(14, 321);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(116, 24);
+            this.label1.TabIndex = 10;
+            this.label1.Text = "STUN Server";
+            // 
             // RunAtStartup
             // 
             this.RunAtStartup.AutoSize = true;
-            this.RunAtStartup.Location = new System.Drawing.Point(120, 130);
+            this.RunAtStartup.Location = new System.Drawing.Point(180, 195);
+            this.RunAtStartup.Margin = new System.Windows.Forms.Padding(4);
             this.RunAtStartup.Name = "RunAtStartup";
-            this.RunAtStartup.Size = new System.Drawing.Size(109, 21);
+            this.RunAtStartup.Size = new System.Drawing.Size(159, 28);
             this.RunAtStartup.TabIndex = 11;
             this.RunAtStartup.Text = "Run at startup";
             this.RunAtStartup.UseVisualStyleBackColor = true;
             // 
+            // STUN_ServerTextBox
+            // 
+            this.STUN_ServerTextBox.Location = new System.Drawing.Point(180, 316);
+            this.STUN_ServerTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.STUN_ServerTextBox.Name = "STUN_ServerTextBox";
+            this.STUN_ServerTextBox.Size = new System.Drawing.Size(439, 31);
+            this.STUN_ServerTextBox.TabIndex = 11;
+            this.STUN_ServerTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
             // MinimizeWhenStartedCheckBox
             // 
             this.MinimizeWhenStartedCheckBox.AutoSize = true;
-            this.MinimizeWhenStartedCheckBox.Location = new System.Drawing.Point(120, 103);
+            this.MinimizeWhenStartedCheckBox.Location = new System.Drawing.Point(180, 154);
+            this.MinimizeWhenStartedCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.MinimizeWhenStartedCheckBox.Name = "MinimizeWhenStartedCheckBox";
-            this.MinimizeWhenStartedCheckBox.Size = new System.Drawing.Size(158, 21);
+            this.MinimizeWhenStartedCheckBox.Size = new System.Drawing.Size(233, 28);
             this.MinimizeWhenStartedCheckBox.TabIndex = 10;
             this.MinimizeWhenStartedCheckBox.Text = "Minimize when started";
             this.MinimizeWhenStartedCheckBox.UseVisualStyleBackColor = true;
@@ -300,26 +362,29 @@
             // ProfileCount_Label
             // 
             this.ProfileCount_Label.AutoSize = true;
-            this.ProfileCount_Label.Location = new System.Drawing.Point(9, 185);
+            this.ProfileCount_Label.Location = new System.Drawing.Point(14, 278);
+            this.ProfileCount_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ProfileCount_Label.Name = "ProfileCount_Label";
-            this.ProfileCount_Label.Size = new System.Drawing.Size(79, 17);
+            this.ProfileCount_Label.Size = new System.Drawing.Size(117, 24);
             this.ProfileCount_Label.TabIndex = 8;
             this.ProfileCount_Label.Text = "ProfileCount";
             // 
             // ProfileCount_TextBox
             // 
-            this.ProfileCount_TextBox.Location = new System.Drawing.Point(222, 182);
+            this.ProfileCount_TextBox.Location = new System.Drawing.Point(333, 273);
+            this.ProfileCount_TextBox.Margin = new System.Windows.Forms.Padding(4);
             this.ProfileCount_TextBox.Name = "ProfileCount_TextBox";
-            this.ProfileCount_TextBox.Size = new System.Drawing.Size(192, 23);
+            this.ProfileCount_TextBox.Size = new System.Drawing.Size(286, 31);
             this.ProfileCount_TextBox.TabIndex = 9;
             this.ProfileCount_TextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // CheckUpdateWhenOpenedCheckBox
             // 
             this.CheckUpdateWhenOpenedCheckBox.AutoSize = true;
-            this.CheckUpdateWhenOpenedCheckBox.Location = new System.Drawing.Point(120, 157);
+            this.CheckUpdateWhenOpenedCheckBox.Location = new System.Drawing.Point(180, 236);
+            this.CheckUpdateWhenOpenedCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.CheckUpdateWhenOpenedCheckBox.Name = "CheckUpdateWhenOpenedCheckBox";
-            this.CheckUpdateWhenOpenedCheckBox.Size = new System.Drawing.Size(190, 21);
+            this.CheckUpdateWhenOpenedCheckBox.Size = new System.Drawing.Size(277, 28);
             this.CheckUpdateWhenOpenedCheckBox.TabIndex = 8;
             this.CheckUpdateWhenOpenedCheckBox.Text = "Check update when opened";
             this.CheckUpdateWhenOpenedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -328,9 +393,10 @@
             // StartWhenOpenedCheckBox
             // 
             this.StartWhenOpenedCheckBox.AutoSize = true;
-            this.StartWhenOpenedCheckBox.Location = new System.Drawing.Point(120, 76);
+            this.StartWhenOpenedCheckBox.Location = new System.Drawing.Point(180, 114);
+            this.StartWhenOpenedCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.StartWhenOpenedCheckBox.Name = "StartWhenOpenedCheckBox";
-            this.StartWhenOpenedCheckBox.Size = new System.Drawing.Size(137, 21);
+            this.StartWhenOpenedCheckBox.Size = new System.Drawing.Size(199, 28);
             this.StartWhenOpenedCheckBox.TabIndex = 7;
             this.StartWhenOpenedCheckBox.Text = "Start when opened";
             this.StartWhenOpenedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -339,9 +405,10 @@
             // StopWhenExitedCheckBox
             // 
             this.StopWhenExitedCheckBox.AutoSize = true;
-            this.StopWhenExitedCheckBox.Location = new System.Drawing.Point(120, 49);
+            this.StopWhenExitedCheckBox.Location = new System.Drawing.Point(180, 74);
+            this.StopWhenExitedCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.StopWhenExitedCheckBox.Name = "StopWhenExitedCheckBox";
-            this.StopWhenExitedCheckBox.Size = new System.Drawing.Size(127, 21);
+            this.StopWhenExitedCheckBox.Size = new System.Drawing.Size(185, 28);
             this.StopWhenExitedCheckBox.TabIndex = 6;
             this.StopWhenExitedCheckBox.Text = "Stop when exited";
             this.StopWhenExitedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -350,9 +417,10 @@
             // ExitWhenClosedCheckBox
             // 
             this.ExitWhenClosedCheckBox.AutoSize = true;
-            this.ExitWhenClosedCheckBox.Location = new System.Drawing.Point(120, 22);
+            this.ExitWhenClosedCheckBox.Location = new System.Drawing.Point(180, 33);
+            this.ExitWhenClosedCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.ExitWhenClosedCheckBox.Name = "ExitWhenClosedCheckBox";
-            this.ExitWhenClosedCheckBox.Size = new System.Drawing.Size(123, 21);
+            this.ExitWhenClosedCheckBox.Size = new System.Drawing.Size(178, 28);
             this.ExitWhenClosedCheckBox.TabIndex = 5;
             this.ExitWhenClosedCheckBox.Text = "Exit when closed";
             this.ExitWhenClosedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -360,9 +428,9 @@
             // 
             // SettingForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(444, 583);
+            this.ClientSize = new System.Drawing.Size(666, 1069);
             this.Controls.Add(this.BehaviorGroupBox);
             this.Controls.Add(this.PortGroupBox);
             this.Controls.Add(this.GlobalBypassIPsButton);
@@ -371,7 +439,7 @@
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.MaximizeBox = false;
             this.Name = "SettingForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -408,8 +476,6 @@
         private System.Windows.Forms.Button GlobalBypassIPsButton;
         private System.Windows.Forms.CheckBox TUNTAPUseCustomDNSCheckBox;
         private System.Windows.Forms.CheckBox AllowDevicesCheckBox;
-        private System.Windows.Forms.TextBox RedirectorTextBox;
-        private System.Windows.Forms.Label RedirectorLabel;
         private System.Windows.Forms.GroupBox BehaviorGroupBox;
         private System.Windows.Forms.CheckBox ExitWhenClosedCheckBox;
         private System.Windows.Forms.CheckBox StopWhenExitedCheckBox;
@@ -419,5 +485,10 @@
         private System.Windows.Forms.TextBox ProfileCount_TextBox;
         private System.Windows.Forms.CheckBox MinimizeWhenStartedCheckBox;
         private System.Windows.Forms.CheckBox RunAtStartup;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox STUN_ServerTextBox;
+        private System.Windows.Forms.TextBox STUN_ServerPortTextBox;
+        private System.Windows.Forms.CheckBox TUNTAPProxyDNSCheckBox;
     }
 }

Netch/Forms/SettingForm.cs

@@ -52,6 +52,7 @@ namespace Netch.Forms
             TUNTAPNetmaskLabel.Text = Utils.i18N.Translate(TUNTAPNetmaskLabel.Text);
             TUNTAPGatewayLabel.Text = Utils.i18N.Translate(TUNTAPGatewayLabel.Text);
             TUNTAPUseCustomDNSCheckBox.Text = Utils.i18N.Translate(TUNTAPUseCustomDNSCheckBox.Text);
+            TUNTAPProxyDNSCheckBox.Text = Utils.i18N.Translate(TUNTAPProxyDNSCheckBox.Text);
             GlobalBypassIPsButton.Text = Utils.i18N.Translate(GlobalBypassIPsButton.Text);
             ControlButton.Text = Utils.i18N.Translate(ControlButton.Text);
 
@@ -64,13 +65,13 @@ namespace Netch.Forms
 
             Socks5PortTextBox.Text = Global.Settings.Socks5LocalPort.ToString();
             HTTPPortTextBox.Text = Global.Settings.HTTPLocalPort.ToString();
-            RedirectorTextBox.Text = Global.Settings.RedirectorTCPPort.ToString();
 
             TUNTAPAddressTextBox.Text = Global.Settings.TUNTAP.Address;
             TUNTAPNetmaskTextBox.Text = Global.Settings.TUNTAP.Netmask;
             TUNTAPGatewayTextBox.Text = Global.Settings.TUNTAP.Gateway;
 
             TUNTAPUseCustomDNSCheckBox.Checked = Global.Settings.TUNTAP.UseCustomDNS;
+            TUNTAPProxyDNSCheckBox.Checked = Global.Settings.TUNTAP.ProxyDNS;
 
             BehaviorGroupBox.Text = Utils.i18N.Translate(BehaviorGroupBox.Text);
             ExitWhenClosedCheckBox.Text = Utils.i18N.Translate(ExitWhenClosedCheckBox.Text);
@@ -82,6 +83,8 @@ namespace Netch.Forms
             ProfileCount_Label.Text = Utils.i18N.Translate(ProfileCount_Label.Text);
 
             ProfileCount_TextBox.Text = Global.Settings.ProfileCount.ToString();
+            STUN_ServerTextBox.Text = Global.Settings.STUN_Server.ToString();
+            STUN_ServerPortTextBox.Text = Global.Settings.STUN_Server_Port.ToString();
 
             if (Global.Settings.TUNTAP.DNS.Count > 0)
             {
@@ -223,27 +226,6 @@ namespace Netch.Forms
                 return;
             }
 
-            try
-            {
-                var RedirectorPort = int.Parse(RedirectorTextBox.Text);
-
-                if (RedirectorPort > 0 && RedirectorPort < 65536)
-                {
-                    Global.Settings.RedirectorTCPPort = RedirectorPort;
-                }
-                else
-                {
-                    throw new FormatException();
-                }
-            }
-            catch (FormatException)
-            {
-                RedirectorTextBox.Text = Global.Settings.RedirectorTCPPort.ToString();
-                MessageBox.Show(Utils.i18N.Translate("Port value illegal. Try again."), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
-
-                return;
-            }
-
             if (AllowDevicesCheckBox.Checked)
             {
                 Global.Settings.LocalAddress = "0.0.0.0";
@@ -289,7 +271,7 @@ namespace Netch.Forms
             {
                 var ProfileCount = int.Parse(ProfileCount_TextBox.Text);
 
-                if (ProfileCount>0)
+                if (ProfileCount > 0)
                 {
                     Global.Settings.ProfileCount = ProfileCount;
                 }
@@ -305,6 +287,29 @@ namespace Netch.Forms
 
                 return;
             }
+            try
+            {
+                var STUN_Server = STUN_ServerTextBox.Text;
+                Global.Settings.STUN_Server = STUN_Server;
+
+                var STUN_ServerPort = int.Parse(STUN_ServerPortTextBox.Text);
+
+                if (STUN_ServerPort > 0)
+                {
+                    Global.Settings.STUN_Server_Port = STUN_ServerPort;
+                }
+                else
+                {
+                    throw new FormatException();
+                }
+            }
+            catch (FormatException)
+            {
+                ProfileCount_TextBox.Text = Global.Settings.ProfileCount.ToString();
+                MessageBox.Show(Utils.i18N.Translate("STUN_ServerPort value illegal. Try again."), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+
+                return;
+            }
 
             Global.Settings.TUNTAP.Address = TUNTAPAddressTextBox.Text;
             Global.Settings.TUNTAP.Netmask = TUNTAPNetmaskTextBox.Text;
@@ -317,10 +322,12 @@ namespace Netch.Forms
             }
 
             Global.Settings.TUNTAP.UseCustomDNS = TUNTAPUseCustomDNSCheckBox.Checked;
+            Global.Settings.TUNTAP.ProxyDNS = TUNTAPProxyDNSCheckBox.Checked;
 
             Utils.Configuration.Save();
             MessageBox.Show(Utils.i18N.Translate("Saved"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
             Close();
         }
+
     }
 }

Netch/Global.cs

@@ -56,6 +56,7 @@ namespace Netch
                 "table",
                 "rc4",
                 "rc4-md5",
+                "rc4-md5-6",
                 "aes-128-cfb",
                 "aes-192-cfb",
                 "aes-256-cfb",

Netch/Models/Setting.cs

@@ -31,6 +31,11 @@ namespace Netch.Models
         ///		使用自定义 DNS 设置
         /// </summary>
         public bool UseCustomDNS = false;
+
+        /// <summary>
+        ///		模式2下是否代理DNS
+        /// </summary>
+        public bool ProxyDNS = false;
     }
 
     /// <summary>
@@ -97,7 +102,7 @@ namespace Netch.Models
         /// <summary>
         ///		Redirector TCP 占用端口
         /// </summary>
-        public int RedirectorTCPPort = 2800;
+        //public int RedirectorTCPPort = 2800;
 
         /// <summary>
         ///		HTTP 和 Socks5 本地代理地址
@@ -138,5 +143,15 @@ namespace Netch.Models
         ///		快捷配置数量
         /// </summary>
         public int ProfileCount = 4;
+
+        /// <summary>
+        ///     STUN测试服务器
+        /// </summary>
+        public string STUN_Server = "stun.stunprotocol.org";
+
+        /// <summary>
+        ///     STUN测试服务器
+        /// </summary>
+        public int STUN_Server_Port = 3478;
     }
 }

Netch/Netch.cs

@@ -24,7 +24,17 @@ namespace Netch
                 // 清理上一次的日志文件，防止淤积占用磁盘空间
                 if (Directory.Exists("logging"))
                 {
-                    Directory.Delete("logging", true);
+                    DirectoryInfo directory = new DirectoryInfo("logging");
+
+                    foreach (FileInfo file in directory.GetFiles())
+                    {
+                        file.Delete();
+                    }
+
+                    foreach (DirectoryInfo dir in directory.GetDirectories())
+                    {
+                        dir.Delete(true);
+                    }
                 }
 
                 // 预创建目录

Netch/Netch.csproj

@@ -1,101 +1,111 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net48</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <StartupObject>Netch.Netch</StartupObject>
-    <ApplicationManifest>App.manifest</ApplicationManifest>
-    <ApplicationIcon>Netch.ico</ApplicationIcon>
-    <Platforms>x86;x64</Platforms>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net48</TargetFramework>
+        <UseWindowsForms>true</UseWindowsForms>
+        <UseWPF>true</UseWPF>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        <StartupObject>Netch.Netch</StartupObject>
+        <ApplicationManifest>App.manifest</ApplicationManifest>
+        <ApplicationIcon>Netch.ico</ApplicationIcon>
+        <Platforms>x86;x64</Platforms>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningsAsErrors />
-    <NoWarn />
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+        <OutputPath>bin\x64\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <WarningsAsErrors />
+        <NoWarn />
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn />
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningsAsErrors />
-    <OutputPath>bin\x86\Debug\</OutputPath>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <NoWarn />
+        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <WarningsAsErrors />
+        <OutputPath>bin\x86\Debug\</OutputPath>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn />
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningsAsErrors />
-    <OutputPath>bin\x86\Release\</OutputPath>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <NoWarn />
+        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <WarningsAsErrors />
+        <OutputPath>bin\x86\Release\</OutputPath>
+    </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn />
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningsAsErrors />
-    <OutputPath>bin\x64\Release\</OutputPath>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <NoWarn />
+        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <WarningsAsErrors />
+        <OutputPath>bin\x64\Release\</OutputPath>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove=".gitignore" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Remove=".gitignore" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <COMReference Include="TaskScheduler.dll">
-      <Guid>e34cb9f1-c7f7-424c-be29-027dcc09363a</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Lcid>0</Lcid>
-      <Isolated>false</Isolated>
-      <EmbedInteropTypes>false</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
+    <ItemGroup>
+        <COMReference Include="TaskScheduler.dll">
+            <Guid>e34cb9f1-c7f7-424c-be29-027dcc09363a</Guid>
+            <VersionMajor>1</VersionMajor>
+            <VersionMinor>0</VersionMinor>
+            <WrapperTool>tlbimp</WrapperTool>
+            <Lcid>0</Lcid>
+            <Isolated>false</Isolated>
+            <EmbedInteropTypes>false</EmbedInteropTypes>
+        </COMReference>
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="DNS" Version="5.0.0" />
-    <PackageReference Include="DnsClient" Version="1.2.0" />
-    <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Buffers" Version="4.5.0" />
-    <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="DNS" Version="5.0.0" />
+        <PackageReference Include="DnsClient" Version="1.2.0" />
+        <PackageReference Include="ini-parser" Version="2.5.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+        <PackageReference Include="System.Buffers" Version="4.5.0" />
+        <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
+    <ItemGroup>
+        <Reference Include="System.Net.Http" />
+        <Reference Include="System.ServiceProcess" />
+        <Reference Include="System.Web" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Update="Properties\Resources.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+        <Compile Update="Properties\Settings.Designer.cs">
+            <DesignTimeSharedInput>True</DesignTimeSharedInput>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Settings.settings</DependentUpon>
+        </Compile>
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="@ECHO OFF&#xD;&#xA;RD /S /Q $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;RD /S /Q $(TargetDir)i18n &gt; NUL 2&gt;&amp;1&#xD;&#xA;RD /S /Q $(TargetDir)mode &gt; NUL 2&gt;&amp;1&#xD;&#xA;&#xD;&#xA;MKDIR $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;MKDIR $(TargetDir)i18n &gt; NUL 2&gt;&amp;1&#xD;&#xA;MKDIR $(TargetDir)mode &gt; NUL 2&gt;&amp;1&#xD;&#xA;&#xD;&#xA;COPY /Y $(SolutionDir)binaries\$(PlatformName)\* $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)binaries\* $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;MOVE /Y $(TargetDir)bin\nfapinet.dll $(TargetDir)nfapinet.dll &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)translations\i18n\* $(TargetDir)i18n &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)modes\mode\*.txt $(TargetDir)mode &gt; NUL 2&gt;&amp;1&#xD;&#xA;MKDIR $(TargetDir)bin\tap-driver &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)binaries\$(PlatformName)\tap-driver\* $(TargetDir)bin\tap-driver &gt; NUL 2&gt;&amp;1" />
-  </Target>
-
-</Project>
+    <ItemGroup>
+        <None Update="Properties\Settings.settings">
+            <Generator>SettingsSingleFileGenerator</Generator>
+            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+        </None>
+    </ItemGroup>
+    <Target Condition="'$(VisualStudioDir)' != ''" Name="PostBuild" AfterTargets="PostBuildEvent">
+        <Exec Command="@ECHO OFF&#xD;&#xA;RD /S /Q $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;RD /S /Q $(TargetDir)i18n &gt; NUL 2&gt;&amp;1&#xD;&#xA;RD /S /Q $(TargetDir)mode &gt; NUL 2&gt;&amp;1&#xD;&#xA;&#xD;&#xA;MKDIR $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;MKDIR $(TargetDir)i18n &gt; NUL 2&gt;&amp;1&#xD;&#xA;MKDIR $(TargetDir)mode &gt; NUL 2&gt;&amp;1&#xD;&#xA;&#xD;&#xA;COPY /Y $(SolutionDir)binaries\$(PlatformName)\* $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)binaries\* $(TargetDir)bin &gt; NUL 2&gt;&amp;1&#xD;&#xA;MOVE /Y $(TargetDir)bin\nfapinet.dll $(TargetDir)nfapinet.dll &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)translations\i18n\* $(TargetDir)i18n &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)modes\mode\*.txt $(TargetDir)mode &gt; NUL 2&gt;&amp;1&#xD;&#xA;MKDIR $(TargetDir)bin\tap-driver &gt; NUL 2&gt;&amp;1&#xD;&#xA;COPY /Y $(SolutionDir)binaries\$(PlatformName)\tap-driver\* $(TargetDir)bin\tap-driver &gt; NUL 2&gt;&amp;1" />
+    </Target>
+</Project>

Netch/Properties/Settings.Designer.cs

@@ -1,30 +1,26 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Netch.Properties
-{
-
-
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-	{
-
-		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-		public static Settings Default
-		{
-			get
-			{
-				return defaultInstance;
-			}
-		}
-	}
+namespace Netch.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
 }

Netch/Resources/zh-CN

@@ -16,6 +16,19 @@
     "Started": "已启动",
     "Stopping": "正在停止中",
     "Stopped": "已停止",
+    "Starting Shadowsocks": "正在启动Shadowsocks",
+    "Starting ShadowsocksR": "正在启动ShadowsocksR",
+    "Starting V2ray": "正在启动V2ray",
+    "Starting Tap": "正在启动Tap",
+    "Starting NatTester": "正在启动Nat测试",
+    "Starting LocalDns service": "正在启动本地DNS服务",
+    "Starting Redirector": "正在启动Redirector",
+    "Starting netfilter2 Service": "正在启动netfilter2服务",
+    "Starting dns2tcp Service": "正在启动dns2tcp服务",
+    "SetupBypass": "设置绕行规则",
+    "Test failed": "测试失败",
+    "Starting update subscription": "正在更新订阅",
+    "Subscription updated": "订阅更新完毕",
 
     "Server": "服务器",
     "Import Servers From Clipboard": "从剪贴板导入服务器",
@@ -83,6 +96,8 @@
     "Please press Stop button first": "请先点击停止按钮",
     "Please select a server first": "请先选择一个服务器",
     "Please select an mode first": "请先选择一个模式",
+    "Please enter a profile name first": "请先为该配置设置一个名称",
+    "No saved profile here. Save a profile first by Ctrl+Click on the button": "当前按钮下没有保存配置，请先使用ctrl+左键点击该按钮保存一个配置",
 
     "Used": "已使用",
     "Status": "状态",
@@ -126,6 +141,7 @@
     "Netmask": "子网掩码",
     "Gateway": "网关",
     "Use Custom DNS": "使用自定义 DNS",
+    "Proxy DNS in Mode 2": "在模式2下代理DNS",
     "Behavior": "行为",
     "Exit when closed": "关闭时退出",
     "Stop when exited": "退出时停止",
@@ -134,6 +150,7 @@
     "Check update when opened": "打开软件时检查更新",
     "ProfileCount": "快捷配置数量（重启软件生效）",
     "ProfileCount value illegal. Try again.": "快捷配置数值非法。请重试。",
+    "STUN_ServerPort value illegal. Try again.": "STUN端口数值非法。请重试。",
     "TUN/TAP driver is not detected. Is it installed now?": "未检测到TUN/TAP驱动，是否现在安装？",
 
     "Profile": "配置名",

Netch/Utils/Configuration.cs

@@ -105,41 +105,55 @@ namespace Netch.Utils
                 return false;
             }
 
+            Logging.Info($"搜索适配器index：{Global.Adapter.Index}");
+            var AddressGot = false;
             foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces())
             {
-                var adapterProperties = adapter.GetIPProperties();
-                var p = adapterProperties.GetIPv4Properties();
-
-                // 通过索引查找对应适配器的 IPv4 地址
-                if (p.Index == Global.Adapter.Index)
+                try
                 {
-                    var AddressGot = false;
-                    var AdapterIPs = "";
+                    var adapterProperties = adapter.GetIPProperties();
+                    var p = adapterProperties.GetIPv4Properties();
+                    Logging.Info($"检测适配器：{adapter.Name} {adapter.Id} {adapter.Description}, index: {p.Index}");
 
-                    foreach (var ip in adapterProperties.UnicastAddresses)
+                    // 通过索引查找对应适配器的 IPv4 地址
+                    if (p.Index == Global.Adapter.Index)
                     {
-                        if (ip.Address.AddressFamily == AddressFamily.InterNetwork)
+                        var AdapterIPs = "";
+
+                        foreach (var ip in adapterProperties.UnicastAddresses)
                         {
-                            AddressGot = true;
-                            Global.Adapter.Address = ip.Address;
-                            Logging.Info($"当前出口 IPv4 地址：{Global.Adapter.Address}");
-                            break;
+                            if (ip.Address.AddressFamily == AddressFamily.InterNetwork)
+                            {
+                                AddressGot = true;
+                                Global.Adapter.Address = ip.Address;
+                                Logging.Info($"当前出口 IPv4 地址：{Global.Adapter.Address}");
+                                break;
+                            }
+                            AdapterIPs = $"{ip.Address} | ";
                         }
-                        AdapterIPs = $"{ip.Address} | ";
+
+                        if (!AddressGot)
+                        {
+                            if (AdapterIPs.Length > 3)
+                            {
+                                AdapterIPs = AdapterIPs.Substring(0, AdapterIPs.Length - 3);
+                                Logging.Info($"所有出口地址：{AdapterIPs}");
+                            }
+                            Logging.Info("出口无 IPv4 地址，当前只支持 IPv4 地址");
+                            return false;
+                        }
+                        break;
                     }
 
-                    if (!AddressGot)
-                    {
-                        if (AdapterIPs.Length > 3)
-                        {
-                            AdapterIPs = AdapterIPs.Substring(0, AdapterIPs.Length - 3);
-                            Logging.Info($"所有出口地址：{AdapterIPs}");
-                        }
-                        Logging.Info("出口无 IPv4 地址，当前只支持 IPv4 地址");
-                        return false;
-                    }
-                    break;
                 }
+                catch (Exception)
+                { }
+            }
+
+            if (!AddressGot)
+            {
+                Logging.Info("无法找到当前使用适配器");
+                return false;
             }
 
             // 搜索 TUN/TAP 适配器的索引
@@ -165,18 +179,21 @@ namespace Netch.Utils
                 // return false;
             }
 
-            var name = TUNTAP.GetName(Global.TUNTAP.ComponentID);
             foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces())
             {
-                if (adapter.Name == name)
+                if (adapter.Id == Global.TUNTAP.ComponentID)
                 {
                     Global.TUNTAP.Adapter = adapter;
                     Global.TUNTAP.Index = adapter.GetIPProperties().GetIPv4Properties().Index;
 
-                    break;
+                    Logging.Info($"找到适配器：{adapter.Id}");
+
+                    return true;
                 }
             }
-            return true;
+
+            Logging.Info("无法找到出口");
+            return false;
         }
     }
 }

README.md

@@ -1,6 +1,6 @@
 # Netch
-[![](https://img.shields.io/badge/Telegram-Channel-blue.svg)](https://t.me/Netch)
-
+[![](https://img.shields.io/badge/Telegram-Channel-blue)](https://t.me/Netch) [![](https://img.shields.io/badge/Telegram-Group-green)](https://t.me/Netch_Discuss_Group) ![GitHub Actions & Netch CI](https://github.com/NetchX/Netch/workflows/GitHub%20Actions%20&%20Netch%20CI/badge.svg)
+          
 Game accelerator
 
 [简体中文](docs/README.zh-CN.md) (此版本内容更丰富)
@@ -24,8 +24,8 @@ As well, Netch avoid the restricted NAT problem caused by SSTap. You can use an
 
 [![NyanCAT](docs/sponsor/nyancat.jpg)](https://nyancat.info)
 
-NyanCAT Network，全中转高质量节点，多条低倍率节点保证流量无忧，节点极低延迟涵盖五大洲。Netflix 视频党，游戏党，海外回国党必备，无需年付，月付 19 元起
-[Telegram 群组](https://t.me/NyanCaaaat) 
+NyanCAT Network，全中转高质量节点，多条低倍率节点保证流量无忧，节点极低延迟涵盖五大洲。Netflix 视频党，游戏党，海外回国党必备，无需年付，月付 19 元起。[测速图](https://t.me/BGP2020/935)
+[加入 Telegram 群组](https://t.me/NyanCaaaat)
 
 [![ManSora](docs/sponsor/mansora.jpg)](https://www.mansora.net/cart.php)
 

build.ps1

@@ -0,0 +1,69 @@
+# REM The reason we don't use dotnet build is that dotnet build doesn't support COM references yet https://github.com/microsoft/msbuild/issues/3986
+param([string]$buildtfm = 'all')
+
+Write-Host 'dotnet SDK version'
+dotnet --version
+
+$exe = 'Netch.exe'
+$mainDir = (Get-Item -Path ".\").FullName
+$net_baseoutput = "$mainDir\Netch\bin\$configuration"
+
+Write-Host $mainDir
+Write-Host $net_baseoutput
+
+function Build-NetFrameworkx64
+{
+	Write-Host 'Building .NET Framework x64'
+	
+	$outdir = "$net_baseoutput\x64"
+	
+	msbuild -v:m -m -t:Build /p:Configuration="Release" /p:Platform="x64" /p:TargetFramework=net48 /p:Runtimeidentifier=win-x64 /restore
+	if ($LASTEXITCODE) { cd $mainDir ; exit $LASTEXITCODE } 
+
+    Write-Host 'Build x64 Complete ,Started Copy bin,mode,i18n file'
+
+Copy-Item "$mainDir\binaries\x64\*" "$net_baseoutput\x64\Release\win-x64\bin"
+Copy-Item "$mainDir\binaries\x64\tap-driver" "$net_baseoutput\x64\Release\win-x64\bin\tap-driver" -recurse
+Copy-Item "$mainDir\binaries\*.acl" "$net_baseoutput\x64\Release\win-x64\bin"
+Copy-Item "$mainDir\binaries\*.conf" "$net_baseoutput\x64\Release\win-x64\bin"
+Copy-Item "$mainDir\binaries\*.dat" "$net_baseoutput\x64\Release\win-x64\bin"
+Copy-Item "$mainDir\binaries\*.exe" "$net_baseoutput\x64\Release\win-x64\bin"
+Move-Item "$net_baseoutput\x64\Release\win-x64\bin\nfapinet.dll" "$net_baseoutput\x64\Release\win-x64\nfapinet.dll"
+Copy-Item "$mainDir\translations\i18n" "$net_baseoutput\x64\Release\win-x64\i18n" -recurse
+mkdir "$net_baseoutput\x64\Release\win-x64\mode"
+Copy-Item "$mainDir\modes\mode\*.txt" "$net_baseoutput\x64\Release\win-x64\mode"
+
+    Write-Host 'x64 ALL DONE'
+
+}
+function Build-NetFrameworkx86
+{
+	Write-Host 'Building .NET Framework x86'
+	
+	$outdir = "$net_baseoutput\x86"
+	
+	msbuild -v:m -m -t:Build /p:Configuration="Release" /p:Platform="x86" /p:TargetFramework=net48 /p:Runtimeidentifier=win-x86 /restore
+	if ($LASTEXITCODE) { cd $mainDir ; exit $LASTEXITCODE } 
+
+    Write-Host 'Build x86 Complete ,Started Copy bin,mode,i18n file'
+
+Copy-Item "$mainDir\binaries\x86\*" "$net_baseoutput\x86\Release\win-x86\bin"
+Copy-Item "$mainDir\binaries\x86\tap-driver" "$net_baseoutput\x86\Release\win-x86\bin\tap-driver" -recurse
+Copy-Item "$mainDir\binaries\*.acl" "$net_baseoutput\x86\Release\win-x86\bin"
+Copy-Item "$mainDir\binaries\*.conf" "$net_baseoutput\x86\Release\win-x86\bin"
+Copy-Item "$mainDir\binaries\*.dat" "$net_baseoutput\x86\Release\win-x86\bin"
+Copy-Item "$mainDir\binaries\*.exe" "$net_baseoutput\x86\Release\win-x86\bin"
+Move-Item "$net_baseoutput\x86\Release\win-x86\bin\nfapinet.dll" "$net_baseoutput\x86\Release\win-x86\nfapinet.dll"
+Copy-Item "$mainDir\translations\i18n" "$net_baseoutput\x86\Release\win-x86\i18n" -recurse
+mkdir "$net_baseoutput\x86\Release\win-x86\mode"
+Copy-Item "$mainDir\modes\mode\*.txt" "$net_baseoutput\x86\Release\win-x86\mode"
+
+    Write-Host 'x86 ALL DONE'
+}
+
+cd $mainDir\Netch
+
+Build-NetFrameworkx64
+Build-NetFrameworkx86
+
+cd $mainDir

docs/README.zh-CN.md

@@ -25,8 +25,8 @@ Netch 是一款 Windows 平台的开源游戏加速工具，Netch 可以实现
 
 [![NyanCAT](sponsor/nyancat.jpg)](https://nyancat.info)
 
-NyanCAT Network，全中转高质量节点，多条低倍率节点保证流量无忧，节点极低延迟涵盖五大洲。Netflix 视频党，游戏党，海外回国党必备，无需年付，月付 19 元起
-[Telegram 群组](https://t.me/NyanCaaaat) 
+NyanCAT Network，全中转高质量节点，多条低倍率节点保证流量无忧，节点极低延迟涵盖五大洲。Netflix 视频党，游戏党，海外回国党必备，无需年付，月付 19 元起。[测速图](https://t.me/BGP2020/935)
+[加入 Telegram 群组](https://t.me/NyanCaaaat) 
 
 [![ManSora](sponsor/mansora.jpg)](https://www.mansora.net/cart.php)