Update UpdateChecker.cs

BUILD.ps1

@@ -1,9 +1,8 @@
 Write-Host 'Building'
 
-dotnet build -p:Configuration="Release" `
+dotnet build `
+	-c "Release" `
 	-p:Platform="x64" `
-	-p:SolutionDir="$pwd\" `
-	-restore `
 	Netch\Netch.csproj
 
 if ($LASTEXITCODE) { exit $LASTEXITCODE } 

Interop.nfapinet/Interop.nfapinet.csproj

@@ -1,13 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0-windows7</TargetFramework>
+        <TargetFramework>net5.0-windows7.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <Configurations>Debug;Release</Configurations>
+        <Platforms>x64</Platforms>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <DebugType>none</DebugType>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+        <DebugType>none</DebugType>
+        <DebugSymbols>false</DebugSymbols>
     </PropertyGroup>
 
 </Project>

Netch.sln

@@ -22,10 +22,10 @@ Global
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Debug|x64.ActiveCfg = Debug|x64
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Debug|x64.Build.0 = Debug|x64
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Release|x64.ActiveCfg = Release|x64
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.Build.0 = Release|Any CPU
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.ActiveCfg = Debug|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.Build.0 = Debug|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.ActiveCfg = Release|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Netch/Controllers/NFController.cs

@@ -25,14 +25,15 @@ namespace Netch.Controllers
         {
             CheckDriver();
 
-            Dial(NameList.TYPE_FILTLOP, "false");
+            Dial(NameList.TYPE_FILTERLOOPBACK, "false");
+            Dial(NameList.TYPE_FILTERICMP, "true");
             var p = PortHelper.GetAvailablePort();
             Dial(NameList.TYPE_TCPLISN, p.ToString());
             Dial(NameList.TYPE_UDPLISN, p.ToString());
 
             // Server
-            Dial(NameList.TYPE_FILTUDP, (Global.Settings.Redirector.ProxyProtocol != PortType.TCP).ToString().ToLower());
-            Dial(NameList.TYPE_FILTTCP, (Global.Settings.Redirector.ProxyProtocol != PortType.UDP).ToString().ToLower());
+            Dial(NameList.TYPE_FILTERUDP, (Global.Settings.Redirector.ProxyProtocol != PortType.TCP).ToString().ToLower());
+            Dial(NameList.TYPE_FILTERTCP, (Global.Settings.Redirector.ProxyProtocol != PortType.UDP).ToString().ToLower());
             dial_Server(Global.Settings.Redirector.ProxyProtocol);
 
             // Mode Rule

Netch/Controllers/TUNController.cs

@@ -104,8 +104,8 @@ namespace Netch.Controllers
         {
             var binHash = Utils.Utils.SHA256CheckSum(BinDriver);
             var sysHash = Utils.Utils.SHA256CheckSum(SysDriver);
-            Logging.Info(binHash);
-            Logging.Info(sysHash);
+            Logging.Info("自带 wintun.dll Hash: " + binHash);
+            Logging.Info("系统 wintun.dll Hash: " + sysHash);
             if (binHash == sysHash)
                 return;
 

Netch/Controllers/UpdateChecker.cs

@@ -20,7 +20,7 @@ namespace Netch.Controllers
         public const string Copyright = @"Copyright © 2019 - 2021";
 
         public const string AssemblyVersion = @"1.8.3";
-        private const string Suffix = @"Beta5";
+        private const string Suffix = @"Beta6";
 
         public static readonly string Version = $"{AssemblyVersion}{(string.IsNullOrEmpty(Suffix) ? "" : $"-{Suffix}")}";
 

Netch/Interops/RedirectorInterop.cs

@@ -7,12 +7,15 @@ namespace Netch.Interops
     {
         public enum NameList
         {
-            TYPE_FILTLOP,
-            TYPE_FILTTCP,
-            TYPE_FILTUDP,
+            TYPE_FILTERLOOPBACK,
+            TYPE_FILTERICMP,
+            TYPE_FILTERTCP,
+            TYPE_FILTERUDP,
+
             TYPE_CLRNAME,
             TYPE_ADDNAME,
             TYPE_BYPNAME,
+
             TYPE_DNSHOST,
 
             TYPE_TCPLISN,

Netch/Interops/TUNInterop.cs

@@ -62,7 +62,7 @@ namespace Netch.Interops
         private static extern bool tun_free();
 
         [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
-        private static extern ulong tun_luid();
+        public static extern ulong tun_luid();
 
         [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
         private static extern ulong tun_getUP();

Netch/Models/IAdapter.cs

@@ -5,8 +5,6 @@ namespace Netch.Models
 {
     public interface IAdapter
     {
-        string AdapterId { get; }
-
         int InterfaceIndex { get; }
 
         IPAddress Gateway { get; }

Netch/Models/OutboundAdapter.cs

@@ -29,9 +29,7 @@ namespace Netch.Models
             Logging.Info($"出口适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
         }
 
-        public IPAddress Address { get; set; }
-
-        public string AdapterId => throw new NotImplementedException();
+        public IPAddress Address { get; }
 
         /// <summary>
         ///     索引

Netch/Models/TunAdapter.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
-using Netch.Controllers;
 using Netch.Interops;
 using Netch.Utils;
 
@@ -10,19 +8,15 @@ namespace Netch.Models
 {
     public class TunAdapter : IAdapter
     {
-        private const string ComponentIdWintun = "wintun";
-
         public TunAdapter()
         {
-            AdapterId = AdapterUtils.GetAdapterId(ComponentIdWintun) ?? throw new Exception("wintun adapter not found");
-            NetworkInterface = NetworkInterface.GetAllNetworkInterfaces().First(i => i.Id == AdapterId);
-            InterfaceIndex = NetworkInterface.GetIPProperties().GetIPv4Properties().Index;
+            InterfaceIndex = (int) NativeMethods.ConvertLuidToIndex(TUNInterop.tun_luid());
+            NetworkInterface = NetworkInterface.GetAllNetworkInterfaces().First(i => i.GetIPProperties().GetIPv4Properties().Index == InterfaceIndex);
             Gateway = IPAddress.Parse(Global.Settings.TUNTAP.Gateway);
 
             Logging.Info($"WinTUN 适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
         }
 
-        public string AdapterId { get; set; }
 
         public int InterfaceIndex { get; }
 

Netch/NativeMethods.cs

@@ -41,6 +41,9 @@ namespace Netch
         [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl, EntryPoint = "DeleteRoute")]
         public static extern bool DeleteRoute(int inet, string address, int cidr, string gateway, int index, int metric = 0);
 
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern ulong ConvertLuidToIndex(ulong luid);
+
         [DllImport("dnsapi", EntryPoint = "DnsFlushResolverCache")]
         public static extern uint FlushDNSResolverCache();
     }

Netch/Netch.csproj

@@ -2,44 +2,40 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net5.0-windows7</TargetFramework>
         <UseWindowsForms>true</UseWindowsForms>
         <UseWPF>true</UseWPF>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <StartupObject>Netch.Netch</StartupObject>
         <ApplicationManifest>App.manifest</ApplicationManifest>
         <ApplicationIcon>Resources\Netch.ico</ApplicationIcon>
-        <Platforms>x64</Platforms>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <LangVersion>latest</LangVersion>
         <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
         <AnalysisMode>Default</AnalysisMode>
         <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <TargetFramework>net5.0-windows</TargetFramework>
+        <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+        <Configurations>Debug;Release</Configurations>
+        <Platforms>x64</Platforms>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    </PropertyGroup>
+
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
         <OutputPath>bin\x64\Debug\</OutputPath>
         <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningsAsErrors />
-        <NoWarn />
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <NoWarn />
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningsAsErrors />
         <OutputPath>bin\x64\Release\</OutputPath>
         <DebugType>none</DebugType>
         <DebugSymbols>false</DebugSymbols>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove=".gitignore" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="HMBSbige.SingleInstance" Version="5.0.0" />
         <PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
@@ -63,7 +59,11 @@
     </ItemGroup>
 
     <ItemGroup>
+        <None Remove=".gitignore" />
         <None Visible="false" Include="..\binaries\**" LinkBase="bin" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
+        <None Update="..\binaries\NTT.exe">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        </None>
         <None Remove="..\binaries\.git" />
         <None Visible="false" Include="..\translations\i18n\**" LinkBase="i18n" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
         <None Visible="false" Include="..\modes\mode\**" LinkBase="mode" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
@@ -96,14 +96,6 @@
             <LastGenOutput>Settings.Designer.cs</LastGenOutput>
         </None>
     </ItemGroup>
-    <ProjectExtensions>
-        <VisualStudio>
-            <UserProperties />
-        </VisualStudio>
-    </ProjectExtensions>
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Exec Command="set TargetFramework=$(TargetFramework)&#xD;&#xA;set Configuration=$(Configuration)&#xD;&#xA;set ILMergeConsolePath=$(ILMergeConsolePath)&#xD;&#xA;set TargetDir=$(TargetDir)&#xD;&#xA;set SolutionDir=$(SolutionDir)&#xD;&#xA;call $(ProjectDir)PostBuild.bat" />
-    </Target>
 
     <Target Condition="'$(PublishSingleFile)' == 'true'" AfterTargets="_ComputeFilesToBundle" Name="RemoveDupeAssemblies">
         <ItemGroup>

Netch/PostBuild.bat

@@ -1,20 +0,0 @@
-if %Configuration%==Release if %TargetFramework%==net48 (
-:: Merge dlls
-%ILMergeConsolePath% /wildcards /out:%TargetDir%Netch.exe ^
-/lib:"C:\Windows\Microsoft.NET\Framework64\v4.0.30319" ^
-/targetplatform:v4,"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8" ^
-%TargetDir%Netch.exe ^
-%TargetDir%*.dll
-
-DEL /f %TargetDir%*.dll >NUL 2>&1
-)
-
-if %Configuration%==Release (
-DEL /f %TargetDir%*.config >NUL 2>&1
-DEL /f %TargetDir%*.pdb >NUL 2>&1
-)
-
-RD /s /Q %TargetDir%x86 >NUL 2>&1
-RD /s /Q %TargetDir%de %TargetDir%es %TargetDir%fr %TargetDir%it %TargetDir%pl %TargetDir%ru %TargetDir%zh-CN >NUL 2>&1
-
-exit 0

Netch/Updater/Updater.cs

@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Windows.Threading;
 using Netch.Controllers;
 using Netch.Models;
 using Netch.Properties;
@@ -93,11 +92,10 @@ namespace Netch.Updater
 
         #region Apply Update
 
-        private static readonly ImmutableArray<string> KeepDirectories = new List<string> {"data", "mode\\Custom"}.ToImmutableArray();
+        private static readonly ImmutableArray<string> KeepDirectories = new List<string> {"data", "mode\\Custom", "logging"}.ToImmutableArray();
 
         private void ApplyUpdate()
         {
-            var dispatcher = Dispatcher.CurrentDispatcher;
             var mainForm = Global.MainForm;
 
             #region PreUpdate
@@ -132,7 +130,7 @@ namespace Netch.Updater
             MoveAllFilesOver(Path.Combine(extractPath, "Netch"), _installDirectory);
 
             // release mutex, exit
-            dispatcher.Invoke(Netch.SingleInstance.Dispose);
+            mainForm.Invoke(new Action(Netch.SingleInstance.Dispose));
             Process.Start(Global.NetchExecutable);
             Environment.Exit(0);
         }
@@ -157,7 +155,15 @@ namespace Netch.Updater
 
             // rename files
             foreach (var file in filesToDelete)
-                File.Move(file, file + ".old");
+                try
+                {
+                    File.Move(file, file + ".old");
+                }
+                catch
+                {
+                    Logging.Error($"failed to rename file \"{file}\"");
+                    throw;
+                }
         }
 
         private int Extract(string destDirName, bool overwrite)

Netch/Utils/AdapterUtils.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Linq;
-using Microsoft.Win32;
-
-namespace Netch.Utils
-{
-    public static class AdapterUtils
-    {
-        public const string NETWORK_KEY = @"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}";
-        public const string ADAPTER_KEY = @"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}";
-
-        /// <summary>
-        ///     获取 TUN/TAP 适配器名称
-        /// </summary>
-        /// <param name="componentId">适配器 ID</param>
-        /// <returns>适配器名称</returns>
-        public static string GetName(string componentId)
-        {
-            return Registry.LocalMachine.OpenSubKey($"{NETWORK_KEY}\\{componentId}\\Connection")?.GetValue("Name")?.ToString() ?? "";
-        }
-
-        public static string? GetAdapterId(params string[] componentIds)
-        {
-            try
-            {
-                var adaptersRegistry = Registry.LocalMachine.OpenSubKey(ADAPTER_KEY)!;
-
-                foreach (var keyName in adaptersRegistry.GetSubKeyNames().Where(s => s is not ("Configuration" or "Properties")))
-                {
-                    var adapterRegistry = adaptersRegistry.OpenSubKey(keyName)!;
-                    var componentId = adapterRegistry.GetValue("ComponentId")?.ToString();
-                    if (componentId == null)
-                        continue;
-
-                    if (componentIds.Contains(componentId))
-                        return (string) (adapterRegistry.GetValue("NetCfgInstanceId") ??
-                                         throw new Exception("Tap adapter have no NetCfgInstanceId key"));
-                }
-            }
-            catch (Exception e)
-            {
-                Logging.Warning(e.ToString());
-            }
-
-            return null;
-        }
-    }
-}

PUBLISH.ps1

@@ -1,12 +1,14 @@
 Write-Host 'Building'
 
-dotnet publish -c "Release" `
+dotnet publish `
+	-c "Release" `
+	-r "win-x64" `
 	-p:Platform="x64" `
 	-p:PublishSingleFile=true `
-	-p:RuntimeIdentifier=win-x64 `
-	-p:SolutionDir="$pwd\" `
+	-p:SelfContained=false `
+	-p:PublishTrimmed=false `
+	-p:PublishReadyToRun=false `
 	-o Netch\bin\Publish\ `
-	--no-self-contained `
 	Netch\Netch.csproj
 
 if ($LASTEXITCODE) { exit $LASTEXITCODE } 

UnitTest/UnitTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0-windows7</TargetFramework>
+        <TargetFramework>net5.0-windows</TargetFramework>
         <Platforms>x64</Platforms>
         <UseWindowsForms>true</UseWindowsForms>
         <LangVersion>latest</LangVersion>