✨添加语言设置

🎨优化电源监听逻辑

.github/workflows/build.yml

@@ -1,71 +1,57 @@
-name: GitHub Actions & Netch CI
-
+name: 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
+    steps:
+    - name: NuGet
+      uses: nuget/setup-nuget@v1
 
-    - name: submodules-init
-      uses: snickerbockers/submodules-init@v4
-  
-    - uses: nuget/setup-nuget@v1
-    - run: nuget restore Netch.sln
-     
-    - name: Setup MSBuild.exe
+    - name: MSBuild
       uses: microsoft/setup-msbuild@v1.0.0
 
-    - name: Build .NET 4.8 Netch
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Update submodules
+      uses: snickerbockers/submodules-init@v4
+
+    - name: Restore NuGet Package
+      run: nuget restore Netch.sln
+
+    - name: Build .NET 4.8
       shell: pwsh
       run: |
-        .\build.ps1
+        .\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)"
+        Compress-Archive -Path Netch\bin\x64\Release\win-x64\* -DestinationPath C:\builtfiles\Netch.zip
+        echo "::set-env name=Netch_SHA256::$(.\GetSHA256.ps1 C:\builtfiles\Netch.zip)"
 
-    - name: Upload Netch.x64
+    - name: Upload
       uses: actions/upload-artifact@v1
       with:
-        name: Netch.x64
+        name: Netch
         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
+  
+    - name: Release
       uses: softprops/action-gh-release@v1
+      env:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      if: startsWith(github.ref, 'refs/tags/')
       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
+          C:\builtfiles\Netch.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
-          
-          ## 文件校验
+
+          ## 更新日志
+          * 这是 GitHub Action 自动化部署，更新日志应该很快会手动更新
+
+          ## 校验和
           | 文件名 | 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}}
+          | Netch.zip | ${{ env.Netch_SHA256 }} |

BUILD.ps1

@@ -0,0 +1,35 @@
+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 Completed, start copy bin, mode, i18n file'
+	Remove-Item -Recurse -Force "$net_baseoutput\x64\Release\win-x64\bin\tap-driver"
+	Copy-Item -Recurse "$mainDir\binaries\*" "$net_baseoutput\x64\Release\win-x64\bin"
+	Copy-Item -Recurse "$mainDir\modes\mode\*" "$net_baseoutput\x64\Release\win-x64\mode"
+	Copy-Item -Recurse "$mainDir\translations\i18n\*" "$net_baseoutput\x64\Release\win-x64\i18n"
+
+    Write-Host 'Build done'
+}
+
+cd $mainDir\Netch
+Build-NetFrameworkx64
+cd $mainDir
+
+exit 0

CLEAN.BAT

@@ -1,3 +0,0 @@
-@ECHO OFF
-RD /S /Q Netch\bin > NUL 2>&1
-RD /S /Q Netch\obj > NUL 2>&1

CLEAN.ps1

@@ -0,0 +1,21 @@
+if (Test-Path Netch\bin)
+{
+    Remove-Item -Recurse -Force Netch\bin
+}
+
+if (Test-Path Netch\obj)
+{
+    Remove-Item -Recurse -Force Netch\obj
+}
+
+if (Test-Path NetchLib\bin)
+{
+    Remove-Item -Recurse -Force NetchLib\bin
+}
+
+if (Test-Path NetchLib\obj)
+{
+    Remove-Item -Recurse -Force NetchLib\obj
+}
+
+exit 0

GetSHA256.ps1

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

Netch.sln

@@ -9,34 +9,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetchLib", "NetchLib\NetchL
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Debug|x64.ActiveCfg = Debug|x64
 		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Debug|x64.Build.0 = Debug|x64
-		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Debug|x86.ActiveCfg = Debug|x86
-		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Debug|x86.Build.0 = Debug|x86
-		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Release|Any CPU.ActiveCfg = Release|x86
 		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Release|x64.ActiveCfg = Release|x64
 		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Release|x64.Build.0 = Release|x64
-		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Release|x86.ActiveCfg = Release|x86
-		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Release|x86.Build.0 = Release|x86
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Debug|x64.ActiveCfg = Debug|x64
 		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Debug|x64.Build.0 = Debug|x64
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Debug|x86.ActiveCfg = Debug|x86
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Debug|x86.Build.0 = Debug|x86
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|Any CPU.ActiveCfg = Release|x86
 		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x64.ActiveCfg = Release|x64
 		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x64.Build.0 = Release|x64
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x86.ActiveCfg = Release|x86
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Netch/3rd/NFSDK2/nfapinet.cs

@@ -499,7 +499,7 @@ namespace nfapinet
 		* @param driverName The name of hooking driver, without ".sys" extension.
 		* @param pHandler Pointer to event handling object
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_init(String driverName, IntPtr pHandler);
 
         public static NF_STATUS nf_init(String driverName, NF_EventHandler pHandler)
@@ -537,21 +537,21 @@ namespace nfapinet
 		* Stops the filtering thread, breaks all filtered connections and closes
 		* a connection with the hooking driver.
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern void nf_free();
 
         /**
 		* Registers and starts a driver with specified name (without ".sys" extension)
 		* @param driverName 
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_registerDriver(String driverName);
 
         /**
 		* Unregisters a driver with specified name (without ".sys" extension)
 		* @param driverName 
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_unRegisterDriver(String driverName);
 
 
@@ -564,7 +564,7 @@ namespace nfapinet
 		* @param id Connection identifier
 		* @param suspended true for suspend, false for resume 
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_tcpSetConnectionState(ulong id, int suspended);
 
         /**
@@ -573,7 +573,7 @@ namespace nfapinet
 		* @param buf Pointer to data buffer
 		* @param len Buffer length
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_tcpPostSend(ulong id, IntPtr buf, int len);
 
         /**
@@ -582,14 +582,14 @@ namespace nfapinet
 		* @param buf Pointer to data buffer
 		* @param len Buffer length
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_tcpPostReceive(ulong id, IntPtr buf, int len);
 
         /**
 		* Breaks the connection with given id.
 		* @param id Connection identifier
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_tcpClose(ulong id);
 
         //
@@ -601,7 +601,7 @@ namespace nfapinet
 		* @param id Socket identifier
 		* @param suspended true for suspend, false for resume 
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_udpSetConnectionState(ulong id, int suspended);
 
         /**
@@ -611,7 +611,7 @@ namespace nfapinet
 		* @param buf Pointer to data buffer
 		* @param len Buffer length
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_udpPostSend(ulong id,
             IntPtr remoteAddress,
             IntPtr buf, int len,
@@ -624,7 +624,7 @@ namespace nfapinet
         * @param buf Pointer to data buffer
         * @param len Buffer length
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_udpPostReceive(ulong id,
             IntPtr remoteAddress,
             IntPtr buf, int len,
@@ -636,7 +636,7 @@ namespace nfapinet
 		* @param len Buffer length
 		* @param options IP options
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_ipPostReceive(
             IntPtr buf, int len,
             ref NF_IP_PACKET_OPTIONS options);
@@ -647,7 +647,7 @@ namespace nfapinet
 		* @param len Buffer length
 		* @param options IP options
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_ipPostSend(
             IntPtr buf, int len,
             ref NF_IP_PACKET_OPTIONS options);
@@ -661,7 +661,7 @@ namespace nfapinet
 		* @param pRule See <tt>NF_RULE</tt>
 		* @param toHead TRUE (1) - add rule to list head, FALSE (0) - add rule to tail
 		**/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern NF_STATUS nf_addRule(ref NF_RULE pRule, int toHead);
 
         private static void updateAddressLength(ref byte[] buf)
@@ -694,7 +694,7 @@ namespace nfapinet
         * @param pRule See <tt>NF_RULE</tt>
         * @param toHead TRUE (1) - add rule to list head, FALSE (0) - add rule to tail
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern NF_STATUS nf_addRuleEx(ref NF_RULE_EX pRule, int toHead);
 
         public static NF_STATUS nf_addRuleEx(NF_RULE_EX pRule, int toHead)
@@ -712,7 +712,7 @@ namespace nfapinet
         * @param pRules Array of <tt>NF_RULE</tt> structures
         * @param count Number of items in array
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern NF_STATUS nf_setRules(IntPtr pRules, int count);
 
         public static NF_STATUS nf_setRules(NF_RULE[] rules)
@@ -744,7 +744,7 @@ namespace nfapinet
         * @param pRules Array of <tt>NF_RULE</tt> structures
         * @param count Number of items in array
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern NF_STATUS nf_setRulesEx(IntPtr pRules, int count);
 
         public static NF_STATUS nf_setRulesEx(NF_RULE_EX[] rules)
@@ -774,34 +774,34 @@ namespace nfapinet
         /**
         * Removes all rules from driver.
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_deleteRules();
 
         /**
 		 *	Sets the timeout for TCP connections and returns old timeout.
 		 *	@param timeout Timeout value in milliseconds. Specify zero value to disable timeouts.
 		 */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern UInt32 nf_setTCPTimeout(UInt32 timeout);
 
         /**
 		 *	Disables indicating TCP packets to user mode for the specified endpoint
 		 *  @param id Socket identifier
 		 */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_tcpDisableFiltering(ulong id);
 
         /**
 		 *	Disables indicating UDP packets to user mode for the specified endpoint
 		 *  @param id Socket identifier
 		 */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_udpDisableFiltering(ulong id);
 
         /**
         * Returns TRUE if the specified process acts as a local proxy, accepting the redirected TCP connections.
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern bool nf_tcpIsProxy(uint processId);
 
         /**
@@ -811,37 +811,37 @@ namespace nfapinet
         * @param nThreads Number of worker threads for NF_EventHandler events 
         * @param flags A combination of flags from <tt>NF_FLAGS</tt>
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern void nf_setOptions(uint nThreads, uint flags);
 
         /**
         * Complete TCP connect request pended using flag NF_PEND_CONNECT_REQUEST.
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_completeTCPConnectRequest(ulong id, ref NF_TCP_CONN_INFO pConnInfo);
 
         /**
         * Complete UDP connect request pended using flag NF_PEND_CONNECT_REQUEST.
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_completeUDPConnectRequest(ulong id, ref NF_UDP_CONN_REQUEST pConnInfo);
 
         /**
         * Returns in pConnInfo the properties of TCP connection with specified id.
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_getTCPConnInfo(ulong id, ref NF_TCP_CONN_INFO pConnInfo);
 
         /**
         * Returns in pConnInfo the properties of UDP socket with specified id.
         **/
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_getUDPConnInfo(ulong id, ref NF_UDP_CONN_INFO pConnInfo);
 
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern bool nf_getProcessNameW(uint processId, IntPtr buf, int len);
 
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern bool nf_getProcessNameFromKernel(uint processId, IntPtr buf, int len);
 
         /**
@@ -880,13 +880,13 @@ namespace nfapinet
             return "System";
         }
 
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern void nf_adjustProcessPriviledges();
 
         /*
         * Set the event handler for IP filtering events
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern void nf_setIPEventHandler(IntPtr pHandler);
 
         /*
@@ -910,51 +910,51 @@ namespace nfapinet
         /**
         * Add flow control context
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_addFlowCtl(ref NF_FLOWCTL_DATA pData, ref UInt32 pFcHandle);
 
         /**
         * Delete flow control context
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_deleteFlowCtl(UInt32 fcHandle);
 
         /**
         * Associate flow control context with TCP connection
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_setTCPFlowCtl(ulong id, UInt32 fcHandle);
 
         /**
         * Associate flow control context with UDP socket
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_setUDPFlowCtl(ulong id, UInt32 fcHandle);
 
         /**
         * Modify flow control context limits
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_modifyFlowCtl(UInt32 fcHandle, ref NF_FLOWCTL_DATA pData);
 
         /**
         * Get flow control context statistics as the numbers of in/out bytes
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_getFlowCtlStat(UInt32 fcHandle, ref NF_FLOWCTL_STAT pStat);
 
         /**
         * Get TCP connection statistics as the numbers of in/out bytes.
         * The function can be called only from tcpClosed handler!
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_getTCPStat(ulong id, ref NF_FLOWCTL_STAT pStat);
 
         /**
         * Get UDP socket statistics as the numbers of in/out bytes.
         * The function can be called only from udpClosed handler!
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_getUDPStat(ulong id, ref NF_FLOWCTL_STAT pStat);
 
         public enum NF_SOCKET_OPTIONS
@@ -967,10 +967,10 @@ namespace nfapinet
             TCP_SOCKET_WINDOW = 6
         }
 
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_tcpSetSockOpt(ulong id, NF_SOCKET_OPTIONS optname, ref int optval, int optlen);
 
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS nf_tcpSetSockOpt(ulong id, NF_SOCKET_OPTIONS optname, IntPtr optval, int optlen);
 
         public static NF_STATUS nf_tcpSetSockOpt(ulong id, NF_SOCKET_OPTIONS optname, bool optval)
@@ -982,7 +982,7 @@ namespace nfapinet
         /**
         * Add binding rule to driver
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         private static extern NF_STATUS
         nf_addBindingRule(ref NF_BINDING_RULE pRule, int toHead);
 
@@ -999,14 +999,14 @@ namespace nfapinet
         /**
         * Delete all binding rules from driver
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern NF_STATUS
         nf_deleteBindingRules();
 
         /**
         * Returns the type of attached driver (DT_WFP, DT_TDI or DT_UNKNOWN)
         */
-        [DllImport("nfapinet", CallingConvention = CallingConvention.Cdecl)]
+        [DllImport("bin\\nfapinet", CallingConvention = CallingConvention.Cdecl)]
         public static extern UInt32
         nf_getDriverType();
     };

Netch/Controllers/DNSController.cs

@@ -59,6 +59,7 @@ namespace Netch.Controllers
                 if (Instance != null && !Instance.HasExited)
                 {
                     Instance.Kill();
+                    Instance.WaitForExit();
                 }
             }
             catch (Exception e)

Netch/Controllers/HTTPController.cs

@@ -59,7 +59,7 @@ namespace Netch.Controllers
                 {
                     System.Diagnostics.Process.Start("https://netch.org/#/?id=%e4%be%9d%e8%b5%96");
                 }
-                Utils.Logging.Info("设置系统代理失败"+e.ToString());
+                Utils.Logging.Info("设置系统代理失败" + e.ToString());
                 return false;
             }
 

Netch/Controllers/MainController.cs

@@ -40,6 +40,11 @@ namespace Netch.Controllers
         /// </summary>
         public VMessController pVMessController;
 
+        /// <summary>
+        ///     Trojan 控制器
+        /// </summary>
+        public TrojanController pTrojanController;
+
         /// <summary>
         ///		NF 控制器
         /// </summary>
@@ -108,6 +113,14 @@ namespace Netch.Controllers
                     }
                     result = pVMessController.Start(server, mode);
                     break;
+                case "Trojan":
+                    KillProcess("Trojan");
+                    if (pTrojanController == null)
+                    {
+                        pTrojanController = new TrojanController();
+                    }
+                    result = pTrojanController.Start(server, mode);
+                    break;
             }
 
             if (result)
@@ -126,17 +139,15 @@ namespace Netch.Controllers
                     result = pNFController.Start(server, mode, false);
                     if (!result)
                     {
-                        MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("ReStarting Redirector")}");
+                        MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Restarting Redirector")}");
                         Utils.Logging.Info("正常启动失败后尝试停止驱动服务再重新启动");
                         //正常启动失败后尝试停止驱动服务再重新启动
                         result = pNFController.Start(server, mode, true);
                     }
-                    if (result)
-                        Task.Run(() =>
-                        {
-                            pNTTController.Start();
-                        });
-
+                    else
+                    {
+                        Task.Run(() => pNTTController.Start());
+                    }
                 }
                 else if (mode.Type == 1)
                 {
@@ -151,10 +162,9 @@ namespace Netch.Controllers
                     // TUN/TAP 黑名单代理模式，启动 TUN/TAP 控制器
                     result = pTUNTAPController.Start(server, mode);
                     if (result)
-                        Task.Run(() =>
-                        {
-                            pNTTController.Start();
-                        });
+                    {
+                        Task.Run(() => pNTTController.Start());
+                    }
                 }
                 else if (mode.Type == 2)
                 {
@@ -169,10 +179,9 @@ namespace Netch.Controllers
                     // TUN/TAP 白名单代理模式，启动 TUN/TAP 控制器
                     result = pTUNTAPController.Start(server, mode);
                     if (result)
-                        Task.Run(() =>
-                        {
-                            pNTTController.Start();
-                        });
+                    {
+                        Task.Run(() => pNTTController.Start());
+                    }
                 }
                 else if (mode.Type == 3 || mode.Type == 5)
                 {
@@ -218,6 +227,10 @@ namespace Netch.Controllers
             {
                 pVMessController.Stop();
             }
+            else if (pTrojanController != null)
+            {
+                pTrojanController.Stop();
+            }
 
             if (pNFController != null)
             {

Netch/Controllers/NFController.cs

@@ -47,6 +47,11 @@ namespace Netch.Controllers
             if (!StopServiceAndRestart)
                 MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Redirector")}");
 
+            if (!File.Exists("bin\\Redirector.exe"))
+            {
+                return false;
+            }
+
             // 检查驱动是否存在
             if (File.Exists(driverPath))
             {
@@ -72,14 +77,14 @@ namespace Netch.Controllers
                         return false;
                 }
 
-                //检查驱动版本号
+                // 检查驱动版本号
                 FileVersionInfo SystemfileVerInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(driverPath);
                 FileVersionInfo BinFileVerInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(string.Format("bin\\{0}", driverName));
 
                 if (!SystemfileVerInfo.FileVersion.Equals(BinFileVerInfo.FileVersion))
                 {
                     Utils.Logging.Info("开始更新驱动");
-                    //需要更新驱动
+                    // 需要更新驱动
                     try
                     {
                         var service = new ServiceController("netfilter2");
@@ -108,16 +113,18 @@ namespace Netch.Controllers
             else
             {
                 if (!InstallDriver())
+                {
                     return false;
+                }
             }
 
             try
             {
-                //启动驱动服务
+                // 启动驱动服务
                 var service = new ServiceController("netfilter2");
                 if (service.Status == ServiceControllerStatus.Running && StopServiceAndRestart)
                 {
-                    //防止其他程序占用 重置NF百万ID限制
+                    // 防止其他程序占用 重置 NF 百万连接数限制
                     service.Stop();
                     service.WaitForStatus(ServiceControllerStatus.Stopped);
                     MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting netfilter2 Service")}");
@@ -142,105 +149,43 @@ namespace Netch.Controllers
             }
 
             var processes = "";
-
-            //开启进程白名单模式
-            if (!Global.Settings.ProcessBypassMode)
-            {
-                processes += "NTT.exe,";
-            }
-
             foreach (var proc in mode.Rule)
             {
                 processes += proc;
                 processes += ",";
             }
-            processes = processes.Substring(0, processes.Length - 1);
+            processes += "NTT.exe";
 
             Instance = MainController.GetProcess();
-            var fallback = "";
+            Instance.StartInfo.FileName = "bin\\Redirector.exe";
+            Instance.StartInfo.Arguments = "";
 
-            if (Global.Settings.UseRedirector2)
+            if (server.Type != "Socks5")
             {
-                if (!File.Exists("bin\\Redirector2.exe"))
-                {
-                    return false;
-                }
-                Instance.StartInfo.FileName = "bin\\Redirector2.exe";
-
-
-                if (server.Type != "Socks5")
-                {
-                    fallback += $" 127.0.0.1:{Global.Settings.Socks5LocalPort}";
-                    fallback += $" \"{processes}\"";
-                }
-                else
-                {
-                    var result = Utils.DNS.Lookup(server.Hostname);
-                    if (result == null)
-                    {
-                        Utils.Logging.Info("无法解析服务器 IP 地址");
-                        return false;
-                    }
-
-                    fallback += $" {result}:{server.Port}";
-                    fallback += $" \"{processes}\"";
-
-                    if (!string.IsNullOrWhiteSpace(server.Username) && !string.IsNullOrWhiteSpace(server.Password))
-                    {
-                        fallback += $" \"{server.Username}\"";
-                        fallback += $" \"{server.Password}\"";
-                    }
-                }
+                Instance.StartInfo.Arguments += $"-r 127.0.0.1:{Global.Settings.Socks5LocalPort} -p \"{processes}\"";
             }
             else
             {
-                if (!File.Exists("bin\\Redirector.exe"))
+                var result = Utils.DNS.Lookup(server.Hostname);
+                if (result == null)
                 {
+                    Utils.Logging.Info("无法解析服务器 IP 地址");
                     return false;
                 }
-                Instance.StartInfo.FileName = "bin\\Redirector.exe";
 
-                //开启进程白名单模式
-                if (Global.Settings.ProcessBypassMode)
+                Instance.StartInfo.Arguments += $"-r {result}:{server.Port} -p \"{processes}\"";
+                if (!string.IsNullOrWhiteSpace(server.Username) && !string.IsNullOrWhiteSpace(server.Password))
                 {
-                    processes += ",Shadowsocks.exe";
-                    processes += ",ShadowsocksR.exe";
-                    processes += ",Privoxy.exe";
-                    processes += ",simple-obfs.exe";
-                    processes += ",v2ray.exe,v2ctl.exe,v2ray-plugin.exe";
-                    fallback += " -bypass true ";
-                }
-                else
-                {
-                    fallback += " -bypass false ";
-                }
-
-                if (server.Type != "Socks5")
-                {
-                    fallback += $"-r 127.0.0.1:{Global.Settings.Socks5LocalPort} -p \"{processes}\"";
-                }
-                else
-                {
-                    var result = Utils.DNS.Lookup(server.Hostname);
-                    if (result == null)
-                    {
-                        Utils.Logging.Info("无法解析服务器 IP 地址");
-                        return false;
-                    }
-
-                    fallback += $"-r {result}:{server.Port} -p \"{processes}\"";
-
-                    if (!string.IsNullOrWhiteSpace(server.Username) && !string.IsNullOrWhiteSpace(server.Password))
-                    {
-                        fallback += $" -username \"{server.Username}\" -password \"{server.Password}\"";
-                    }
+                    Instance.StartInfo.Arguments += $" -username \"{server.Username}\" -password \"{server.Password}\"";
                 }
             }
 
             if (File.Exists("logging\\redirector.log"))
-                File.Delete("logging\\redirector.log");
+            {
+                File.Delete("logging\\redirector.log"); 
+            }
 
-            Instance.StartInfo.Arguments = fallback + $" -tcport {Global.Settings.RedirectorTCPPort}";
+            Instance.StartInfo.Arguments += $" -t {Global.Settings.RedirectorTCPPort}";
             Utils.Logging.Info(Instance.StartInfo.Arguments);
             Instance.OutputDataReceived += OnOutputDataReceived;
             Instance.ErrorDataReceived += OnOutputDataReceived;
@@ -255,13 +200,8 @@ namespace Netch.Controllers
 
                 if (State == Models.State.Started)
                 {
-                    Utils.Logging.Info($"成功启动Redirector耗时:{i + 1}秒");
                     return true;
                 }
-                else
-                {
-                    Utils.Logging.Info($"Redirector启动中，已耗时:{i + 1}秒");
-                }
             }
 
             Utils.Logging.Info("NF 进程启动超时");
@@ -347,7 +287,7 @@ namespace Netch.Controllers
                     {
                         State = Models.State.Stopped;
                     }
-                    else if (e.Data.Contains("Start") || e.Data.Contains("Redirect to"))
+                    else if (e.Data.Contains("Started"))
                     {
                         State = Models.State.Started;
                     }
@@ -358,9 +298,9 @@ namespace Netch.Controllers
                 }
                 else if (State == Models.State.Started)
                 {
-                    if (e.Data.StartsWith("[Application][Bandwidth]"))
+                    if (e.Data.StartsWith("[APP][Bandwidth]"))
                     {
-                        var splited = e.Data.Replace("[Application][Bandwidth]", "").Trim().Split(',');
+                        var splited = e.Data.Replace("[APP][Bandwidth]", "").Trim().Split(',');
                         if (splited.Length == 2)
                         {
                             var uploadSplited = splited[0].Split(':');

Netch/Controllers/NTTController.cs

@@ -73,6 +73,7 @@ namespace Netch.Controllers
                 if (Instance != null && !Instance.HasExited)
                 {
                     Instance.Kill();
+                    Instance.WaitForExit();
                 }
             }
             catch (Exception e)
@@ -89,6 +90,7 @@ namespace Netch.Controllers
                 {
                     File.Delete("logging\\NTT.log");
                 }
+
                 File.AppendAllText("logging\\NTT.log", $"{e.Data}\r\n");
             }
         }

Netch/Controllers/PrivoxyController.cs

@@ -73,6 +73,7 @@ namespace Netch.Controllers
                 if (Instance != null && !Instance.HasExited)
                 {
                     Instance.Kill();
+                    Instance.WaitForExit();
                 }
             }
             catch (Exception)

Netch/Controllers/SSController.cs

@@ -1,7 +1,10 @@
 using Netch.Forms;
+using Netch.Utils;
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading;
 
 namespace Netch.Controllers
@@ -27,11 +30,39 @@ namespace Netch.Controllers
         public bool Start(Models.Server server, Models.Mode mode)
         {
             MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Shadowsocks")}");
+
+            File.Delete("logging\\shadowsocks.log");
+            //从DLL启动Shaowsocks
+            if (Global.Settings.BootShadowsocksFromDLL && (mode.Type == 0 || mode.Type == 1 || mode.Type == 2 || mode.Type == 3))
+            {
+                State = Models.State.Starting;
+                var client = Encoding.UTF8.GetBytes($"0.0.0.0:{Global.Settings.Socks5LocalPort}");
+                var remote = Encoding.UTF8.GetBytes($"{server.Hostname}:{server.Port}");
+                var passwd = Encoding.UTF8.GetBytes($"{server.Password}");
+                var method = Encoding.UTF8.GetBytes($"{server.EncryptMethod}");
+                if (!NativeMethods.Shadowsocks.Info(client, remote, passwd, method))
+                {
+                    State = Models.State.Stopped;
+                    Logging.Info("DLL SS INFO 设置失败！");
+                    return false;
+                }
+                Logging.Info("DLL SS INFO 设置成功！");
+
+                if (!NativeMethods.Shadowsocks.Start())
+                {
+                    State = Models.State.Stopped;
+                    Logging.Info("DLL SS 启动失败！");
+                    return false;
+                }
+                Logging.Info("DLL SS 启动成功！");
+                State = Models.State.Started;
+                return true;
+            }
+
             if (!File.Exists("bin\\Shadowsocks.exe"))
             {
                 return false;
             }
-
             Instance = MainController.GetProcess();
             Instance.StartInfo.FileName = "bin\\Shadowsocks.exe";
 
@@ -86,9 +117,16 @@ namespace Netch.Controllers
         {
             try
             {
+                if (Global.Settings.BootShadowsocksFromDLL)
+                {
+                    NativeMethods.Shadowsocks.Stop();
+                    return;
+                }
+
                 if (Instance != null && !Instance.HasExited)
                 {
                     Instance.Kill();
+                    Instance.WaitForExit();
                 }
             }
             catch (Exception e)
@@ -99,26 +137,33 @@ namespace Netch.Controllers
 
         public void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
         {
-            if (!string.IsNullOrWhiteSpace(e.Data))
+            try
             {
-                // File.AppendAllText("logging\\shadowsocks.log", $"{e.Data}\r\n");
-
-                if (State == Models.State.Starting)
+                if (!string.IsNullOrWhiteSpace(e.Data))
                 {
-                    if (Instance.HasExited)
+                    File.AppendAllText("logging\\shadowsocks.log", $"{e.Data}\r\n");
+
+                    if (State == Models.State.Starting)
                     {
-                        State = Models.State.Stopped;
-                    }
-                    else if (e.Data.Contains("listening at"))
-                    {
-                        State = Models.State.Started;
-                    }
-                    else if (e.Data.Contains("Invalid config path") || e.Data.Contains("usage") || e.Data.Contains("plugin service exit unexpectedly"))
-                    {
-                        State = Models.State.Stopped;
+                        if (Instance.HasExited)
+                        {
+                            State = Models.State.Stopped;
+                        }
+                        else if (e.Data.Contains("listening at"))
+                        {
+                            State = Models.State.Started;
+                        }
+                        else if (e.Data.Contains("Invalid config path") || e.Data.Contains("usage") || e.Data.Contains("plugin service exit unexpectedly"))
+                        {
+                            State = Models.State.Stopped;
+                        }
                     }
                 }
             }
+            catch (Exception ec)
+            {
+                Logging.Info("写入Shadowsocks日志失败" + ec.ToString());
+            }
         }
     }
 }

Netch/Controllers/SSRController.cs

@@ -27,6 +27,9 @@ namespace Netch.Controllers
         public bool Start(Models.Server server, Models.Mode mode)
         {
             MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting ShadowsocksR")}");
+
+            File.Delete("logging\\shadowsocksr.log");
+
             if (!File.Exists("bin\\ShadowsocksR.exe"))
             {
                 return false;
@@ -34,7 +37,7 @@ namespace Netch.Controllers
 
             Instance = MainController.GetProcess();
             Instance.StartInfo.FileName = "bin\\ShadowsocksR.exe";
-            Instance.StartInfo.Arguments = $"-s {server.Hostname} -p {server.Port} -k \"{server.Password}\" -m {server.EncryptMethod} -t 600";
+            Instance.StartInfo.Arguments = $"-s {server.Hostname} -p {server.Port} -k \"{server.Password}\" -m {server.EncryptMethod} -t 120";
 
             if (!string.IsNullOrEmpty(server.Protocol))
             {
@@ -103,6 +106,7 @@ namespace Netch.Controllers
                 if (Instance != null && !Instance.HasExited)
                 {
                     Instance.Kill();
+                    Instance.WaitForExit();
                 }
             }
             catch (Exception e)

Netch/Controllers/TUNTAPController.cs

@@ -68,7 +68,7 @@ namespace Netch.Controllers
         public bool SetupBypass()
         {
             MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("SetupBypass")}");
-            Logging.Info("设置绕行规则->设置让服务器 IP 走直连");
+            Logging.Info("设置绕行规则 → 设置让服务器 IP 走直连");
             // 让服务器 IP 走直连
             foreach (var address in ServerAddresses)
             {
@@ -81,7 +81,7 @@ namespace Netch.Controllers
             // 处理模式的绕过中国
             if (SavedMode.BypassChina)
             {
-                Logging.Info("设置绕行规则->处理模式的绕过中国");
+                Logging.Info("设置绕行规则 → 处理模式的绕过中国");
                 using (var sr = new StringReader(Encoding.UTF8.GetString(Properties.Resources.CNIP)))
                 {
                     string text;
@@ -95,7 +95,7 @@ namespace Netch.Controllers
                 }
             }
 
-            Logging.Info("设置绕行规则->处理全局绕过 IP");
+            Logging.Info("设置绕行规则 → 处理全局绕过 IP");
             // 处理全局绕过 IP
             foreach (var ip in Global.Settings.BypassIPs)
             {
@@ -108,7 +108,7 @@ namespace Netch.Controllers
                 }
             }
 
-            Logging.Info("设置绕行规则->处理绕过局域网 IP");
+            Logging.Info("设置绕行规则 → 处理绕过局域网 IP");
             // 处理绕过局域网 IP
             foreach (var ip in BypassLanIPs)
             {
@@ -123,7 +123,7 @@ namespace Netch.Controllers
 
             if (SavedMode.Type == 2) // 处理仅规则内走直连
             {
-                Logging.Info("设置绕行规则->处理仅规则内走直连");
+                Logging.Info("设置绕行规则 → 处理仅规则内走直连");
                 // 将 TUN/TAP 网卡权重放到最高
                 var instance = new Process
                 {
@@ -138,7 +138,7 @@ namespace Netch.Controllers
                 };
                 instance.Start();
 
-                Logging.Info("设置绕行规则->创建默认路由");
+                Logging.Info("设置绕行规则 → 创建默认路由");
                 // 创建默认路由
                 if (!NativeMethods.CreateRoute("0.0.0.0", 0, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index, 10))
                 {
@@ -152,7 +152,7 @@ namespace Netch.Controllers
                     return false;
                 }
 
-                Logging.Info("设置绕行规则->创建规则路由");
+                Logging.Info("设置绕行规则 → 创建规则路由");
                 // 创建规则路由
                 foreach (var ip in SavedMode.Rule)
                 {
@@ -182,7 +182,7 @@ namespace Netch.Controllers
                         }
                     }
                 }
-                //处理NAT类型检测，由于协议的原因，无法仅通过域名确定需要代理的IP，自己记录解析了返回的IP，仅支持默认检测服务器
+                //处理 NAT 类型检测，由于协议的原因，无法仅通过域名确定需要代理的 IP，自己记录解析了返回的 IP，仅支持默认检测服务器
                 if (Global.Settings.STUN_Server == "stun.stunprotocol.org")
                 {
                     try
@@ -200,13 +200,13 @@ namespace Netch.Controllers
                     }
                     catch
                     {
-                        Logging.Info("NAT类型测试域名解析失败，将不会被添加到代理列表。");
+                        Logging.Info("NAT 类型测试域名解析失败，将不会被添加到代理列表");
                     }
                 }
                 //处理DNS代理
                 if (Global.Settings.TUNTAP.ProxyDNS)
                 {
-                    Logging.Info("设置绕行规则->处理自定义DNS代理");
+                    Logging.Info("设置绕行规则 → 处理自定义 DNS 代理");
                     if (Global.Settings.TUNTAP.UseCustomDNS)
                     {
                         string dns = "";
@@ -228,6 +228,9 @@ namespace Netch.Controllers
                         if (int.TryParse("32", out var prefix))
                         {
                             NativeMethods.CreateRoute("1.1.1.1", prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                            NativeMethods.CreateRoute("8.8.8.8", prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                            NativeMethods.CreateRoute("9.9.9.9", prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
+                            NativeMethods.CreateRoute("185.222.222.222", prefix, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index);
                         }
                     }
                 }
@@ -412,6 +415,8 @@ namespace Netch.Controllers
             Logging.Info($"tun2sock使用适配器：{adapterName}");
 
             string dns;
+            //V2ray使用Unbound本地DNS会导致查询异常缓慢故此V2ray不启动unbound而是使用自定义DNS
+            //if (Global.Settings.TUNTAP.UseCustomDNS || server.Type.Equals("VMess"))
             if (Global.Settings.TUNTAP.UseCustomDNS)
             {
                 dns = "";
@@ -428,7 +433,10 @@ namespace Netch.Controllers
             {
                 pDNSController.Start();
                 dns = "127.0.0.1";
-                //dns = "1.1.1.1,1.0.0.1";
+            }
+            if (Global.Settings.TUNTAP.UseFakeDNS)
+            {
+                dns += " -fakeDns";
             }
 
             if (server.Type == "Socks5")
@@ -449,6 +457,8 @@ namespace Netch.Controllers
             Instance.ErrorDataReceived += OnOutputDataReceived;
             Instance.OutputDataReceived += OnOutputDataReceived;
 
+            Logging.Info(Instance.StartInfo.Arguments);
+
             State = Models.State.Starting;
             Instance.Start();
             Instance.BeginErrorReadLine();

Netch/Controllers/TrojanController.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Netch.Controllers
+{
+    public class TrojanController
+    {
+        /// <summary>
+        ///     进程实例
+        /// </summary>
+        public Process Instance;
+
+        /// <summary>
+        ///     当前状态
+        /// </summary>
+        public Models.State State = Models.State.Waiting;
+
+        /// <summary>
+        ///		启动
+        /// </summary>
+        /// <param name="server">服务器</param>
+        /// <param name="mode">模式</param>
+        /// <returns>是否启动成功</returns>
+        public bool Start(Models.Server server, Models.Mode mode)
+        {
+            Forms.MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Trojan")}");
+
+            File.Delete("logging\\trojan.log");
+            if (!File.Exists("bin\\Trojan.exe"))
+            {
+                return false;
+            }
+
+            File.WriteAllText("data\\last.json", Newtonsoft.Json.JsonConvert.SerializeObject(new Models.Trojan()
+            {
+                local_addr = Global.Settings.LocalAddress,
+                local_port = Global.Settings.Socks5LocalPort,
+                remote_addr = server.Hostname,
+                remote_port = server.Port,
+                password = new List<string>()
+                {
+                    server.Password
+                }
+            }));
+
+            Instance = MainController.GetProcess();
+            Instance.StartInfo.FileName = "bin\\Trojan.exe";
+            Instance.StartInfo.Arguments = "-c ..\\data\\last.json";
+            Instance.OutputDataReceived += OnOutputDataReceived;
+            Instance.ErrorDataReceived += OnOutputDataReceived;
+
+            State = Models.State.Starting;
+            Instance.Start();
+            Instance.BeginOutputReadLine();
+            Instance.BeginErrorReadLine();
+            for (var i = 0; i < 1000; i++)
+            {
+                Thread.Sleep(10);
+
+                if (State == Models.State.Started)
+                {
+                    return true;
+                }
+
+                if (State == Models.State.Stopped)
+                {
+                    Utils.Logging.Info("Trojan 进程启动失败");
+
+                    Stop();
+                    return false;
+                }
+            }
+
+            Utils.Logging.Info("Trojan 进程启动超时");
+            Stop();
+            return false;
+        }
+
+        /// <summary>
+        ///		停止
+        /// </summary>
+        public void Stop()
+        {
+            try
+            {
+                if (Instance != null && !Instance.HasExited)
+                {
+                    Instance.Kill();
+                    Instance.WaitForExit();
+                }
+            }
+            catch (Exception e)
+            {
+                Utils.Logging.Info(e.ToString());
+            }
+        }
+
+        public void OnOutputDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            if (!string.IsNullOrWhiteSpace(e.Data))
+            {
+                File.AppendAllText("logging\\trojan.log", $"{e.Data}\r\n");
+
+                if (State == Models.State.Starting)
+                {
+                    if (Instance.HasExited)
+                    {
+                        State = Models.State.Stopped;
+                    }
+                    else if (e.Data.Contains("started"))
+                    {
+                        State = Models.State.Started;
+                    }
+                    else if (e.Data.Contains("exiting"))
+                    {
+                        State = Models.State.Stopped;
+                    }
+                }
+            }
+        }
+    }
+}

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.4.2";
+        public const string Version = @"1.4.9";
 
         public async void Check(bool notifyNoFound, bool isPreRelease)
         {

Netch/Controllers/VMessController.cs

@@ -126,6 +126,15 @@ namespace Netch.Controllers
                         {
                             enabled = server.UseMux
                         }
+                    },
+                    (mode.Type==0||mode.Type==1||mode.Type==2) ? new Models.Information.VMess.Outbounds
+                    {
+                        tag = "TUNTAP",
+                        protocol = "freedom"
+                    }: new Models.Information.VMess.Outbounds
+                    {
+                        tag = "direct",
+                        protocol = "freedom"
                     }
                 },
                 routing = new Models.Information.VMess.Routing
@@ -216,6 +225,7 @@ namespace Netch.Controllers
                 if (Instance != null && !Instance.HasExited)
                 {
                     Instance.Kill();
+                    Instance.WaitForExit();
                 }
             }
             catch (Exception e)

Netch/Forms/AboutForm.Designer.cs

@@ -51,7 +51,7 @@
             // SponsorPictureBox
             // 
             this.SponsorPictureBox.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.SponsorPictureBox.Image = global::Netch.Properties.Resources.N3RO;
+            this.SponsorPictureBox.Image = global::Netch.Properties.Resources.Sponsor;
             this.SponsorPictureBox.Location = new System.Drawing.Point(6, 22);
             this.SponsorPictureBox.Name = "SponsorPictureBox";
             this.SponsorPictureBox.Size = new System.Drawing.Size(300, 200);

Netch/Forms/MainForm.Designer.cs

@@ -86,6 +86,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.AddTrojanServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.MenuStrip.SuspendLayout();
             this.ConfigurationGroupBox.SuspendLayout();
             this.configLayoutPanel.SuspendLayout();
@@ -127,7 +128,8 @@ namespace Netch.Forms
             this.AddSocks5ServerToolStripMenuItem,
             this.AddShadowsocksServerToolStripMenuItem,
             this.AddShadowsocksRServerToolStripMenuItem,
-            this.AddVMessServerToolStripMenuItem});
+            this.AddVMessServerToolStripMenuItem,
+            this.AddTrojanServerToolStripMenuItem});
             this.ServerToolStripMenuItem.Margin = new System.Windows.Forms.Padding(3, 0, 0, 1);
             this.ServerToolStripMenuItem.Name = "ServerToolStripMenuItem";
             this.ServerToolStripMenuItem.Size = new System.Drawing.Size(57, 21);
@@ -277,7 +279,7 @@ namespace Netch.Forms
             // 
             this.reinstallTapDriverToolStripMenuItem.Name = "reinstallTapDriverToolStripMenuItem";
             this.reinstallTapDriverToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
-            this.reinstallTapDriverToolStripMenuItem.Text = "Reinstall Tap driver";
+            this.reinstallTapDriverToolStripMenuItem.Text = "Reinstall TUN/TAP driver";
             this.reinstallTapDriverToolStripMenuItem.Click += new System.EventHandler(this.reinstallTapDriverToolStripMenuItem_Click);
             // 
             // AboutToolStripButton
@@ -638,6 +640,13 @@ namespace Netch.Forms
             this.ProfileTable.Size = new System.Drawing.Size(599, 43);
             this.ProfileTable.TabIndex = 0;
             // 
+            // AddTrojanServerToolStripMenuItem
+            // 
+            this.AddTrojanServerToolStripMenuItem.Name = "AddTrojanServerToolStripMenuItem";
+            this.AddTrojanServerToolStripMenuItem.Size = new System.Drawing.Size(259, 22);
+            this.AddTrojanServerToolStripMenuItem.Text = "Add [Trojan] Server";
+            this.AddTrojanServerToolStripMenuItem.Click += new System.EventHandler(this.AddTrojanServerToolStripMenuItem_Click);
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -738,5 +747,6 @@ namespace Netch.Forms
         private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem updateACLWithProxyToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem reinstallTapDriverToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem AddTrojanServerToolStripMenuItem;
     }
 }

Netch/Forms/MainForm.cs

@@ -68,16 +68,21 @@ namespace Netch.Forms
         /// <param name="e"></param>
         void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
         {
-            switch (e.Mode)
+            //不对Netch命令等待状态的电源事件做任何处理
+            if (!State.Equals(Models.State.Waiting))
             {
-                case PowerModes.Suspend://操作系统即将挂起
-                    Logging.Info("操作系统即将挂起，自动停止===>" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
-                    ControlFun();
-                    break;
-                case PowerModes.Resume://操作系统即将从挂起状态继续
-                    Logging.Info("操作系统即将从挂起状态继续，自动重启===>" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
-                    ControlFun();
-                    break;
+                switch (e.Mode)
+                {
+                    case PowerModes.Suspend://操作系统即将挂起
+                        Logging.Info("操作系统即将挂起，自动停止===>" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+                        ControlFun();
+                        break;
+                    case PowerModes.Resume://操作系统即将从挂起状态继续
+                        Logging.Info("操作系统即将从挂起状态继续，自动重启===>" + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));
+                        ControlFun();
+                        break;
+                }
+
             }
         }
         private void CheckUpdate()
@@ -95,10 +100,16 @@ namespace Netch.Forms
 
         public void TestServer()
         {
-            Parallel.ForEach(Global.Settings.Server, new ParallelOptions { MaxDegreeOfParallelism = 16 }, server =>
+            try
             {
-                server.Test();
-            });
+                Parallel.ForEach(Global.Settings.Server, new ParallelOptions { MaxDegreeOfParallelism = 16 }, server =>
+                {
+                    server.Test();
+                });
+            }
+            catch (Exception)
+            {
+            }
         }
 
         public void InitServer()
@@ -167,7 +178,7 @@ namespace Netch.Forms
 
                                 if (splited.Length >= 1)
                                 {
-                                    mode.Remark = splited[0].Trim();
+                                    mode.Remark = Utils.i18N.Translate(splited[0].Trim());
                                 }
 
                                 if (splited.Length >= 2)
@@ -249,13 +260,17 @@ namespace Netch.Forms
         private void SaveConfigs()
         {
             Global.Settings.ServerComboBoxSelectedIndex = ServerComboBox.SelectedIndex;
-            if (ModeComboBox.Tag is object[] list)
+            if (ModeComboBox.Items.Count!=0 && ModeComboBox.SelectedItem != null)
             {
-                Global.Settings.ModeComboBoxSelectedIndex = list.ToList().IndexOf(ModeComboBox.SelectedItem);
-            }
-            else
-            {
-                Global.Settings.ModeComboBoxSelectedIndex = ModeComboBox.Items.IndexOf(ModeComboBox.SelectedItem);
+
+                if (ModeComboBox.Tag is object[] list)
+                {
+                    Global.Settings.ModeComboBoxSelectedIndex = list.ToList().IndexOf(ModeComboBox.SelectedItem);
+                }
+                else
+                {
+                    Global.Settings.ModeComboBoxSelectedIndex = ModeComboBox.Items.IndexOf(ModeComboBox.SelectedItem);
+                }
             }
             Utils.Configuration.Save();
         }
@@ -326,9 +341,6 @@ namespace Netch.Forms
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            // 加载配置
-            Utils.Configuration.Load();
-
             // 加载服务器
             InitServer();
 
@@ -342,6 +354,7 @@ namespace Netch.Forms
             AddShadowsocksServerToolStripMenuItem.Text = Utils.i18N.Translate(AddShadowsocksServerToolStripMenuItem.Text);
             AddShadowsocksRServerToolStripMenuItem.Text = Utils.i18N.Translate(AddShadowsocksRServerToolStripMenuItem.Text);
             AddVMessServerToolStripMenuItem.Text = Utils.i18N.Translate(AddVMessServerToolStripMenuItem.Text);
+            AddTrojanServerToolStripMenuItem.Text = Utils.i18N.Translate(AddTrojanServerToolStripMenuItem.Text);
             ModeToolStripMenuItem.Text = Utils.i18N.Translate(ModeToolStripMenuItem.Text);
             CreateProcessModeToolStripMenuItem.Text = Utils.i18N.Translate(CreateProcessModeToolStripMenuItem.Text);
             ManageProcessModeToolStripMenuItem.Text = Utils.i18N.Translate(ManageProcessModeToolStripMenuItem.Text);
@@ -483,6 +496,12 @@ namespace Netch.Forms
             Hide();
         }
 
+        private void AddTrojanServerToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            new Server.Trojan().Show();
+            Hide();
+        }
+
         private void CreateProcessModeToolStripButton_Click(object sender, EventArgs e)
         {
             new Mode.Process().Show();
@@ -502,6 +521,9 @@ namespace Netch.Forms
 
         private void UpdateServersFromSubscribeLinksToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            if (Global.Settings.UseProxyToUpdateSubscription && ServerComboBox.SelectedIndex == -1)
+                Global.Settings.UseProxyToUpdateSubscription = false;
+
             if (Global.Settings.UseProxyToUpdateSubscription)
             {
                 // 当前 ServerComboBox 中至少有一项
@@ -750,6 +772,9 @@ namespace Netch.Forms
                     case "VMess":
                         new Server.VMess(ServerComboBox.SelectedIndex).Show();
                         break;
+                    case "Trojan":
+                        new Server.Trojan(ServerComboBox.SelectedIndex).Show();
+                        break;
                     default:
                         return;
                 }
@@ -806,7 +831,7 @@ namespace Netch.Forms
         }
         public void ControlFun()
         {
-            //聚焦到启动按钮，防止模式选择框变成蓝色:D
+            //聚焦到启动按钮，防止模式选择框变成蓝色:D，不过好像没啥用
             ControlButton.Focus();
             SaveConfigs();
             if (State == Models.State.Waiting || State == Models.State.Stopped)
@@ -956,6 +981,8 @@ namespace Netch.Forms
                         reinstallTapDriverToolStripMenuItem.Enabled = true;
                         ServerComboBox.Enabled = true;
                         ModeComboBox.Enabled = true;
+                        //隐藏NTT测试
+                        NatTypeStatusLabel.Visible = false;
 
                         ControlButton.Text = Utils.i18N.Translate("Start");
                         StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Start failed")}";
@@ -1000,6 +1027,8 @@ namespace Netch.Forms
                     reinstallTapDriverToolStripMenuItem.Enabled = true;
                     ServerComboBox.Enabled = true;
                     ModeComboBox.Enabled = true;
+                    //隐藏NTT测试
+                    NatTypeStatusLabel.Visible = false;
 
                     ControlButton.Text = Utils.i18N.Translate("Start");
                     StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Stopped")}";
@@ -1340,6 +1369,7 @@ namespace Netch.Forms
         }
         public void NatTypeStatusText(string text)
         {
+            NatTypeStatusLabel.Visible = true;
             if (!string.IsNullOrWhiteSpace(text))
             {
                 NatTypeStatusLabel.Text = "NAT" + Utils.i18N.Translate(": ") + text;
@@ -1397,15 +1427,10 @@ namespace Netch.Forms
                         NotifyIcon.ShowBalloonTip(5,
                                 UpdateChecker.Name, Utils.i18N.Translate("ACL updated successfully"),
                                 ToolTipIcon.Info);
-                        //MessageBox.Show(Utils.i18N.Translate("ACL updated successfully"));
                     }
                     else
                     {
-                        Utils.Logging.Info("ACL更新失败！" + args.Error);
-                        /*NotifyIcon.ShowBalloonTip(5,
-                                UpdateChecker.Name,
-                                Utils.i18N.Translate("ACL update failed") + args.Error,
-                                ToolTipIcon.Error);*/
+                        Utils.Logging.Info("ACL 更新失败！" + args.Error);
                         MessageBox.Show(Utils.i18N.Translate("ACL update failed") + "\n" + args.Error);
                     }
                 }
@@ -1455,11 +1480,7 @@ namespace Netch.Forms
                 }
                 catch (Exception e)
                 {
-                    Utils.Logging.Info("使用代理更新ACL失败！" + e.Message);
-                    /*NotifyIcon.ShowBalloonTip(5,
-                            UpdateChecker.Name,
-                            Utils.i18N.Translate("ACL update failed") + args.Error,
-                            ToolTipIcon.Error);*/
+                    Utils.Logging.Info("使用代理更新 ACL 失败！" + e.Message);
                     MessageBox.Show(Utils.i18N.Translate("ACL update failed") + "\n" + e.Message);
                 }
                 finally
@@ -1478,20 +1499,20 @@ namespace Netch.Forms
         {
             Task.Run(() =>
             {
-                StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Reinstalling Tap driver")}");
+                StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Reinstalling TUN/TAP driver")}");
                 Enabled = false;
                 try
                 {
                     Configuration.deltapall();
                     Configuration.addtap();
                     NotifyIcon.ShowBalloonTip(5,
-                            UpdateChecker.Name, Utils.i18N.Translate("Reinstall Tap driver successfully"),
+                            UpdateChecker.Name, Utils.i18N.Translate("Reinstall TUN/TAP driver successfully"),
                             ToolTipIcon.Info);
                 }
                 catch
                 {
                     NotifyIcon.ShowBalloonTip(5,
-                            UpdateChecker.Name, Utils.i18N.Translate("Reinstall Tap driver failed"),
+                            UpdateChecker.Name, Utils.i18N.Translate("Reinstall TUN/TAP driver failed"),
                             ToolTipIcon.Error);
                 }
                 finally

Netch/Forms/Server/Shadowsocks.cs

@@ -114,7 +114,8 @@ namespace Netch.Forms.Server
                     Password = PasswordTextBox.Text,
                     EncryptMethod = EncryptMethodComboBox.Text,
                     Plugin = PluginTextBox.Text,
-                    PluginOption = PluginOptionsTextBox.Text
+                    PluginOption = PluginOptionsTextBox.Text,
+                    Country = null
                 };
             }
 

Netch/Forms/Server/ShadowsocksR.cs

@@ -134,7 +134,8 @@ namespace Netch.Forms.Server
                     Protocol = ProtocolComboBox.Text,
                     ProtocolParam = ProtocolParamTextBox.Text,
                     OBFS = OBFSComboBox.Text,
-                    OBFSParam = OBFSOptionParamTextBox.Text
+                    OBFSParam = OBFSOptionParamTextBox.Text,
+                    Country = null
                 };
             }
 

Netch/Forms/Server/Socks5.cs

@@ -97,7 +97,8 @@ namespace Netch.Forms.Server
                     Hostname = AddressTextBox.Text,
                     Port = int.Parse(PortTextBox.Text),
                     Username = UsernameTextBox.Text,
-                    Password = PasswordTextBox.Text
+                    Password = PasswordTextBox.Text,
+                    Country = null
                 };
             }
 

Netch/Forms/Server/Trojan.Designer.cs

@@ -0,0 +1,176 @@
+namespace Netch.Forms.Server
+{
+    partial class Trojan
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Trojan));
+            this.ConfigurationGroupBox = new System.Windows.Forms.GroupBox();
+            this.PasswordTextBox = new System.Windows.Forms.TextBox();
+            this.PasswordLabel = new System.Windows.Forms.Label();
+            this.AddressLabel = new System.Windows.Forms.Label();
+            this.PortTextBox = new System.Windows.Forms.TextBox();
+            this.AddressTextBox = new System.Windows.Forms.TextBox();
+            this.RemarkTextBox = new System.Windows.Forms.TextBox();
+            this.RemarkLabel = new System.Windows.Forms.Label();
+            this.PortLabel = new System.Windows.Forms.Label();
+            this.ControlButton = new System.Windows.Forms.Button();
+            this.ConfigurationGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // ConfigurationGroupBox
+            // 
+            this.ConfigurationGroupBox.Controls.Add(this.PasswordTextBox);
+            this.ConfigurationGroupBox.Controls.Add(this.PasswordLabel);
+            this.ConfigurationGroupBox.Controls.Add(this.AddressLabel);
+            this.ConfigurationGroupBox.Controls.Add(this.PortTextBox);
+            this.ConfigurationGroupBox.Controls.Add(this.AddressTextBox);
+            this.ConfigurationGroupBox.Controls.Add(this.RemarkTextBox);
+            this.ConfigurationGroupBox.Controls.Add(this.RemarkLabel);
+            this.ConfigurationGroupBox.Controls.Add(this.PortLabel);
+            this.ConfigurationGroupBox.Location = new System.Drawing.Point(12, 12);
+            this.ConfigurationGroupBox.Name = "ConfigurationGroupBox";
+            this.ConfigurationGroupBox.Size = new System.Drawing.Size(420, 109);
+            this.ConfigurationGroupBox.TabIndex = 0;
+            this.ConfigurationGroupBox.TabStop = false;
+            this.ConfigurationGroupBox.Text = "Configuration";
+            // 
+            // PasswordTextBox
+            // 
+            this.PasswordTextBox.Location = new System.Drawing.Point(120, 77);
+            this.PasswordTextBox.Name = "PasswordTextBox";
+            this.PasswordTextBox.Size = new System.Drawing.Size(294, 23);
+            this.PasswordTextBox.TabIndex = 7;
+            this.PasswordTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // PasswordLabel
+            // 
+            this.PasswordLabel.AutoSize = true;
+            this.PasswordLabel.Location = new System.Drawing.Point(10, 80);
+            this.PasswordLabel.Name = "PasswordLabel";
+            this.PasswordLabel.Size = new System.Drawing.Size(64, 17);
+            this.PasswordLabel.TabIndex = 6;
+            this.PasswordLabel.Text = "Password";
+            // 
+            // AddressLabel
+            // 
+            this.AddressLabel.AutoSize = true;
+            this.AddressLabel.Location = new System.Drawing.Point(10, 51);
+            this.AddressLabel.Name = "AddressLabel";
+            this.AddressLabel.Size = new System.Drawing.Size(56, 17);
+            this.AddressLabel.TabIndex = 2;
+            this.AddressLabel.Text = "Address";
+            // 
+            // PortTextBox
+            // 
+            this.PortTextBox.Location = new System.Drawing.Point(358, 48);
+            this.PortTextBox.Name = "PortTextBox";
+            this.PortTextBox.Size = new System.Drawing.Size(56, 23);
+            this.PortTextBox.TabIndex = 5;
+            this.PortTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // AddressTextBox
+            // 
+            this.AddressTextBox.Location = new System.Drawing.Point(120, 48);
+            this.AddressTextBox.Name = "AddressTextBox";
+            this.AddressTextBox.Size = new System.Drawing.Size(232, 23);
+            this.AddressTextBox.TabIndex = 3;
+            this.AddressTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // RemarkTextBox
+            // 
+            this.RemarkTextBox.Location = new System.Drawing.Point(120, 19);
+            this.RemarkTextBox.Name = "RemarkTextBox";
+            this.RemarkTextBox.Size = new System.Drawing.Size(294, 23);
+            this.RemarkTextBox.TabIndex = 1;
+            this.RemarkTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // RemarkLabel
+            // 
+            this.RemarkLabel.AutoSize = true;
+            this.RemarkLabel.Location = new System.Drawing.Point(10, 22);
+            this.RemarkLabel.Name = "RemarkLabel";
+            this.RemarkLabel.Size = new System.Drawing.Size(53, 17);
+            this.RemarkLabel.TabIndex = 0;
+            this.RemarkLabel.Text = "Remark";
+            // 
+            // PortLabel
+            // 
+            this.PortLabel.AutoSize = true;
+            this.PortLabel.Location = new System.Drawing.Point(351, 51);
+            this.PortLabel.Name = "PortLabel";
+            this.PortLabel.Size = new System.Drawing.Size(11, 17);
+            this.PortLabel.TabIndex = 4;
+            this.PortLabel.Text = ":";
+            // 
+            // ControlButton
+            // 
+            this.ControlButton.Location = new System.Drawing.Point(357, 127);
+            this.ControlButton.Name = "ControlButton";
+            this.ControlButton.Size = new System.Drawing.Size(75, 23);
+            this.ControlButton.TabIndex = 1;
+            this.ControlButton.Text = "Save";
+            this.ControlButton.UseVisualStyleBackColor = true;
+            this.ControlButton.Click += new System.EventHandler(this.ControlButton_Click);
+            // 
+            // Trojan
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.ClientSize = new System.Drawing.Size(444, 161);
+            this.Controls.Add(this.ControlButton);
+            this.Controls.Add(this.ConfigurationGroupBox);
+            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.MaximizeBox = false;
+            this.Name = "Trojan";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Trojan";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Trojan_FormClosing);
+            this.Load += new System.EventHandler(this.Trojan_Load);
+            this.ConfigurationGroupBox.ResumeLayout(false);
+            this.ConfigurationGroupBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox ConfigurationGroupBox;
+        private System.Windows.Forms.Button ControlButton;
+        private System.Windows.Forms.Label RemarkLabel;
+        private System.Windows.Forms.TextBox RemarkTextBox;
+        private System.Windows.Forms.Label PortLabel;
+        private System.Windows.Forms.TextBox AddressTextBox;
+        private System.Windows.Forms.TextBox PortTextBox;
+        private System.Windows.Forms.Label AddressLabel;
+        private System.Windows.Forms.TextBox PasswordTextBox;
+        private System.Windows.Forms.Label PasswordLabel;
+    }
+}

Netch/Forms/Server/Trojan.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Drawing;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+
+namespace Netch.Forms.Server
+{
+    public partial class Trojan : Form
+    {
+        public int Index;
+
+        /// <summary>
+        ///     初始化
+        /// </summary>
+        /// <param name="index">需要编辑的索引</param>
+        public Trojan(int index = -1)
+        {
+            InitializeComponent();
+
+            Index = index;
+        }
+
+        private void Trojan_Load(object sender, EventArgs e)
+        {
+            ConfigurationGroupBox.Text = Utils.i18N.Translate(ConfigurationGroupBox.Text);
+            RemarkLabel.Text = Utils.i18N.Translate(RemarkLabel.Text);
+            AddressLabel.Text = Utils.i18N.Translate(AddressLabel.Text);
+            PasswordLabel.Text = Utils.i18N.Translate(PasswordLabel.Text);
+            ControlButton.Text = Utils.i18N.Translate(ControlButton.Text);
+
+            if (Index != -1)
+            {
+                RemarkTextBox.Text = Global.Settings.Server[Index].Remark;
+                AddressTextBox.Text = Global.Settings.Server[Index].Hostname;
+                PortTextBox.Text = Global.Settings.Server[Index].Port.ToString();
+                PasswordTextBox.Text = Global.Settings.Server[Index].Password;
+            }
+        }
+
+        private void Trojan_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            Global.MainForm.Show();
+        }
+
+        private void ComboBox_DrawItem(object sender, DrawItemEventArgs e)
+        {
+            var cbx = sender as ComboBox;
+            if (cbx != null)
+            {
+                e.DrawBackground();
+
+                if (e.Index >= 0)
+                {
+                    var sf = new StringFormat();
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+
+                    var brush = new SolidBrush(cbx.ForeColor);
+
+                    if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
+                    {
+                        brush = SystemBrushes.HighlightText as SolidBrush;
+                    }
+
+                    e.Graphics.DrawString(cbx.Items[e.Index].ToString(), cbx.Font, brush, e.Bounds, sf);
+                }
+            }
+        }
+
+        private void ControlButton_Click(object sender, EventArgs e)
+        {
+            if (!Regex.Match(PortTextBox.Text, "^[0-9]+$").Success)
+            {
+                return;
+            }
+            if (Index == -1)
+            {
+                Global.Settings.Server.Add(new Models.Server
+                {
+                    Remark = RemarkTextBox.Text,
+                    Type = "Trojan",
+                    Hostname = AddressTextBox.Text,
+                    Port = int.Parse(PortTextBox.Text),
+                    Password = PasswordTextBox.Text
+                });
+            }
+            else
+            {
+                Global.Settings.Server[Index] = new Models.Server
+                {
+                    Remark = RemarkTextBox.Text,
+                    Group = Global.Settings.Server[Index].Group,
+                    Type = "Trojan",
+                    Hostname = AddressTextBox.Text,
+                    Port = int.Parse(PortTextBox.Text),
+                    Password = PasswordTextBox.Text,
+                    Country = null
+                };
+            }
+
+            Utils.Configuration.Save();
+            MessageBox.Show(Utils.i18N.Translate("Saved"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+            Global.MainForm.InitServer();
+            Close();
+        }
+    }
+}

Netch/Forms/Server/Vmess.cs

@@ -155,7 +155,8 @@ namespace Netch.Forms.Server
                     QUICSecure = QUICSecurityComboBox.Text,
                     QUICSecret = QUICSecretTextBox.Text,
                     TLSSecure = TLSSecureCheckBox.Checked,
-                    UseMux = UseMuxCheckBox.Checked
+                    UseMux = UseMuxCheckBox.Checked,
+                    Country = null
                 };
             }
 

Netch/Forms/SettingForm.Designer.cs

@@ -38,8 +38,9 @@
             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.UseFakeDNSCheckBox = new System.Windows.Forms.CheckBox();
+            this.ProxyDNSCheckBox = new System.Windows.Forms.CheckBox();
+            this.UseCustomDNSCheckBox = new System.Windows.Forms.CheckBox();
             this.TUNTAPDNSLabel = new System.Windows.Forms.Label();
             this.TUNTAPDNSTextBox = new System.Windows.Forms.TextBox();
             this.TUNTAPGatewayLabel = new System.Windows.Forms.Label();
@@ -51,16 +52,18 @@
             this.ControlButton = new System.Windows.Forms.Button();
             this.GlobalBypassIPsButton = new System.Windows.Forms.Button();
             this.BehaviorGroupBox = new System.Windows.Forms.GroupBox();
+            this.LanguageLabel = new System.Windows.Forms.Label();
+            this.LanguageComboBox = new System.Windows.Forms.ComboBox();
+            this.BootShadowsocksFromDLLCheckBox = new System.Windows.Forms.CheckBox();
+            this.AclAddr = new System.Windows.Forms.TextBox();
+            this.AclLabel = new System.Windows.Forms.Label();
             this.DetectionInterval_Label = new System.Windows.Forms.Label();
             this.DetectionInterval_TextBox = new System.Windows.Forms.TextBox();
             this.EnableStartedTcping_CheckBox = new System.Windows.Forms.CheckBox();
             this.DelayTestAfterStartup_Label = new System.Windows.Forms.Label();
-            this.BypassModeCheckBox = new System.Windows.Forms.CheckBox();
-            this.Redirector2checkBox = new System.Windows.Forms.CheckBox();
-            this.ExperimentalFunction_Label = new System.Windows.Forms.Label();
             this.STUN_ServerPortTextBox = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
+            this.STUNServerPortLabel = new System.Windows.Forms.Label();
+            this.STUNServerLabel = 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();
@@ -70,8 +73,6 @@
             this.StartWhenOpenedCheckBox = new System.Windows.Forms.CheckBox();
             this.StopWhenExitedCheckBox = new System.Windows.Forms.CheckBox();
             this.ExitWhenClosedCheckBox = new System.Windows.Forms.CheckBox();
-            this.AclAddr = new System.Windows.Forms.TextBox();
-            this.AclLabel = new System.Windows.Forms.Label();
             this.PortGroupBox.SuspendLayout();
             this.TUNTAPGroupBox.SuspendLayout();
             this.BehaviorGroupBox.SuspendLayout();
@@ -157,8 +158,9 @@
             // 
             // TUNTAPGroupBox
             // 
-            this.TUNTAPGroupBox.Controls.Add(this.TUNTAPProxyDNSCheckBox);
-            this.TUNTAPGroupBox.Controls.Add(this.TUNTAPUseCustomDNSCheckBox);
+            this.TUNTAPGroupBox.Controls.Add(this.UseFakeDNSCheckBox);
+            this.TUNTAPGroupBox.Controls.Add(this.ProxyDNSCheckBox);
+            this.TUNTAPGroupBox.Controls.Add(this.UseCustomDNSCheckBox);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPDNSLabel);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPDNSTextBox);
             this.TUNTAPGroupBox.Controls.Add(this.TUNTAPGatewayLabel);
@@ -174,26 +176,36 @@
             this.TUNTAPGroupBox.TabStop = false;
             this.TUNTAPGroupBox.Text = "TUN/TAP";
             // 
-            // TUNTAPProxyDNSCheckBox
+            // UseFakeDNSCheckBox
             // 
-            this.TUNTAPProxyDNSCheckBox.AutoSize = true;
-            this.TUNTAPProxyDNSCheckBox.Location = new System.Drawing.Point(120, 162);
-            this.TUNTAPProxyDNSCheckBox.Name = "TUNTAPProxyDNSCheckBox";
-            this.TUNTAPProxyDNSCheckBox.Size = new System.Drawing.Size(153, 21);
-            this.TUNTAPProxyDNSCheckBox.TabIndex = 10;
-            this.TUNTAPProxyDNSCheckBox.Text = "Proxy DNS in Mode 2";
-            this.TUNTAPProxyDNSCheckBox.UseVisualStyleBackColor = true;
+            this.UseFakeDNSCheckBox.AutoSize = true;
+            this.UseFakeDNSCheckBox.Location = new System.Drawing.Point(10, 160);
+            this.UseFakeDNSCheckBox.Name = "UseFakeDNSCheckBox";
+            this.UseFakeDNSCheckBox.Size = new System.Drawing.Size(110, 21);
+            this.UseFakeDNSCheckBox.TabIndex = 11;
+            this.UseFakeDNSCheckBox.Text = "Use Fake DNS";
+            this.UseFakeDNSCheckBox.UseVisualStyleBackColor = true;
             // 
-            // TUNTAPUseCustomDNSCheckBox
+            // ProxyDNSCheckBox
             // 
-            this.TUNTAPUseCustomDNSCheckBox.AutoSize = true;
-            this.TUNTAPUseCustomDNSCheckBox.Location = new System.Drawing.Point(120, 138);
-            this.TUNTAPUseCustomDNSCheckBox.Name = "TUNTAPUseCustomDNSCheckBox";
-            this.TUNTAPUseCustomDNSCheckBox.Size = new System.Drawing.Size(127, 21);
-            this.TUNTAPUseCustomDNSCheckBox.TabIndex = 9;
-            this.TUNTAPUseCustomDNSCheckBox.Text = "Use Custom DNS";
-            this.TUNTAPUseCustomDNSCheckBox.UseVisualStyleBackColor = true;
-            this.TUNTAPUseCustomDNSCheckBox.CheckedChanged += new System.EventHandler(this.TUNTAPUseCustomDNSCheckBox_CheckedChanged);
+            this.ProxyDNSCheckBox.AutoSize = true;
+            this.ProxyDNSCheckBox.Location = new System.Drawing.Point(261, 139);
+            this.ProxyDNSCheckBox.Name = "ProxyDNSCheckBox";
+            this.ProxyDNSCheckBox.Size = new System.Drawing.Size(153, 21);
+            this.ProxyDNSCheckBox.TabIndex = 10;
+            this.ProxyDNSCheckBox.Text = "Proxy DNS in Mode 2";
+            this.ProxyDNSCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // UseCustomDNSCheckBox
+            // 
+            this.UseCustomDNSCheckBox.AutoSize = true;
+            this.UseCustomDNSCheckBox.Location = new System.Drawing.Point(10, 139);
+            this.UseCustomDNSCheckBox.Name = "UseCustomDNSCheckBox";
+            this.UseCustomDNSCheckBox.Size = new System.Drawing.Size(127, 21);
+            this.UseCustomDNSCheckBox.TabIndex = 9;
+            this.UseCustomDNSCheckBox.Text = "Use Custom DNS";
+            this.UseCustomDNSCheckBox.UseVisualStyleBackColor = true;
+            this.UseCustomDNSCheckBox.CheckedChanged += new System.EventHandler(this.TUNTAPUseCustomDNSCheckBox_CheckedChanged);
             // 
             // TUNTAPDNSLabel
             // 
@@ -266,7 +278,7 @@
             // 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(781, 356);
+            this.ControlButton.Location = new System.Drawing.Point(804, 356);
             this.ControlButton.Name = "ControlButton";
             this.ControlButton.Size = new System.Drawing.Size(75, 23);
             this.ControlButton.TabIndex = 11;
@@ -287,18 +299,18 @@
             // 
             // BehaviorGroupBox
             // 
+            this.BehaviorGroupBox.Controls.Add(this.LanguageLabel);
+            this.BehaviorGroupBox.Controls.Add(this.LanguageComboBox);
+            this.BehaviorGroupBox.Controls.Add(this.BootShadowsocksFromDLLCheckBox);
             this.BehaviorGroupBox.Controls.Add(this.AclAddr);
             this.BehaviorGroupBox.Controls.Add(this.AclLabel);
             this.BehaviorGroupBox.Controls.Add(this.DetectionInterval_Label);
             this.BehaviorGroupBox.Controls.Add(this.DetectionInterval_TextBox);
             this.BehaviorGroupBox.Controls.Add(this.EnableStartedTcping_CheckBox);
             this.BehaviorGroupBox.Controls.Add(this.DelayTestAfterStartup_Label);
-            this.BehaviorGroupBox.Controls.Add(this.BypassModeCheckBox);
-            this.BehaviorGroupBox.Controls.Add(this.Redirector2checkBox);
-            this.BehaviorGroupBox.Controls.Add(this.ExperimentalFunction_Label);
             this.BehaviorGroupBox.Controls.Add(this.STUN_ServerPortTextBox);
-            this.BehaviorGroupBox.Controls.Add(this.label2);
-            this.BehaviorGroupBox.Controls.Add(this.label1);
+            this.BehaviorGroupBox.Controls.Add(this.STUNServerPortLabel);
+            this.BehaviorGroupBox.Controls.Add(this.STUNServerLabel);
             this.BehaviorGroupBox.Controls.Add(this.RunAtStartup);
             this.BehaviorGroupBox.Controls.Add(this.STUN_ServerTextBox);
             this.BehaviorGroupBox.Controls.Add(this.MinimizeWhenStartedCheckBox);
@@ -310,32 +322,77 @@
             this.BehaviorGroupBox.Controls.Add(this.ExitWhenClosedCheckBox);
             this.BehaviorGroupBox.Location = new System.Drawing.Point(438, 12);
             this.BehaviorGroupBox.Name = "BehaviorGroupBox";
-            this.BehaviorGroupBox.Size = new System.Drawing.Size(420, 333);
+            this.BehaviorGroupBox.Size = new System.Drawing.Size(441, 333);
             this.BehaviorGroupBox.TabIndex = 8;
             this.BehaviorGroupBox.TabStop = false;
             this.BehaviorGroupBox.Text = "Behavior";
             // 
+            // LanguageLabel
+            // 
+            this.LanguageLabel.AutoSize = true;
+            this.LanguageLabel.Location = new System.Drawing.Point(12, 305);
+            this.LanguageLabel.Name = "LanguageLabel";
+            this.LanguageLabel.Size = new System.Drawing.Size(65, 17);
+            this.LanguageLabel.TabIndex = 23;
+            this.LanguageLabel.Text = "Language";
+            // 
+            // LanguageComboBox
+            // 
+            this.LanguageComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.LanguageComboBox.FormattingEnabled = true;
+            this.LanguageComboBox.Location = new System.Drawing.Point(120, 302);
+            this.LanguageComboBox.Name = "LanguageComboBox";
+            this.LanguageComboBox.Size = new System.Drawing.Size(121, 25);
+            this.LanguageComboBox.TabIndex = 22;
+            // 
+            // BootShadowsocksFromDLLCheckBox
+            // 
+            this.BootShadowsocksFromDLLCheckBox.AutoSize = true;
+            this.BootShadowsocksFromDLLCheckBox.Location = new System.Drawing.Point(12, 102);
+            this.BootShadowsocksFromDLLCheckBox.Name = "BootShadowsocksFromDLLCheckBox";
+            this.BootShadowsocksFromDLLCheckBox.Size = new System.Drawing.Size(321, 21);
+            this.BootShadowsocksFromDLLCheckBox.TabIndex = 21;
+            this.BootShadowsocksFromDLLCheckBox.Text = "Start Shadowsocks from DLL (No support for ACL)";
+            this.BootShadowsocksFromDLLCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // AclAddr
+            // 
+            this.AclAddr.Location = new System.Drawing.Point(120, 273);
+            this.AclAddr.Name = "AclAddr";
+            this.AclAddr.Size = new System.Drawing.Size(315, 23);
+            this.AclAddr.TabIndex = 19;
+            this.AclAddr.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // AclLabel
+            // 
+            this.AclLabel.AutoSize = true;
+            this.AclLabel.Location = new System.Drawing.Point(12, 276);
+            this.AclLabel.Name = "AclLabel";
+            this.AclLabel.Size = new System.Drawing.Size(78, 17);
+            this.AclLabel.TabIndex = 20;
+            this.AclLabel.Text = "Custom ACL";
+            // 
             // DetectionInterval_Label
             // 
             this.DetectionInterval_Label.AutoSize = true;
-            this.DetectionInterval_Label.Location = new System.Drawing.Point(230, 151);
+            this.DetectionInterval_Label.Location = new System.Drawing.Point(229, 192);
             this.DetectionInterval_Label.Name = "DetectionInterval_Label";
-            this.DetectionInterval_Label.Size = new System.Drawing.Size(128, 17);
+            this.DetectionInterval_Label.Size = new System.Drawing.Size(136, 17);
             this.DetectionInterval_Label.TabIndex = 18;
-            this.DetectionInterval_Label.Text = "Detection interval(/s)";
+            this.DetectionInterval_Label.Text = "Detection interval(sec)";
             // 
             // DetectionInterval_TextBox
             // 
-            this.DetectionInterval_TextBox.Location = new System.Drawing.Point(364, 148);
+            this.DetectionInterval_TextBox.Location = new System.Drawing.Point(367, 189);
             this.DetectionInterval_TextBox.Name = "DetectionInterval_TextBox";
-            this.DetectionInterval_TextBox.Size = new System.Drawing.Size(47, 23);
+            this.DetectionInterval_TextBox.Size = new System.Drawing.Size(68, 23);
             this.DetectionInterval_TextBox.TabIndex = 17;
             this.DetectionInterval_TextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // EnableStartedTcping_CheckBox
             // 
             this.EnableStartedTcping_CheckBox.AutoSize = true;
-            this.EnableStartedTcping_CheckBox.Location = new System.Drawing.Point(152, 150);
+            this.EnableStartedTcping_CheckBox.Location = new System.Drawing.Point(144, 191);
             this.EnableStartedTcping_CheckBox.Name = "EnableStartedTcping_CheckBox";
             this.EnableStartedTcping_CheckBox.Size = new System.Drawing.Size(66, 21);
             this.EnableStartedTcping_CheckBox.TabIndex = 15;
@@ -345,67 +402,37 @@
             // DelayTestAfterStartup_Label
             // 
             this.DelayTestAfterStartup_Label.AutoSize = true;
-            this.DelayTestAfterStartup_Label.Location = new System.Drawing.Point(6, 151);
+            this.DelayTestAfterStartup_Label.Location = new System.Drawing.Point(12, 192);
             this.DelayTestAfterStartup_Label.Name = "DelayTestAfterStartup_Label";
-            this.DelayTestAfterStartup_Label.Size = new System.Drawing.Size(141, 17);
+            this.DelayTestAfterStartup_Label.Size = new System.Drawing.Size(126, 17);
             this.DelayTestAfterStartup_Label.TabIndex = 16;
-            this.DelayTestAfterStartup_Label.Text = "Delay test after startup";
-            // 
-            // BypassModeCheckBox
-            // 
-            this.BypassModeCheckBox.AutoSize = true;
-            this.BypassModeCheckBox.Location = new System.Drawing.Point(276, 307);
-            this.BypassModeCheckBox.Name = "BypassModeCheckBox";
-            this.BypassModeCheckBox.Size = new System.Drawing.Size(135, 21);
-            this.BypassModeCheckBox.TabIndex = 14;
-            this.BypassModeCheckBox.Text = "进程代理白名单模式";
-            this.BypassModeCheckBox.UseVisualStyleBackColor = true;
-            this.BypassModeCheckBox.CheckedChanged += new System.EventHandler(this.BypassModeCheckBox_CheckedChanged);
-            // 
-            // Redirector2checkBox
-            // 
-            this.Redirector2checkBox.AutoSize = true;
-            this.Redirector2checkBox.Location = new System.Drawing.Point(152, 306);
-            this.Redirector2checkBox.Name = "Redirector2checkBox";
-            this.Redirector2checkBox.Size = new System.Drawing.Size(118, 21);
-            this.Redirector2checkBox.TabIndex = 11;
-            this.Redirector2checkBox.Text = "是否启用2号核心";
-            this.Redirector2checkBox.UseVisualStyleBackColor = true;
-            // 
-            // ExperimentalFunction_Label
-            // 
-            this.ExperimentalFunction_Label.AutoSize = true;
-            this.ExperimentalFunction_Label.Location = new System.Drawing.Point(6, 307);
-            this.ExperimentalFunction_Label.Name = "ExperimentalFunction_Label";
-            this.ExperimentalFunction_Label.Size = new System.Drawing.Size(133, 17);
-            this.ExperimentalFunction_Label.TabIndex = 13;
-            this.ExperimentalFunction_Label.Text = "Experimental function";
+            this.DelayTestAfterStartup_Label.Text = "Delay test after start";
             // 
             // STUN_ServerPortTextBox
             // 
-            this.STUN_ServerPortTextBox.Location = new System.Drawing.Point(117, 206);
+            this.STUN_ServerPortTextBox.Location = new System.Drawing.Point(120, 244);
             this.STUN_ServerPortTextBox.Name = "STUN_ServerPortTextBox";
-            this.STUN_ServerPortTextBox.Size = new System.Drawing.Size(294, 23);
+            this.STUN_ServerPortTextBox.Size = new System.Drawing.Size(315, 23);
             this.STUN_ServerPortTextBox.TabIndex = 8;
             this.STUN_ServerPortTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // label2
+            // STUNServerPortLabel
             // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(6, 209);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(110, 17);
-            this.label2.TabIndex = 12;
-            this.label2.Text = "STUN Server Port";
+            this.STUNServerPortLabel.AutoSize = true;
+            this.STUNServerPortLabel.Location = new System.Drawing.Point(12, 247);
+            this.STUNServerPortLabel.Name = "STUNServerPortLabel";
+            this.STUNServerPortLabel.Size = new System.Drawing.Size(110, 17);
+            this.STUNServerPortLabel.TabIndex = 12;
+            this.STUNServerPortLabel.Text = "STUN Server Port";
             // 
-            // label1
+            // STUNServerLabel
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(6, 180);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(82, 17);
-            this.label1.TabIndex = 10;
-            this.label1.Text = "STUN Server";
+            this.STUNServerLabel.AutoSize = true;
+            this.STUNServerLabel.Location = new System.Drawing.Point(12, 221);
+            this.STUNServerLabel.Name = "STUNServerLabel";
+            this.STUNServerLabel.Size = new System.Drawing.Size(82, 17);
+            this.STUNServerLabel.TabIndex = 10;
+            this.STUNServerLabel.Text = "STUN Server";
             // 
             // RunAtStartup
             // 
@@ -419,9 +446,9 @@
             // 
             // STUN_ServerTextBox
             // 
-            this.STUN_ServerTextBox.Location = new System.Drawing.Point(117, 177);
+            this.STUN_ServerTextBox.Location = new System.Drawing.Point(120, 215);
             this.STUN_ServerTextBox.Name = "STUN_ServerTextBox";
-            this.STUN_ServerTextBox.Size = new System.Drawing.Size(294, 23);
+            this.STUN_ServerTextBox.Size = new System.Drawing.Size(315, 23);
             this.STUN_ServerTextBox.TabIndex = 11;
             this.STUN_ServerTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -438,7 +465,7 @@
             // ProfileCount_Label
             // 
             this.ProfileCount_Label.AutoSize = true;
-            this.ProfileCount_Label.Location = new System.Drawing.Point(6, 123);
+            this.ProfileCount_Label.Location = new System.Drawing.Point(12, 167);
             this.ProfileCount_Label.Name = "ProfileCount_Label";
             this.ProfileCount_Label.Size = new System.Drawing.Size(79, 17);
             this.ProfileCount_Label.TabIndex = 8;
@@ -446,9 +473,9 @@
             // 
             // ProfileCount_TextBox
             // 
-            this.ProfileCount_TextBox.Location = new System.Drawing.Point(203, 120);
+            this.ProfileCount_TextBox.Location = new System.Drawing.Point(209, 164);
             this.ProfileCount_TextBox.Name = "ProfileCount_TextBox";
-            this.ProfileCount_TextBox.Size = new System.Drawing.Size(208, 23);
+            this.ProfileCount_TextBox.Size = new System.Drawing.Size(226, 23);
             this.ProfileCount_TextBox.TabIndex = 9;
             this.ProfileCount_TextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
@@ -496,28 +523,11 @@
             this.ExitWhenClosedCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.ExitWhenClosedCheckBox.UseVisualStyleBackColor = true;
             // 
-            // AclAddr
-            // 
-            this.AclAddr.Location = new System.Drawing.Point(117, 235);
-            this.AclAddr.Name = "AclAddr";
-            this.AclAddr.Size = new System.Drawing.Size(294, 23);
-            this.AclAddr.TabIndex = 19;
-            this.AclAddr.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // AclLabel
-            // 
-            this.AclLabel.AutoSize = true;
-            this.AclLabel.Location = new System.Drawing.Point(6, 238);
-            this.AclLabel.Name = "AclLabel";
-            this.AclLabel.Size = new System.Drawing.Size(78, 17);
-            this.AclLabel.TabIndex = 20;
-            this.AclLabel.Text = "Custom ACL";
-            // 
             // SettingForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(868, 390);
+            this.ClientSize = new System.Drawing.Size(891, 390);
             this.Controls.Add(this.BehaviorGroupBox);
             this.Controls.Add(this.PortGroupBox);
             this.Controls.Add(this.GlobalBypassIPsButton);
@@ -561,7 +571,7 @@
         private System.Windows.Forms.TextBox TUNTAPDNSTextBox;
         private System.Windows.Forms.Button ControlButton;
         private System.Windows.Forms.Button GlobalBypassIPsButton;
-        private System.Windows.Forms.CheckBox TUNTAPUseCustomDNSCheckBox;
+        private System.Windows.Forms.CheckBox UseCustomDNSCheckBox;
         private System.Windows.Forms.CheckBox AllowDevicesCheckBox;
         private System.Windows.Forms.GroupBox BehaviorGroupBox;
         private System.Windows.Forms.CheckBox ExitWhenClosedCheckBox;
@@ -572,14 +582,11 @@
         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.Label STUNServerPortLabel;
+        private System.Windows.Forms.Label STUNServerLabel;
         private System.Windows.Forms.TextBox STUN_ServerTextBox;
         private System.Windows.Forms.TextBox STUN_ServerPortTextBox;
-        private System.Windows.Forms.CheckBox TUNTAPProxyDNSCheckBox;
-        private System.Windows.Forms.CheckBox Redirector2checkBox;
-        private System.Windows.Forms.Label ExperimentalFunction_Label;
-        private System.Windows.Forms.CheckBox BypassModeCheckBox;
+        private System.Windows.Forms.CheckBox ProxyDNSCheckBox;
         private System.Windows.Forms.TextBox DetectionInterval_TextBox;
         private System.Windows.Forms.CheckBox EnableStartedTcping_CheckBox;
         private System.Windows.Forms.Label DelayTestAfterStartup_Label;
@@ -588,5 +595,9 @@
         private System.Windows.Forms.TextBox RedirectorTextBox;
         private System.Windows.Forms.TextBox AclAddr;
         private System.Windows.Forms.Label AclLabel;
+        private System.Windows.Forms.CheckBox UseFakeDNSCheckBox;
+        private System.Windows.Forms.CheckBox BootShadowsocksFromDLLCheckBox;
+        private System.Windows.Forms.Label LanguageLabel;
+        private System.Windows.Forms.ComboBox LanguageComboBox;
     }
 }

Netch/Forms/SettingForm.cs

@@ -1,5 +1,9 @@
-using System;
+using Netch.Models.SSD;
+using System;
+using System.Globalization;
+using System.IO;
 using System.Net;
+using System.Text;
 using System.Windows.Forms;
 using TaskScheduler;
 
@@ -14,7 +18,7 @@ namespace Netch.Forms
 
         private void TUNTAPUseCustomDNSCheckBox_CheckedChanged(object sender, EventArgs e)
         {
-            if (!TUNTAPUseCustomDNSCheckBox.Checked)
+            if (!UseCustomDNSCheckBox.Checked)
             {
                 TUNTAPDNSTextBox.Enabled = false;
             }
@@ -50,10 +54,12 @@ namespace Netch.Forms
             TUNTAPAddressLabel.Text = Utils.i18N.Translate(TUNTAPAddressLabel.Text);
             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);
+            UseCustomDNSCheckBox.Text = Utils.i18N.Translate(UseCustomDNSCheckBox.Text);
+            ProxyDNSCheckBox.Text = Utils.i18N.Translate(ProxyDNSCheckBox.Text);
+            UseFakeDNSCheckBox.Text = Utils.i18N.Translate(UseFakeDNSCheckBox.Text);
             GlobalBypassIPsButton.Text = Utils.i18N.Translate(GlobalBypassIPsButton.Text);
             ControlButton.Text = Utils.i18N.Translate(ControlButton.Text);
+            BootShadowsocksFromDLLCheckBox.Text = Utils.i18N.Translate(BootShadowsocksFromDLLCheckBox.Text);
 
             ExitWhenClosedCheckBox.Checked = Global.Settings.ExitWhenClosed;
             StopWhenExitedCheckBox.Checked = Global.Settings.StopWhenExited;
@@ -61,10 +67,9 @@ namespace Netch.Forms
             CheckUpdateWhenOpenedCheckBox.Checked = Global.Settings.CheckUpdateWhenOpened;
             MinimizeWhenStartedCheckBox.Checked = Global.Settings.MinimizeWhenStarted;
             RunAtStartup.Checked = Global.Settings.RunAtStartup;
-            Redirector2checkBox.Checked = Global.Settings.UseRedirector2;
-            BypassModeCheckBox.Checked = Global.Settings.ProcessBypassMode;
             EnableStartedTcping_CheckBox.Checked = Global.Settings.StartedTcping;
             DetectionInterval_TextBox.Text = Global.Settings.StartedTcping_Interval.ToString();
+            BootShadowsocksFromDLLCheckBox.Checked = Global.Settings.BootShadowsocksFromDLL;
 
             Socks5PortTextBox.Text = Global.Settings.Socks5LocalPort.ToString();
             HTTPPortTextBox.Text = Global.Settings.HTTPLocalPort.ToString();
@@ -74,8 +79,9 @@ namespace Netch.Forms
             TUNTAPNetmaskTextBox.Text = Global.Settings.TUNTAP.Netmask;
             TUNTAPGatewayTextBox.Text = Global.Settings.TUNTAP.Gateway;
 
-            TUNTAPUseCustomDNSCheckBox.Checked = Global.Settings.TUNTAP.UseCustomDNS;
-            TUNTAPProxyDNSCheckBox.Checked = Global.Settings.TUNTAP.ProxyDNS;
+            UseCustomDNSCheckBox.Checked = Global.Settings.TUNTAP.UseCustomDNS;
+            ProxyDNSCheckBox.Checked = Global.Settings.TUNTAP.ProxyDNS;
+            UseFakeDNSCheckBox.Checked = Global.Settings.TUNTAP.UseFakeDNS;
 
             BehaviorGroupBox.Text = Utils.i18N.Translate(BehaviorGroupBox.Text);
             ExitWhenClosedCheckBox.Text = Utils.i18N.Translate(ExitWhenClosedCheckBox.Text);
@@ -85,11 +91,12 @@ namespace Netch.Forms
             RunAtStartup.Text = Utils.i18N.Translate(RunAtStartup.Text);
             CheckUpdateWhenOpenedCheckBox.Text = Utils.i18N.Translate(CheckUpdateWhenOpenedCheckBox.Text);
             ProfileCount_Label.Text = Utils.i18N.Translate(ProfileCount_Label.Text);
-            ExperimentalFunction_Label.Text = Utils.i18N.Translate(ExperimentalFunction_Label.Text);
             DelayTestAfterStartup_Label.Text = Utils.i18N.Translate(DelayTestAfterStartup_Label.Text);
             EnableStartedTcping_CheckBox.Text = Utils.i18N.Translate(EnableStartedTcping_CheckBox.Text);
             DetectionInterval_Label.Text = Utils.i18N.Translate(DetectionInterval_Label.Text);
             DelayTestAfterStartup_Label.Text = Utils.i18N.Translate(DelayTestAfterStartup_Label.Text);
+            STUNServerLabel.Text = Utils.i18N.Translate(STUNServerLabel.Text);
+            STUNServerPortLabel.Text = Utils.i18N.Translate(STUNServerPortLabel.Text);
 
             ProfileCount_TextBox.Text = Global.Settings.ProfileCount.ToString();
             STUN_ServerTextBox.Text = Global.Settings.STUN_Server.ToString();
@@ -98,6 +105,10 @@ namespace Netch.Forms
             AclLabel.Text = Utils.i18N.Translate(AclLabel.Text);
             AclAddr.Text = Global.Settings.ACL.ToString();
 
+            LanguageLabel.Text = Utils.i18N.Translate(LanguageLabel.Text);
+            LanguageComboBox.Items.AddRange(Utils.i18N.GetTranslateList().ToArray());
+            LanguageComboBox.SelectedItem = Global.Settings.Language;
+
             if (Global.Settings.TUNTAP.DNS.Count > 0)
             {
                 var dns = "";
@@ -116,7 +127,7 @@ namespace Netch.Forms
                 TUNTAPDNSTextBox.Text = "1.1.1.1";
             }
 
-            if (!TUNTAPUseCustomDNSCheckBox.Checked)
+            if (!UseCustomDNSCheckBox.Checked)
             {
                 TUNTAPDNSTextBox.Enabled = false;
             }
@@ -156,9 +167,45 @@ namespace Netch.Forms
             Global.Settings.CheckUpdateWhenOpened = CheckUpdateWhenOpenedCheckBox.Checked;
             Global.Settings.MinimizeWhenStarted = MinimizeWhenStartedCheckBox.Checked;
             Global.Settings.RunAtStartup = RunAtStartup.Checked;
-            Global.Settings.UseRedirector2 = Redirector2checkBox.Checked;
-            Global.Settings.ProcessBypassMode = BypassModeCheckBox.Checked;
-            Global.Settings.StartedTcping = EnableStartedTcping_CheckBox.Checked;
+            Global.Settings.BootShadowsocksFromDLL = BootShadowsocksFromDLLCheckBox.Checked;
+            Global.Settings.Language = LanguageComboBox.SelectedItem.ToString();
+
+            // 加载系统语言
+            if (Global.Settings.Language.Equals("System"))
+            {
+                // 得到当前线程语言代码
+                var culture = CultureInfo.CurrentCulture.Name;
+
+                // 尝试加载内置中文语言
+                if (culture == "zh-CN")
+                {
+                    // 加载语言
+                    Utils.i18N.Load(Encoding.UTF8.GetString(Properties.Resources.zh_CN));
+                }
+
+                // 从外置文件中加载语言
+                if (File.Exists($"i18n\\{culture}"))
+                {
+                    // 加载语言
+                    Utils.i18N.Load(File.ReadAllText($"i18n\\{culture}"));
+                }
+            }
+
+            if (Global.Settings.Language.Equals("zh-CN"))
+            {
+                // 加载内置中文
+                Utils.i18N.Load(Encoding.UTF8.GetString(Properties.Resources.zh_CN));
+            }
+            else if (Global.Settings.Language.Equals("en-US"))
+            {
+                // 加载内置英文
+                Utils.i18N.Load(Global.Settings.Language);
+            }
+            else if (File.Exists($"i18n\\{Global.Settings.Language}"))
+            {
+                // 从外置文件中加载语言
+                Utils.i18N.Load(File.ReadAllText($"i18n\\{Global.Settings.Language}"));
+            }
 
             // 开机自启判断
             TaskSchedulerClass scheduler = new TaskSchedulerClass();
@@ -299,7 +346,7 @@ namespace Netch.Forms
                 }
                 DNS = DNS.Trim();
                 TUNTAPDNSTextBox.Text = DNS.Substring(0, DNS.Length - 1);
-                TUNTAPUseCustomDNSCheckBox.Checked = Global.Settings.TUNTAP.UseCustomDNS;
+                UseCustomDNSCheckBox.Checked = Global.Settings.TUNTAP.UseCustomDNS;
 
                 return;
             }
@@ -381,26 +428,13 @@ namespace Netch.Forms
                 Global.Settings.TUNTAP.DNS.Add(ip);
             }
 
-            Global.Settings.TUNTAP.UseCustomDNS = TUNTAPUseCustomDNSCheckBox.Checked;
-            Global.Settings.TUNTAP.ProxyDNS = TUNTAPProxyDNSCheckBox.Checked;
+            Global.Settings.TUNTAP.UseCustomDNS = UseCustomDNSCheckBox.Checked;
+            Global.Settings.TUNTAP.ProxyDNS = ProxyDNSCheckBox.Checked;
+            Global.Settings.TUNTAP.UseFakeDNS = UseFakeDNSCheckBox.Checked;
 
             Utils.Configuration.Save();
-            MessageBox.Show(Utils.i18N.Translate("Saved"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+            MessageBox.Show(Utils.i18N.Translate("Saved. Modify some settings need to restart the software"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
             Close();
         }
-
-        private void BypassModeCheckBox_CheckedChanged(object sender, EventArgs e)
-        {
-            if (BypassModeCheckBox.Checked)
-            {
-                Redirector2checkBox.Checked = false;
-                Redirector2checkBox.Enabled = false;
-            }
-            else
-            {
-                Redirector2checkBox.Enabled = true;
-            }
-
-        }
     }
 }

Netch/Forms/SubscribeForm.Designer.cs

@@ -62,7 +62,7 @@
             this.AddSubscriptionBox.Controls.Add(this.RemarkLabel);
             this.AddSubscriptionBox.Location = new System.Drawing.Point(12, 226);
             this.AddSubscriptionBox.Name = "AddSubscriptionBox";
-            this.AddSubscriptionBox.Size = new System.Drawing.Size(660, 132);
+            this.AddSubscriptionBox.Size = new System.Drawing.Size(660, 135);
             this.AddSubscriptionBox.TabIndex = 1;
             this.AddSubscriptionBox.TabStop = false;
             // 
@@ -75,11 +75,11 @@
             // 
             // AddButton
             // 
-            this.AddButton.Location = new System.Drawing.Point(579, 103);
+            this.AddButton.Location = new System.Drawing.Point(541, 103);
             this.AddButton.Name = "AddButton";
-            this.AddButton.Size = new System.Drawing.Size(75, 23);
+            this.AddButton.Size = new System.Drawing.Size(113, 26);
             this.AddButton.TabIndex = 7;
-            this.AddButton.Text = "Add";
+            this.AddButton.Text = "Add / Modify";
             this.AddButton.UseVisualStyleBackColor = true;
             this.AddButton.Click += new System.EventHandler(this.AddButton_Click);
             // 
@@ -192,7 +192,7 @@
             // UseSelectedServerCheckBox
             // 
             this.UseSelectedServerCheckBox.AutoSize = true;
-            this.UseSelectedServerCheckBox.Location = new System.Drawing.Point(12, 364);
+            this.UseSelectedServerCheckBox.Location = new System.Drawing.Point(12, 396);
             this.UseSelectedServerCheckBox.Name = "UseSelectedServerCheckBox";
             this.UseSelectedServerCheckBox.Size = new System.Drawing.Size(285, 21);
             this.UseSelectedServerCheckBox.TabIndex = 9;

Netch/Forms/SubscribeForm.cs

@@ -1,5 +1,7 @@
-using System;
+using Netch.Utils;
+using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
 namespace Netch.Forms
@@ -54,7 +56,8 @@ namespace Netch.Forms
                 UseSelectedServerCheckBox.Enabled = true;
                 UseSelectedServerCheckBox.Checked = Global.Settings.UseProxyToUpdateSubscription;
             }
-            else {
+            else
+            {
                 UseSelectedServerCheckBox.Checked = false;
                 UseSelectedServerCheckBox.Enabled = false;
             }
@@ -84,26 +87,33 @@ namespace Netch.Forms
             {
                 if (SubscribeLinkListView.SelectedItems.Count > 0)
                 {
-                    for (var i = SubscribeLinkListView.SelectedItems.Count - 1; i >= 0; i--)
+                    DeleteSubscribe();
+                }
+            }
+        }
+        public void DeleteSubscribe()
+        {
+            if (SubscribeLinkListView.SelectedItems.Count > 0)
+            {
+                for (var i = SubscribeLinkListView.SelectedItems.Count - 1; i >= 0; i--)
+                {
+                    var item = SubscribeLinkListView.SelectedItems[i];
+                    var link = Global.Settings.SubscribeLink[item.Index];
+
+                    var list = new List<Models.Server>();
+                    foreach (var server in Global.Settings.Server)
                     {
-                        var item = SubscribeLinkListView.SelectedItems[i];
-                        var link = Global.Settings.SubscribeLink[item.Index];
-
-                        var list = new List<Models.Server>();
-                        foreach (var server in Global.Settings.Server)
+                        if (server.Group != link.Remark)
                         {
-                            if (server.Group != link.Remark)
-                            {
-                                list.Add(server);
-                            }
+                            list.Add(server);
                         }
-
-                        Global.Settings.Server = list;
-                        Global.Settings.SubscribeLink.RemoveAt(item.Index);
-                        SubscribeLinkListView.Items.Remove(item);
-
-                        Global.MainForm.InitServer();
                     }
+
+                    Global.Settings.Server = list;
+                    Global.Settings.SubscribeLink.RemoveAt(item.Index);
+                    SubscribeLinkListView.Items.Remove(item);
+
+                    Global.MainForm.InitServer();
                 }
             }
         }
@@ -116,12 +126,55 @@ namespace Netch.Forms
                 {
                     if (LinkTextBox.Text.StartsWith("HTTP://", StringComparison.OrdinalIgnoreCase) || LinkTextBox.Text.StartsWith("HTTPS://", StringComparison.OrdinalIgnoreCase))
                     {
-                        Global.Settings.SubscribeLink.Add(new Models.SubscribeLink
+                        //是否为新增订阅
+                        var saveFlag = true;
+                        Global.Settings.SubscribeLink.ForEach((subitem) =>
                         {
-                            Remark = RemarkTextBox.Text,
-                            Link = LinkTextBox.Text,
-                            UserAgent = UserAgentTextBox.Text
+                            if (subitem.Link.Equals(LinkTextBox.Text))
+                            {
+                                if (!subitem.Remark.Equals(RemarkTextBox.Text))
+                                {
+                                    //修改了订阅备注，修改旧订阅服务器
+                                    Global.Settings.Server.ForEach((serverItem) =>
+                                    {
+                                        try
+                                        {
+                                            //当前服务器组群组为订阅群组时批量修改备注
+                                            if (serverItem.Group == subitem.Remark) {
+
+                                                //serverItem.Group OldGroupRemark
+                                                //RemarkTextBox.Text NewGroupRemark
+                                                serverItem.Group = RemarkTextBox.Text;
+                                            }
+                                        }
+                                        catch (Exception)
+                                        {
+                                        }
+                                    });
+
+                                    subitem.Remark = RemarkTextBox.Text;
+                                    Global.MainForm.InitServer();
+                                }
+
+                                subitem.UserAgent = UserAgentTextBox.Text;
+                                saveFlag = false;
+
+                                Utils.Configuration.Save();
+                                Global.Settings.UseProxyToUpdateSubscription = UseSelectedServerCheckBox.Checked;
+                                MessageBox.Show(Utils.i18N.Translate("Successfully saved"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+
+                                return;
+                            }
                         });
+                        if (saveFlag)
+                        {
+                            Global.Settings.SubscribeLink.Add(new Models.SubscribeLink
+                            {
+                                Remark = RemarkTextBox.Text,
+                                Link = LinkTextBox.Text,
+                                UserAgent = UserAgentTextBox.Text
+                            });
+                        }
 
                         RemarkTextBox.Text = string.Empty;
                         LinkTextBox.Text = string.Empty;
@@ -160,7 +213,12 @@ namespace Netch.Forms
         /// <param name="e"></param>
         private void SubscribeLinkListView_SelectedIndexChanged(object sender, EventArgs e)
         {
-            //MessageBox.Show(SubscribeLinkListView.SelectedItems + "", Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+            if (SubscribeLinkListView.SelectedItems.Count > 0)
+            {
+                RemarkTextBox.Text = SubscribeLinkListView.SelectedItems[0].SubItems[0].Text;
+                LinkTextBox.Text = SubscribeLinkListView.SelectedItems[0].SubItems[1].Text;
+                UserAgentTextBox.Text = SubscribeLinkListView.SelectedItems[0].SubItems[2].Text;
+            }
         }
     }
 }

Netch/Models/Mode.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace Netch.Models
 {

Netch/Models/Server.cs

@@ -1,4 +1,7 @@
-using System;
+using MaxMind.GeoIP2;
+using Netch.Utils;
+using System;
+using System.Net;
 using System.Threading.Tasks;
 
 namespace Netch.Models
@@ -135,6 +138,11 @@ namespace Netch.Models
         /// </summary>
         public int Delay = -1;
 
+        /// <summary>
+        ///     地区
+        /// </summary>
+        public string Country;
+
         /// <summary>
 		///		获取备注
 		/// </summary>
@@ -146,16 +154,50 @@ namespace Netch.Models
                 Remark = $"{Hostname}:{Port}";
             }
 
+            if (Country == null)
+            {
+                try
+                {
+                    var databaseReader = new DatabaseReader("bin\\GeoLite2-Country.mmdb");
+
+                    if (IPAddress.TryParse(Hostname, out _) == true)
+                    {
+                        Country = databaseReader.Country(Hostname).Country.IsoCode;
+                    }
+                    else
+                    {
+                        var DnsResult = DNS.Lookup(Hostname);
+
+                        if (DnsResult != null)
+                        {
+                            Country = databaseReader.Country(DnsResult).Country.IsoCode;
+                        }
+                        else
+                        {
+                            Country = "UN";
+                        }
+                    }
+                }
+                catch (Exception)
+                {
+                    Country = "UN";
+                }
+            }
+
+            Group = Group.Equals("None") || Group.Equals("") ? "NONE" : Group;
+
             switch (Type)
             {
                 case "Socks5":
-                    return $"[S5] {Remark}";
+                    return $"[S5][{Country}][{Group}] {Remark}";
                 case "SS":
-                    return $"[SS] {Remark}";
+                    return $"[SS][{Country}][{Group}] {Remark}";
                 case "SSR":
-                    return $"[SR] {Remark}";
+                    return $"[SR][{Country}][{Group}] {Remark}";
                 case "VMess":
-                    return $"[V2] {Remark}";
+                    return $"[V2][{Country}][{Group}] {Remark}";
+                case "Trojan":
+                    return $"[TR][{Country}][{Group}] {Remark}";
                 default:
                     return "WTF";
             }

Netch/Models/Setting.cs

@@ -33,9 +33,14 @@ namespace Netch.Models
         public bool UseCustomDNS = false;
 
         /// <summary>
-        ///		模式2下是否代理DNS
+        ///		模式 2 下是否代理 DNS
         /// </summary>
         public bool ProxyDNS = false;
+
+        /// <summary>
+        ///		使用Fake DNS
+        /// </summary>
+        public bool UseFakeDNS = false;
     }
 
     /// <summary>
@@ -154,16 +159,6 @@ namespace Netch.Models
         /// </summary>
         public int STUN_Server_Port = 3478;
 
-        /// <summary>
-        ///     是否切换为2号核心
-        /// </summary>
-        public bool UseRedirector2 = false;
-
-        /// <summary>
-        ///     是否启用进程代理白名单模式
-        /// </summary>
-        public bool ProcessBypassMode = false;
-
         /// <summary>
         ///     是否启用启动后延迟测试
         /// </summary>
@@ -179,5 +174,14 @@ namespace Netch.Models
         /// </summary>
         public string ACL = "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/banAD.acl";
 
+        /// <summary>
+        ///     是否使用DLL启动Shadowsocks
+        /// </summary>
+        public bool BootShadowsocksFromDLL = false;
+
+        /// <summary>
+        ///     语言设置
+        /// </summary>
+        public string Language = "System";
     }
 }

Netch/Models/Trojan.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Netch.Models
+{
+    public class Trojan
+    {
+        /// <summary>
+        ///     启动类型
+        /// </summary>
+        public string run_type = "client";
+
+        /// <summary>
+        ///     监听地址
+        /// </summary>
+        public string local_addr = "127.0.0.1";
+
+        /// <summary>
+        ///     监听端口
+        /// </summary>
+        public int local_port = 2801;
+
+        /// <summary>
+        ///     远端地址
+        /// </summary>
+        public string remote_addr;
+
+        /// <summary>
+        ///     远端端口
+        /// </summary>
+        public int remote_port;
+
+        /// <summary>
+        ///     密码
+        /// </summary>
+        public List<string> password;
+
+        /// <summary>
+        ///     日志级别
+        /// </summary>
+        public int log_level = 1;
+
+        public TrojanSSL ssl = new TrojanSSL();
+        public TrojanTCP tcp = new TrojanTCP();
+    }
+
+    public class TrojanSSL
+    {
+        public bool verify = false;
+        public bool verify_hostname = false;
+        public string cert;
+        public string cipher = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA";
+        public string cipher_tls13 = "TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384";
+        public string sni;
+        public List<string> alpn = new List<string>()
+        {
+            "h2",
+            "http/1.1"
+        };
+        public bool reuse_session = true;
+        public bool session_ticket = true;
+        public string curves = "";
+    }
+
+    public class TrojanTCP
+    {
+        public bool no_delay = false;
+        public bool keep_alive = true;
+        public bool reuse_port = false;
+        public bool fast_open = true;
+        public int fast_open_qlen = 20;
+    }
+}

Netch/NativeMethods.cs

@@ -63,5 +63,15 @@ namespace Netch
         /// <returns>是否成功</returns>
         [DllImport("bin\\sysproxy", CallingConvention = CallingConvention.Cdecl)]
         public static extern bool SetURL([MarshalAs(UnmanagedType.LPTStr)] string remote);
+
+        public class Shadowsocks
+        {
+            [DllImport("bin\\shadowsocks-windows-dynamic", CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool Info(byte[] client, byte[] remote, byte[] passwd, byte[] method);
+            [DllImport("bin\\shadowsocks-windows-dynamic", CallingConvention = CallingConvention.Cdecl)]
+            public static extern bool Start();
+            [DllImport("bin\\shadowsocks-windows-dynamic", CallingConvention = CallingConvention.Cdecl)]
+            public static extern void Stop();
+        }
     }
 }

Netch/Netch.cs

@@ -1,5 +1,4 @@
-using Microsoft.Win32;
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -50,41 +49,48 @@ namespace Netch
                     }
                 }
 
-                // 得到当前线程语言代码
-                var culture = CultureInfo.CurrentCulture.Name;
+                // 加载配置
+                Utils.Configuration.Load();
 
-                // 如果命令行参数只有一个，且传入有效语言代码，那么覆盖掉已得到的语言代码
-                if (args.Length == 1)
+                // 加载系统语言
+                if (Global.Settings.Language.Equals("System"))
                 {
-                    try
+                    // 得到当前线程语言代码
+                    var culture = CultureInfo.CurrentCulture.Name;
+
+                    // 尝试加载内置中文语言
+                    if (culture == "zh-CN")
                     {
-                        culture = CultureInfo.GetCultureInfo(args[0]).Name;
+                        // 加载语言
+                        Utils.i18N.Load(Encoding.UTF8.GetString(Properties.Resources.zh_CN));
                     }
-                    catch (CultureNotFoundException)
+
+                    // 从外置文件中加载语言
+                    if (File.Exists($"i18n\\{culture}"))
                     {
-                        // 跳过
+                        // 加载语言
+                        Utils.i18N.Load(File.ReadAllText($"i18n\\{culture}"));
                     }
                 }
 
+                if (Global.Settings.Language.Equals("zh-CN"))
+                {
+                    // 加载内置中文
+                    Utils.i18N.Load(Encoding.UTF8.GetString(Properties.Resources.zh_CN));
+                }
+                else if (Global.Settings.Language.Equals("en-US"))
+                {
+                    // 加载内置英文
+                    Utils.i18N.Load(Global.Settings.Language);
+                }
+                else if (File.Exists($"i18n\\{Global.Settings.Language}"))
+                {
+                    // 从外置文件中加载语言
+                    Utils.i18N.Load(File.ReadAllText($"i18n\\{Global.Settings.Language}"));
+                }
+
                 // 记录当前系统语言
-                Utils.Logging.Info($"当前系统语言：{culture}");
-
-                // 尝试加载内置中文语言
-                if (culture == "zh-CN")
-                {
-                    // 加载语言
-                    Utils.i18N.Load(Encoding.UTF8.GetString(Properties.Resources.zh_CN));
-                }
-
-                // 记录当前程序语言
-                Utils.Logging.Info($"当前程序语言：{culture}");
-
-                // 从外置文件中加载语言
-                if (File.Exists($"i18n\\{culture}"))
-                {
-                    // 加载语言
-                    Utils.i18N.Load(File.ReadAllText($"i18n\\{culture}"));
-                }
+                Utils.Logging.Info($"当前语言：{Global.Settings.Language}");
 
                 // 检查是否已经运行
                 if (!mutex.WaitOne(0, false))
@@ -122,8 +128,11 @@ namespace Netch
 
         public static void Application_OnException(object sender, ThreadExceptionEventArgs e)
         {
-            MessageBox.Show(e.Exception.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            Application.Exit();
+            if (!e.Exception.ToString().Contains("ComboBox"))
+            {
+                MessageBox.Show(e.Exception.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            //Application.Exit();
         }
     }
 }

Netch/Netch.csproj

@@ -9,9 +9,10 @@
         <StartupObject>Netch.Netch</StartupObject>
         <ApplicationManifest>App.manifest</ApplicationManifest>
         <ApplicationIcon>Netch.ico</ApplicationIcon>
-        <Platforms>x86;x64</Platforms>
+        <Platforms>x64</Platforms>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <LangVersion>latest</LangVersion>
+        <PackageProjectUrl>https://github.com/NetchX/Netch</PackageProjectUrl>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -23,23 +24,6 @@
         <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)'=='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 />
@@ -66,8 +50,9 @@
 
     <ItemGroup>
         <PackageReference Include="ini-parser" Version="2.5.2" />
+        <PackageReference Include="MaxMind.GeoIP2" Version="3.2.0" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="System.Buffers" Version="4.5.0" />
+        <PackageReference Include="System.Buffers" Version="4.5.1" />
         <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
     </ItemGroup>
 
@@ -82,6 +67,9 @@
     </ItemGroup>
 
     <ItemGroup>
+        <Compile Update="Forms\Server\Trojan.cs">
+          <SubType>Form</SubType>
+        </Compile>
         <Compile Update="Properties\Resources.Designer.cs">
             <DesignTime>True</DesignTime>
             <AutoGen>True</AutoGen>
@@ -107,8 +95,8 @@
             <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\tap-driver\* $(TargetDir)bin\tap-driver &gt; NUL 2&gt;&amp;1" />
-    </Target>
     <ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
+    <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\* $(TargetDir)bin &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\* $(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\tap-driver\* $(TargetDir)bin\tap-driver &gt; NUL 2&gt;&amp;1&#xD;&#xA;&#xD;&#xA;DEL / f $(TargetDir)\*.config&#xD;&#xA;DEL / f $(TargetDir)\*.pdb" />
+    </Target>
 </Project>

Netch/Properties/Resources.Designer.cs

@@ -110,16 +110,6 @@ namespace Netch.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap N3RO {
-            get {
-                object obj = ResourceManager.GetObject("N3RO", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -140,6 +130,16 @@ namespace Netch.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap Sponsor {
+            get {
+                object obj = ResourceManager.GetObject("Sponsor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>

Netch/Properties/Resources.resx

@@ -139,8 +139,8 @@
   <data name="Netch" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Netch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="N3RO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\N3RO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Sponsor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Sponsor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CopyLink" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

Netch/Resources/zh-CN

@@ -19,6 +19,7 @@
     "Starting Shadowsocks": "正在启动 Shadowsocks",
     "Starting ShadowsocksR": "正在启动 ShadowsocksR",
     "Starting V2ray": "正在启动 V2Ray",
+    "Starting Trojan": "正在启动 Trojan",
     "Starting Tap": "正在启动 TUN/TAP",
     "Starting NatTester": "正在启动 NAT 测试",
     "Starting LocalDns service": "正在启动本地 DNS 服务",
@@ -29,7 +30,7 @@
     "SetupBypass": "设置绕行规则",
     "Test failed": "测试失败",
     "Starting update subscription": "正在更新订阅",
-    "Starting update ACL": "正在更新ACL",
+    "Starting update ACL": "正在更新 ACL",
     "Subscription updated": "订阅更新完毕",
     "Register driver": "正在注册驱动",
 
@@ -40,6 +41,7 @@
     "Add [Shadowsocks] Server": "添加 [Shadowsocks] 服务器",
     "Add [ShadowsocksR] Server": "添加 [ShadowsocksR] 服务器",
     "Add [VMess] Server": "添加 [VMess] 服务器",
+    "Add [Trojan] Server": "添加 [Trojan] 服务器",
     "VMess is currently not supported. For more information, please see our Github releases\n\nPress OK will redirect": "当前不支持 VMess 服务器。需要更多信息请查看我们的 Github 发布页\n\n点击 OK 将会跳转",
     "Netch is now minimized to the notification bar, double click this icon to restore.": "Netch 已最小化至通知栏，双击此图标恢复窗口。",
     "New version available": "发现新版本",
@@ -89,14 +91,14 @@
     "Modes have been reload": "模式已重载",
     "Clean DNS Cache": "清理 DNS 缓存",
     "DNS cache cleanup succeeded": "DNS 缓存清理成功",
-    "Update ACL": "更新ACL规则",
+    "Update ACL": "更新 ACL 规则",
     "Update ACL with proxy": "使用代理更新 ACL 规则",
     "ACL updated successfully": "ACL 更新成功",
-    "ACL update failed": "ACL更新失败",
-    "Reinstall Tap driver": "重新安装Tap驱动",
-    "Reinstall Tap driver successfully": "重装Tap驱动成功",
-    "Reinstall Tap driver failed": "重装Tap驱动失败",
-    "Reinstalling Tap driver": "正在重装Tap驱动",
+    "ACL update failed": "ACL 更新失败",
+    "Reinstall TUN/TAP driver": "重新安装 TUN/TAP 驱动",
+    "Reinstall TUN/TAP driver successfully": "重装 TUN/TAP 驱动成功",
+    "Reinstall TUN/TAP driver failed": "重装 TUN/TAP 驱动失败",
+    "Reinstalling TUN/TAP driver": "正在重装 TUN/TAP 驱动",
 
     "About": "关于",
     "Telegram Channel": "Telegram 频道",
@@ -123,6 +125,7 @@
     "Add": "添加",
     "Scan": "扫描",
     "Save": "保存",
+    "Add / Modify": "保存/修改",
     "Select a folder": "选择一个目录",
     "Please enter an process name (xxx.exe)": "请输入一个进程名（xxx.exe）",
     "Scan completed": "扫描完成",
@@ -153,28 +156,41 @@
     "Gateway": "网关",
     "Use Custom DNS": "使用自定义 DNS",
     "Proxy DNS in Mode 2": "在模式 2 下代理 DNS",
+    "Use Fake DNS": "使用 Fake DNS",
     "Behavior": "行为",
     "Exit when closed": "关闭时退出",
     "Stop when exited": "退出时停止",
     "Global Bypass IPs": "全局直连 IP",
     "Port value illegal. Try again.": "端口值非法。请重试。",
     "Check update when opened": "打开软件时检查更新",
+    "Start Shadowsocks from DLL (No support for ACL)": "SS DLL（推荐使用，不支持 ACL）",
     "ProfileCount": "快捷配置数量（重启软件生效）",
     "ProfileCount value illegal. Try again.": "快捷配置数值非法。请重试。",
     "STUN_ServerPort value illegal. Try again.": "STUN 端口数值非法。请重试。",
     "Detection interval value illegal. Try again.": "检测间隔值非法。请重试。",
     "TUN/TAP driver is not detected. Is it installed now?": "未检测到 TUN/TAP 驱动，是否现在安装？",
-    "Failed to set the system proxy, it may be caused by the lack of dependent programs. Do you want to jump to Netch's official website to download dependent programs?": "设置系统代理失败，可能是缺少依赖导致，是否跳转Netch官网下载依赖程序？",
+    "Failed to set the system proxy, it may be caused by the lack of dependent programs. Do you want to jump to Netch's official website to download dependent programs?": "设置系统代理失败，可能是缺少依赖导致，是否跳转 Netch 官网下载依赖程序？",
     "Experimental function": "实验性功能",
-    "Delay test after startup": "启动后延迟测试",
+    "Delay test after start": "启动后延迟测试",
     "Enable": "启用",
-    "Detection interval(/s)": "检测间隔（/秒）",
+    "Detection interval(sec)": "检测间隔（秒）",
+    "STUN Server": "STUN 服务器",
+    "STUN Server Port": "STUN 服务器端口",
     "Custom ACL": "自定义 ACL 规则",
+    "Language": "语言",
+    "Saved. Modify some settings need to restart the software": "保存成功，修改部分设置需重启软件",
 
     "Profile": "配置名",
     "Profiles": "配置",
     "None": "无",
 
     "Show": "显示",
-    "Exit": "退出"
+    "Exit": "退出",
+
+    "Bypass LAN": "[网页代理] 绕过局域网",
+    "Bypass LAN (Non System Proxy)": "[网页代理] 绕过局域网（不设置系统代理）",
+    "Bypass LAN (TUN/TAP)": "[TUN/TAP] 绕过局域网",
+    "Bypass LAN and China": "[网页代理] 绕过局域网和中国大陆",
+    "Bypass LAN and China (Non System Proxy)": "[网页代理] 绕过局域网和中国大陆 （不设置系统代理）",
+    "Bypass LAN and China (TUN/TAP)": "[TUN/TAP] 绕过局域网和中国大陆"
 }

Netch/Utils/ShareLink.cs

@@ -28,7 +28,7 @@ namespace Netch.Utils
         /// <returns>加密后的字符串</returns>
         public static string URLSafeBase64Encode(string text)
         {
-            return Convert.ToBase64String(Encoding.UTF8.GetBytes(text)).Replace("-", "+").Replace("_", "/").PadRight(text.Length + (4 - text.Length % 4) % 4, '=');
+            return Convert.ToBase64String(Encoding.UTF8.GetBytes(text)).Replace("+", "-").Replace("/", "_").Replace("=", "");
         }
 
         /// <summary>
@@ -395,7 +395,7 @@ namespace Netch.Utils
                     }
 
                     data.FakeType = vmess.type;
-                    if (!Global.FakeTypes.Contains(data.FakeType))
+                    if (data.FakeType.Length != 0 && !Global.FakeTypes.Contains(data.FakeType))
                     {
                         Logging.Info(string.Format("不支持的 VMess 伪装类型：{0}", data.FakeType));
                         return null;
@@ -516,6 +516,56 @@ namespace Netch.Utils
                     }
                     list.Add(NetchLink);
                 }
+                else if (text.StartsWith("trojan://"))
+                {
+                    var data = new Server();
+                    data.Type = "Trojan";
+
+                    text = text.Replace("/?", "?");
+                    try
+                    {
+                        if (text.Contains("#"))
+                        {
+                            data.Remark = HttpUtility.UrlDecode(text.Split('#')[1]);
+                            text = text.Split('#')[0];
+                        }
+                        if (text.Contains("?"))
+                        {
+                            var reg = new Regex(@"^(?<data>.+?)\?(.+)$");
+                            var regmatch = reg.Match(text);
+
+                            if (regmatch.Success)
+                            {
+                                var peer = HttpUtility.UrlDecode(HttpUtility.ParseQueryString(new Uri(text).Query).Get("peer"));
+
+                                if (peer != null)
+                                    data.Host = peer;
+
+                                text = regmatch.Groups["data"].Value;
+                            }
+                            else
+                            {
+                                throw new FormatException();
+                            }
+                        }
+                        var finder = new Regex(@"^trojan://(?<psk>.+?)@(?<server>.+):(?<port>\d+)");
+                        var match = finder.Match(text);
+                        if (!match.Success)
+                        {
+                            throw new FormatException();
+                        }
+
+                        data.Password = match.Groups["psk"].Value;
+                        data.Hostname = match.Groups["server"].Value;
+                        data.Port = int.Parse(match.Groups["port"].Value);
+
+                        list.Add(data);
+                    }
+                    catch (FormatException)
+                    {
+                        return null;
+                    }
+                }
             }
             catch (Exception e)
             {
@@ -523,6 +573,16 @@ namespace Netch.Utils
                 return null;
             }
 
+            byte[] emoji_bytes = { 240, 159 };
+            foreach (Server node in list)
+            {
+                var remark = Encoding.UTF8.GetBytes(node.Remark);
+                int start_index = 0;
+                while (remark.Length > start_index + 1 && remark[start_index] == emoji_bytes[0] && remark[start_index + 1] == emoji_bytes[1])
+                    start_index += 4;
+                node.Remark = Encoding.UTF8.GetString(remark.Skip(start_index).ToArray()).Trim();
+            }
+
             return list;
         }
         public static string UnBase64String(string value)

Netch/Utils/i18N.cs

@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
 
 namespace Netch.Utils
 {
@@ -16,6 +18,11 @@ namespace Netch.Utils
         /// <param name="text">语言文件</param>
         public static void Load(string text)
         {
+            if (text.Equals("en-US"))
+            {
+                Data.Clear();
+                return;
+            }
             var data = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(text);
 
             if (data != null)
@@ -42,5 +49,26 @@ namespace Netch.Utils
 
             return text;
         }
+
+        /// <summary>
+        ///     获取可使用的语言
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> GetTranslateList()
+        {
+            List<string> TranslateFile = new List<string>();
+            TranslateFile.Add("System");
+            TranslateFile.Add("zh-CN");
+            TranslateFile.Add("en-US");
+
+            if (Directory.Exists("i18n"))
+            {
+                foreach (var fileName in Directory.GetFiles("i18n", "*"))
+                {
+                    TranslateFile.Add(fileName.Substring(5));
+                }
+            }
+            return TranslateFile;
+        }
     }
 }

NetchLib/SearchComboBox.cs

@@ -82,69 +82,76 @@ namespace System.Windows.Forms
         private object[] newList;
         private void ReevaluateCompletionList()
         {
-            var currentSearchTerm = Text.ToLowerInvariant();
-            if (currentSearchTerm == _previousSearchTerm) return;
-
-            _previousSearchTerm = currentSearchTerm;
             try
             {
-                SuspendLayout();
-
-                var originalList = (object[])Tag;
-                if (originalList == null)
-                {
-                    Tag = originalList = Items.Cast<object>().ToArray();
-                }
-
-                if (string.IsNullOrEmpty(currentSearchTerm))
-                {
-                    if (Items.Count == originalList.Length) return;
-
-                    newList = originalList;
-                }
-                else
-                {
-                    newList = originalList.Where(x => x.ToString().ToLowerInvariant().Contains(currentSearchTerm)).ToArray();
-                }
+                var currentSearchTerm = Text.ToLowerInvariant();
+                if (currentSearchTerm == _previousSearchTerm) return;
 
+                _previousSearchTerm = currentSearchTerm;
                 try
                 {
-                    while (Items.Count > 0)
+                    SuspendLayout();
+
+                    var originalList = (object[])Tag;
+                    if (originalList == null)
                     {
-                        Items.RemoveAt(0);
+                        Tag = originalList = Items.Cast<object>().ToArray();
                     }
-                }
-                catch
-                {
+
+                    if (string.IsNullOrEmpty(currentSearchTerm))
+                    {
+                        if (Items.Count == originalList.Length) return;
+
+                        newList = originalList;
+                    }
+                    else
+                    {
+                        newList = originalList.Where(x => x.ToString().ToLowerInvariant().Contains(currentSearchTerm)).ToArray();
+                    }
+
                     try
                     {
-                        Items.Clear();
+                        while (Items.Count > 0)
+                        {
+                            Items.RemoveAt(0);
+                        }
                     }
                     catch
                     {
-                        // ignored
+                        try
+                        {
+                            Items.Clear();
+                        }
+                        catch
+                        {
+                            // ignored
+                        }
                     }
-                }
 
-                Items.AddRange(newList.ToArray());
+                    Items.AddRange(newList.ToArray());
+                }
+                finally
+                {
+                    if (currentSearchTerm.Length >= 2 && !DroppedDown)
+                    {
+                        DroppedDown = true;
+                        Cursor.Current = Cursors.Default;
+                        Text = currentSearchTerm;
+                        Select(currentSearchTerm.Length, 0);
+                    }
+
+                    if (Items.Count > 0)
+                    {
+                        DroppedDown = false;
+                        DroppedDown = true;
+                    }
+
+                    ResumeLayout(true);
+                }
             }
-            finally
+            catch
             {
-                if (currentSearchTerm.Length >= 2 && !DroppedDown)
-                {
-                    DroppedDown = true;
-                    Cursor.Current = Cursors.Default;
-                    Text = currentSearchTerm;
-                    Select(currentSearchTerm.Length, 0);
-                }
-
-                if (Items.Count > 0)
-                {
-                    DroppedDown = false;
-                    DroppedDown = true;
-                }
-
-                ResumeLayout(true);
+                // ignored
             }
         }
     }

README.md

@@ -1,15 +1,17 @@
 # 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)
+[![](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) ![Netch CI](https://github.com/NetchX/Netch/workflows/Netch%20CI/badge.svg)
           
 Game accelerator
 
 [简体中文](docs/README.zh-CN.md) (此版本内容更丰富)
 
+[Website](https://netch.org/)
+
 ## TOC
 - [Netch](#netch)
 	- [TOC](#toc)
 	- [Description](#description)
-	- [Sponsor](#sponsor)
+	- [Donate](#donate)
 	- [Screenshots](#screenshots)
 	- [Requirements](#requirements)
 
@@ -19,40 +21,26 @@ Netch is an open source game accelerator. Unlike SSTap, which needs to add rules
 
 As well, Netch avoid the restricted NAT problem caused by SSTap. You can use an NATTypeTester to test out what your NAT type is. When using SSTap to speed up some P2P gaming connections or the game is required for that kind of open NAT type, you may experience some bad situations such as unable to join the game.
 
-## Sponsor
-开发不易，以下为恰饭时间
-
-[![NyanCAT](docs/sponsor/nyancat.jpg)](https://nyancat.info)
-
-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)
+## Donate
+- XMR *48ju3ELNZEa6wwPBMexCJ9G218BGY2XwhH6B6bmkFuJ3QgM4hPw2Pra35jPtuBZSc7SLNWeBpiWJZWjQeMAiLnTx2tH2Efx*
 
 ## Screenshots
-
 ![](docs/screenshots/main.png)
 
 ## Requirements
-
 - Microsoft Visual C++ Runtime
 - [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-framework/net48)
 
 ## Quote
-https://github.com/eycorsican/go-tun2socks
-
-https://github.com/shadowsocks/shadowsocks-libev
-
-https://github.com/shadowsocksrr/shadowsocksr-libev
-
-https://github.com/v2ray/v2ray-core
-
-https://github.com/ACL4SSR/ACL4SSR
-
-https://github.com/felixonmars/dnsmasq-china-list
-
-https://github.com/NLnetLabs/unbound
-
-https://github.com/OpenVPN/tap-windows6
-
-https://sourceforge.net/projects/ijbswa/
+- [go-tun2socks](https://github.com/eycorsican/go-tun2socks)
+- [shadowsocks-libev](https://github.com/shadowsocks/shadowsocks-libev)
+- [shadowsocksr-libev](https://github.com/shadowsocksrr/shadowsocksr-libev)
+- [v2ray-core](https://github.com/v2ray/v2ray-core)
+- [trojan](https://github.com/trojan-gfw/trojan)
+- [ACL4SSR](https://github.com/ACL4SSR/ACL4SSR)
+- [dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
+- [unbound](https://github.com/NLnetLabs/unbound)
+- [tap-windows6](https://github.com/OpenVPN/tap-windows6)
+- [Privoxy](https://www.privoxy.org/)
+- [NatTypeTester](https://github.com/HMBSbige/NatTypeTester)
+- [NetFilter SDK](https://netfiltersdk.com/)

build.ps1

@@ -1,73 +0,0 @@
-# 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'
-    
-mkdir "$net_baseoutput\x64\Release\win-x64\bin"
-Copy-Item "$mainDir\binaries\x64\*" -destination "$net_baseoutput\x64\Release\win-x64\bin" -recurse
-mkdir "$net_baseoutput\x64\Release\win-x64\bin\tap-driver"
-Copy-Item "$mainDir\binaries\tap-driver\*" -destination "$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'
-    
-mkdir "$net_baseoutput\x86\Release\win-x86\bin"
-Copy-Item "$mainDir\binaries\x86\*" "$net_baseoutput\x86\Release\win-x86\bin"
-mkdir "$net_baseoutput\x86\Release\win-x86\bin\tap-driver"
-Copy-Item "$mainDir\binaries\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/Advanced_Usage.zh-CN.md

@@ -0,0 +1,221 @@
+# Netch 模式
+
+用于存储 Netch 模式文件的仓库
+
+
+
+## 目录
+
+1. [模式介绍](#模式介绍)
+   - 1.1 [模式 1 进程代理模式](#模式-1-进程代理模式)
+   - 1.2 [模式 2（需要自己新建模式文件） TUN/TAP IP 黑名单代理模式](#模式-2需要自己新建模式文件-tuntap-ip-黑名单代理模式)
+   - 1.3 [模式 3 TUN/TAP （IP 白名单）全局代理模式](#模式-3-tuntap-ip-白名单全局代理模式)
+   - 1.4 [模式 4 HTTP 系统代理](#模式-4-http-系统代理)
+   - 1.5 [模式 5 本地 Socks5 代理](#模式-5-本地-socks5-代理)
+   - 1.6 [模式 6 本地 Socks5 和 HTTP 代理](#模式-6-本地-socks5-和-http-代理)
+2. [Socks 5 代理中转](#socks-5-代理中转)
+3. [新建进程代理模式](#新建进程代理模式)
+   - 3.1 [模式](#模式)
+   - 3.2 [扫描](#扫描)
+   - 3.3 [启动](#启动)
+
+## 模式介绍
+
+目前 Netch 所有模式文件都在 `mode` 文件夹下。模式号即模式菜单中最左边中括号内数字
+
+内置的模式中，如果模式名中有 Bypass China 的部分，即该模式会绕过中国 IP 段
+
+模式 1 和模式 2 里面除了第一行格式不同，其他内容和 [SSTap-Rule](https://github.com/FQrabbit/SSTap-Rule) 相同。是否绕过中国的功能依赖于 [CNIP 文件](https://github.com/NetchX/Netch/blob/master/Netch/Resources/CNIP)
+
+模式 3 到模式 5 的是否绕过中国的功能依赖于 [acl 文件](https://github.com/NetchX/Netch/blob/master/binaries/default.acl)
+
+第一行格式均为如下样式，不同模式之间第一行的具体区别可以参照后面的内容
+
+```Python
+# 备注, 类型（是主项目 USAGE.zh-CN.md 里提到的模式类型的值减一）, 是否绕过中国（1 为是, 0 为否）
+```
+
+### 模式 1 进程代理模式
+
+- 根据进程名进行代理
+- 底层依赖于 [NetFilter SDK](https://netfiltersdk.com) 和 Redirector.exe（未开源）等
+- 对于第一次使用 Netch 的用户而言，不需要做多余的事情
+  - 若 [NetFilter SDK](https://netfiltersdk.com) 的驱动不存在，会自动安装
+  - 自动安装驱动时不会判断旧驱动是否需要更新
+  - 对于老用户而言，版本更新日志里如果提到要更新驱动，或者你发现无法使用本模式时，可以通过运行 `DriverUpdater.exe` 的方式强制覆盖旧驱动
+  - 相关代码 [NFController.cs](..\Netch\Controllers\NFController.cs)
+
+范例文件
+
+在这个模式里，第一行只有备注是有用的
+
+```
+# 备注
+进程名 1（会被代理）
+进程名 2
+...
+```
+
+### 模式 2（需要自己新建模式文件） TUN/TAP IP 黑名单代理模式
+
+- 黑名单代理指的是，除了名单内的 IP 走代理，其他连接都不走代理
+- 需要自己新建模式文件，第一行写法同模式 3，只是需要把 2 改成 1
+- 后续内容的格式同 [SSTap-rules](https://github.com/FQrabbit/SSTap-Rule)，任何规则问题建议到那边去提
+- 可以通过左下角的`设置`来配置 IP 地址，子网掩码，网关，DNS
+- 该模式下直连 IP 段无效，暂时没有代码实现
+- 底层依赖于 [Tap-Windows](https://github.com/OpenVPN/tap-windows) 适配器等
+- 如果 Netch 提示没有该适配器，可以直接安装 [Tap-Windows](https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe) 或者通过安装 [OpenVPN](https://openvpn.net/community-downloads/)，[SSTap](https://github.com/mayunbaba2/SSTap-beta-setup) 的方式获得该适配器
+
+范例文件
+
+在这个模式里，是否绕过中国的值是无效的
+
+```
+# 备注, 1
+无类别域间路由写法 1（目的 IP 在这个子网内的网络请求都会被代理）
+无类别域间路由写法 2
+...
+```
+
+### 模式 3 TUN/TAP （IP 白名单）全局代理模式
+
+- 白名单代理指的是，除了名单内的 IP 不走代理，其他连接都走代理
+- 可以通过左下角的`设置`来配置 IP 地址，子网掩码，网关，DNS，直连 IP 段
+- 底层依赖于 [Tap-Windows](https://github.com/OpenVPN/tap-windows) 适配器，tun2socks 等
+- 如果 Netch 提示没有该适配器，可以直接安装 [Tap-Windows](https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe) 或者通过安装 [OpenVPN](https://openvpn.net/community-downloads/)，[SSTap](https://github.com/mayunbaba2/SSTap-beta-setup) 的方式获得该适配器
+
+范例文件
+
+```
+# 备注, 2, 是否绕过中国（1 为是, 0 为否）
+无类别域间路由写法 1（目的 IP 只有在这个子网内的网络请求不会被代理，其他的都会被代理）
+无类别域间路由写法 2
+...
+```
+
+### 模式 4 HTTP 系统代理
+
+- 默认地址和端口为 127.0.0.1:2802
+- 端口可以在左下角设置里面更改
+- 会被设置为系统代理
+
+范例文件
+
+```
+# 备注, 3, 是否绕过中国（1 为是, 0 为否）
+（目前只有第一行是有效的）
+```
+
+### 模式 5 本地 Socks5 代理
+
+- 默认地址和端口为 127.0.0.1:2801
+- 端口可以在左下角设置里面更改
+- 不会被设置为系统代理，对于 Chrome 之类使用系统代理的浏览器需要设置使用插件 SwitchyOmega 之后才能被正常代理
+- 注意如果是使用 Firefox 的网络设置，请仅设置 Socks5 代理，清除其他代理配置，并取消勾选`为所有协议使用相同的代理服务器`
+- 其他模式均含 Socks5 代理，本模式可以理解为仅 Socks5 代理\
+
+范例文件
+
+```
+# 备注, 4, 是否绕过中国（1 为是, 0 为否）
+（目前只有第一行是有效的）
+```
+
+### 模式 6 本地 Socks5 和 HTTP 代理
+
+- Socks5 代理的默认地址和端口为 127.0.0.1:2801
+- HTTP 代理的默认地址和端口为 127.0.0.1:2802
+- 端口可以在左下角设置里面更改
+- 不会被设置为系统代理
+
+范例文件
+
+```
+# 备注, 5, 是否绕过中国（1 为是, 0 为否）
+（目前只有第一行是有效的）
+```
+
+## Socks 5 代理中转
+
+说明一下，Netch 并非是以网页代理为目的开发的程序，如果需要网络代理为目的的程序，需要 PAC，规则分流，订阅管理等功能的，请参考使用以下软件而非 Netch（均为 Windows 平台）
+
+ShadowsocksR
+
+- [HMBSbige/ShadowsocksR-Windows](https://github.com/HMBSbige/ShadowsocksR-Windows/releases)
+
+Shadowsocks
+
+- [Clash for Windows](https://github.com/Fndroid/clash_for_windows_pkg/releases)
+
+V2Ray
+
+- [V2RayN](https://github.com/2dust/v2rayN/releases)
+
+如果你想使用的代理工具目前 Netch 还不支持，或者需要一些 Netch 目前没有的功能，如 V2Ray 自定义配置，Socks5 本地代理规则分流的，可以在 Netch 里添加对应工具的本地 Socks5 代理端口后使用，注意如果你用的是模式 3 TUN/TAP （IP 白名单）全局代理模式，记得在`设置 - 全局直连 IP`中添加你的服务器 IP 地址，否则会产生代理回环
+
+## 新建进程代理模式
+
+- 现在软件还处在早期开发阶段，可能后续版本会发生很大变化，操作仅供参考
+
+当前版本已添加配置编辑功能，根据自己的情况，使用订阅或者别的方法添加代理配置，我这里使用的是剪贴板导入
+
+![剪贴板导入](https://raw.githubusercontent.com/BingLingGroup/BingLingGroup.github.io/img/Netch_guide/2019-06-24_210438.png)
+
+如果你发现你的程序没我截图的看起来清晰，可以右键 `Netch.exe - 属性 - 兼容性 - 更改高 DPI 设置 - 替代高 DPI 缩放执行 - 系统（增强）`
+
+### 模式
+
+如果你的游戏的模式已经被收录，也可以考虑在模式菜单中，选择使用已收录的模式。所有模式的文件，都在 `./mode/` 文件夹下，如果你需要多个模式的合并文件，可以使用记事本将其打开，将多个文件合并
+
+ping 的值未必准确，因为这只是你本地到代理服务器而非游戏服务器的延迟
+
+如果你的游戏的模式没被收录，可以看接下来的扫描步骤来手动创建模式
+
+接着点击菜单栏上的`模式 - 创建进程模式`
+
+![模式 - 创建进程模式](https://raw.githubusercontent.com/BingLingGroup/BingLingGroup.github.io/img/Netch_guide/2019-06-24%20211537.png)
+
+### 扫描
+
+在弹出的窗口中点击`扫描`
+
+![扫描](https://raw.githubusercontent.com/BingLingGroup/BingLingGroup.github.io/img/Netch_guide/2019-06-24%20211842.png)
+
+选择你要加速的游戏的安装路径，根据游戏不同，可能需要选择多个不同的目录进行扫描，参见[萌鹰的 Netch 教程](https://www.eaglemoe.com/archives/142)（包括 GTAOL 和 R6S 的配置方法）
+
+>4. 选定 GTA5 游戏目录，点击确定，软件会自动扫描目录下的 exe 程式并填写进去
+>5. 再次点击扫描，选择 SocialClub 的安装地址（一般为 C:\Program Files\Rockstar Games\Social Club），点击确定，点击保存
+>
+>注意：加入游戏时请不要忘记加入社交组件，比如说 GTA 不要忘记 SocialClub ，彩虹六号不要忘记 Uplay
+
+这里以战争雷霆为例，只需添加战争雷霆游戏根目录即可
+
+![选择路径](https://raw.githubusercontent.com/NetchX/Netch/master/docs/screenshots/Browse_For_Folder.png)
+
+扫描时可能需要稍等片刻，扫描后记得填写备注
+
+如果需要添加单个程序，也可以在添加按钮左侧的编辑栏中手动输入并添加
+
+之后点保存进行`保存`
+
+![保存](https://raw.githubusercontent.com/BingLingGroup/BingLingGroup.github.io/img/Netch_guide/2019-06-24%20212837.png)
+
+### 启动
+
+最后确认服务器一栏和模式一栏均为之前自己添加并需要使用的，没问题后点击`启动`即可
+
+![启动](https://raw.githubusercontent.com/BingLingGroup/BingLingGroup.github.io/img/Netch_guide/2019-06-24%20213121.png)
+
+启动后，你再去游戏根目录或者别的启动器如 Steam，Uplay 启动游戏即可。此时游戏就已经被代理了
+
+如果在 Netch 启动前就启动了游戏，建议重启游戏
+
+如果需要 Steam，Uplay 等启动器也被代理，参照前面的方式对 Steam，Uplay 根目录也进行扫描即可
+
+如果出现了启动失败，或者无法代理成功的情况，请先尝试`选项 - 重启服务`或`选项 - 卸载服务`，或者在退出 Netch 以后，点击运行在 Netch 根目录下的 `DriverUpdater.exe` 程序进行驱动更新
+
+
+
+## 语言支持
+
+Netch 支持多种语言，在启动时会根据系统语言选择自身语言。如果需要手动切换语言，可以在启动时加入命令行参数，命令行参数为目前支持的语言代码，可以去 [NetchTranslation/i18n](https://github.com/NetchX/NetchTranslation/tree/master/i18n) 文件夹下查看外部支持的语言代码文件。Netch 目前内置 en-US，zh-CN，外置 zh-TW。欢迎大家为 [NetchTranslation](https://github.com/NetchX/NetchTranslation) 提供其他语言的翻译

docs/Quickstart.zh-CN.md

@@ -13,30 +13,30 @@
 
 首先，点击`服务器`增加所需服务器
 
-<img width="50%" height="50%" src="screenshots/Add-server.png">
+<img width="50%" height="50%" src="screenshots/addServer.zh-CN.png">
 
 可手动添加单个服务器，或者通过剪切板链接添加单个服务器。也可通过订阅链接批量添加。
 
 点击 `订阅` ` 管理订阅链接` 进入以下界面。
 
-<img width="50%" height="50%" src="screenshots/Add-link.jpg">
+<img width="50%" height="50%" src="screenshots/addLink.zh-CN.png">
 
 填写备注与链接，点击添加，然后保存。保存后点击 `订阅` ` 从订阅链接更新服务器`。完成服务器添加。添加完服务器后可对服务器进行修改，删除和测速。
 
 ## 选择模式
 
-> 此处需要会一点英语，比如你应该知道`吃鸡`的英文名称是`PlayerUnknown's Battlegrounds`
+> 此处需要会一点英语，比如你应该知道 `吃鸡` 的英文名称是 `PlayerUnknown's Battlegrounds`
 
 1.3.7 上线了模式搜索功能，即在模式框里输入字符即可搜索，使用英文名称进行搜索，搜索到所需的模式后单击选择，启用模式。相对应的游戏即可被加速
 
-若没有所需的模式，请选择`[3] Bypass LAN and China (TUN/TAP)`的模式。此模式需要安装 [Tap-Windows](https://github.com/OpenVPN/tap-windows) 适配器，如果 Netch 提示没有该适配器，可以直接安装 [Tap-Windows](https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe) 来获得该适配器
+若没有所需的模式，请选择 `[3] Bypass LAN and China (TUN/TAP)` 的模式。此模式需要安装 [TAP-Windows](https://github.com/OpenVPN/tap-windows) 适配器，如果 Netch 提示没有该适配器，可以直接安装 [TAP-Windows](https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe) 来获得该适配器
 
-关于更多的模式说明，详见[进阶用法](https://github.com/NormanBB/NetchMode/blob/master/docs/README.zh-CN.md)。
+关于更多的模式说明，详见 [进阶用法](https://github.com/NormanBB/NetchMode/blob/master/docs/README.zh-CN.md)。
 
 选择完模式后，点击启用，游戏已被代理。这一步需在开启游戏前完成。
 
 ## 配置说明
 
-目前，netch支持自定义四个配置，填入配置名，选择相应的服务器和游戏模式，按下`Ctrl`与鼠标左键，即可保存当前配置。下次使用时，点击配置名即可快速启用。
+目前，Netch 支持自定义四个配置，填入配置名，选择相应的服务器和游戏模式，按下 `Ctrl` 与鼠标左键，即可保存当前配置。下次使用时，点击配置名即可快速启用。
 
-~~如果你还觉得不会用，可以去用SStap (逃~~
+~~ 如果你还觉得不会用，可以去用 SSTap (逃~~

docs/README.zh-CN.md

@@ -1,65 +1,51 @@
 # Netch
-[![](https://img.shields.io/badge/Telegram-频道-blue.svg)](https://t.me/Netch)
-> ~~issue已关，有问题可进tele群问，不保证回答，不保证解决，咕~~
+[![](https://img.shields.io/badge/Telegram-频道-blue)](https://t.me/Netch) [![](https://img.shields.io/badge/Telegram-讨论组-green)](https://t.me/Netch_Discuss_Group) ![Netch CI](https://github.com/NetchX/Netch/workflows/Netch%20CI/badge.svg)
 
 游戏加速工具
 
+[网站](https://netch.org/)
+
 ## TOC
-- [Netch](#netch)
-	- [TOC](#toc)
-	- [简介](#%e7%ae%80%e4%bb%8b)
-	- [赞助商](#%e8%b5%9e%e5%8a%a9%e5%95%86)
-    - [新手入门](Basic-usage.md)
-    - [进阶用法](https://github.com/NormanBB/NetchMode/blob/master/docs/README.zh-CN.md)
-	- [依赖](#%e4%be%9d%e8%b5%96)
+- [Netch](#Netch)
+	- [TOC](#TOC)
+	- [简介](#简介)
+	- [捐赠](#捐赠)
+    - [新手入门](Quickstart.zh-CN.md)
+    - [进阶用法](Advanced_Usage.zh-CN.md)
+	- [依赖](#依赖)
     - [语言支持](#语言支持)
     
 ## 简介
-
 Netch 是一款 Windows 平台的开源游戏加速工具，Netch 可以实现类似 SocksCap64 那样的进程代理，也可以实现 SSTap 那样的全局 TUN/TAP 代理，和 Shadowsocks-Windows 那样的本地 Socks5，HTTP 和系统代理。至于连接至远程服务器的代理协议，目前 Netch 支持以下代理协议：Shadowsocks，VMess，Socks5，ShadowsocksR
 
 与此同时 Netch 避免了 SSTap 的 NAT 问题 ，检查 NAT 类型即可知道是否有 NAT 问题。使用 SSTap 加速部分 P2P 联机，对 NAT 类型有要求的游戏时，可能会因为 NAT 类型严格遇到无法加入联机，或者其他影响游戏体验的情况
 
-## 赞助商
-开发不易，以下为恰饭时间
-
-[![NyanCAT](sponsor/nyancat.jpg)](https://nyancat.info)
-
-NyanCAT Network，全中转高质量节点，多条低倍率节点保证流量无忧，节点极低延迟涵盖五大洲。Netflix 视频党，游戏党，海外回国党必备，无需年付，月付 19 元起。[测速图](https://t.me/BGP2020/935)
-[加入 Telegram 群组](https://t.me/NyanCaaaat) 
-
-[![ManSora](sponsor/mansora.jpg)](https://www.mansora.net/cart.php)
+## 捐赠
+- XMR *48ju3ELNZEa6wwPBMexCJ9G218BGY2XwhH6B6bmkFuJ3QgM4hPw2Pra35jPtuBZSc7SLNWeBpiWJZWjQeMAiLnTx2tH2Efx*
 
 ## 新手入门
-
-[新手入门教程](Basic-usage.md)
+[新手入门教程](Quickstart.zh-CN.md)
 
 ## 进阶用法
-[进阶教程](https://github.com/NormanBB/NetchMode/blob/master/docs/README.zh-CN.md)
+[进阶教程](Advanced_Usage.zh-CN.md)
 ## 依赖
 - [Visual C++ 运行库合集](https://www.google.com/search?q=Visual+C%2B%2B+%E8%BF%90%E8%A1%8C%E5%BA%93%E5%90%88%E9%9B%86)
 - [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-framework/thank-you/net48-offline-installer)
 - [TAP-Windows](https://build.openvpn.net/downloads/releases/tap-windows-9.21.2.exe)
 
 ## 语言支持
-
 Netch 支持多种语言，在启动时会根据系统语言选择自身语言。如果需要手动切换语言，可以在启动时加入命令行参数，命令行参数为目前支持的语言代码，可以去 [NetchTranslation/i18n](https://github.com/NetchX/NetchTranslation/tree/master/i18n) 文件夹下查看外部支持的语言代码文件。Netch 目前内置 en-US，zh-CN，外置 zh-TW。欢迎大家为 [NetchTranslation](https://github.com/NetchX/NetchTranslation) 提供其他语言的翻译
 
 ## 引用
-https://github.com/eycorsican/go-tun2socks
-
-https://github.com/shadowsocks/shadowsocks-libev
-
-https://github.com/shadowsocksrr/shadowsocksr-libev
-
-https://github.com/v2ray/v2ray-core
-
-https://github.com/ACL4SSR/ACL4SSR
-
-https://github.com/felixonmars/dnsmasq-china-list
-
-https://github.com/NLnetLabs/unbound
-
-https://github.com/OpenVPN/tap-windows6
-
-https://sourceforge.net/projects/ijbswa/
+- [go-tun2socks](https://github.com/eycorsican/go-tun2socks)
+- [shadowsocks-libev](https://github.com/shadowsocks/shadowsocks-libev)
+- [shadowsocksr-libev](https://github.com/shadowsocksrr/shadowsocksr-libev)
+- [v2ray-core](https://github.com/v2ray/v2ray-core)
+- [trojan](https://github.com/trojan-gfw/trojan)
+- [ACL4SSR](https://github.com/ACL4SSR/ACL4SSR)
+- [dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
+- [unbound](https://github.com/NLnetLabs/unbound)
+- [tap-windows6](https://github.com/OpenVPN/tap-windows6)
+- [Privoxy](https://www.privoxy.org/)
+- [NatTypeTester](https://github.com/HMBSbige/NatTypeTester)
+- [NetFilter SDK](https://netfiltersdk.com/)