🔥 Remove ProxyMode.DNSIntercept with REMOVE_DNS_INTERCEPT"

BeyondDimension · Nov 27, 2024 · a0279bf · a0279bf
1 parent dcda15a
commit a0279bf
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 18 deletions.
diff --git a/...t.Plugins.Accelerator.ReverseProxy/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj b/...t.Plugins.Accelerator.ReverseProxy/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj
@@ -110,7 +110,7 @@
 		<PackageReference Include="Utf8StringInterpolation" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
+	<ItemGroup Condition="!$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) AND $([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
 		<PackageReference Include="Aigio.WinDivertSharp" />
 	</ItemGroup>
 

diff --git a/...BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Extensions/ServiceCollectionExtensions.cs b/...BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Extensions/ServiceCollectionExtensions.cs
@@ -148,6 +148,7 @@ internal static IServiceCollection AddFlowAnalyze(this IServiceCollection servic
 
 #if WINDOWS
 
+#if !REMOVE_DNS_INTERCEPT
     /// <summary>
     /// 注册数据包拦截器
     /// </summary>
@@ -170,6 +171,7 @@ internal static IServiceCollection AddPacketIntercept(this IServiceCollection se
 
         return services;
     }
+#endif
 
 #endif
 }
diff --git a/...lerator.ReverseProxy/Services.Implementation/PacketIntercept/DnsInterceptHostedService.cs b/...lerator.ReverseProxy/Services.Implementation/PacketIntercept/DnsInterceptHostedService.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/DnsInterceptHostedService.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 // ReSharper disable once CheckNamespace
 namespace BD.WTTS.Services.Implementation;

diff --git a/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/DnsInterceptor.cs b/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/DnsInterceptor.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Dns/DnsInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using WinDivertSharp;
 using DNS.Protocol;

diff --git a/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/GitInterceptor.cs b/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/GitInterceptor.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/GitInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

diff --git a/...ugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/HttpInterceptor.cs b/...ugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/HttpInterceptor.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/HttpInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

diff --git a/...gins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/HttpsInterceptor.cs b/...gins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/HttpsInterceptor.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/HttpsInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

diff --git a/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/SshInterceptor.cs b/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/SshInterceptor.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/SshInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

diff --git a/...lerator.ReverseProxy/Services.Implementation/PacketIntercept/TcpInterceptHostedService.cs b/...lerator.ReverseProxy/Services.Implementation/PacketIntercept/TcpInterceptHostedService.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/TcpInterceptHostedService.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using static BD.WTTS.Models.Abstractions.IReverseProxyConfig;
 

diff --git a/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/TcpInterceptor.cs b/...lugins.Accelerator.ReverseProxy/Services.Implementation/PacketIntercept/TcpInterceptor.cs
@@ -1,6 +1,6 @@
 // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/Tcp/TcpInterceptor.cs
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 
 using WinDivertSharp;
 

diff --git a/...s.Accelerator.ReverseProxy/Services.Implementation/YarpReverseProxyServiceImpl.Startup.cs b/...s.Accelerator.ReverseProxy/Services.Implementation/YarpReverseProxyServiceImpl.Startup.cs
@@ -23,7 +23,7 @@ void StartupConfigureServices(IServiceCollection services)
         services.AddReverseProxyServer();
         services.AddFlowAnalyze();
 
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
         if (ProxyMode == ProxyMode.DNSIntercept)
         {
             services.AddPacketIntercept();

diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/BD.WTTS.Client.Plugins.Accelerator.csproj b/src/BD.WTTS.Client.Plugins.Accelerator/BD.WTTS.Client.Plugins.Accelerator.csproj
@@ -124,7 +124,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+	<ItemGroup Condition="!$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
 		<Compile Update="Properties\WinDivertResource.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
@@ -136,7 +136,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
+	<ItemGroup Condition="$(DefineConstants.Contains('REMOVE_DNS_INTERCEPT')) OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
 		<Compile Remove="Properties\WinDivertResource.Designer.cs" />
 		<EmbeddedResource Remove="Properties\WinDivertResource.resx" />
 	</ItemGroup>

diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Helpers/WinDivertInitHelper.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Helpers/WinDivertInitHelper.cs
@@ -1,4 +1,4 @@
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
 using WinDivertBinRes = BD.WTTS.Properties.WinDivertResource;
 
 namespace Mobius.Helpers;

diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs
@@ -127,6 +127,9 @@ await EnableProxyScripts.ContinueWith(e =>
 
         switch (proxyMode)
         {
+#if REMOVE_DNS_INTERCEPT
+            case ProxyMode.DNSIntercept:
+#endif
             case ProxyMode.Hosts:
                 var inUsePort = SocketHelper.IsUsePort(proxyIp_.Value, httpsPort);
                 if (inUsePort)
@@ -193,7 +196,7 @@ await EnableProxyScripts.ContinueWith(e =>
                     return Strings.CommunityFix_SetAsSystemPACProxyFail;
                 }
                 break;
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
             case ProxyMode.DNSIntercept:
                 {
                     await Mobius.Helpers.WinDivertInitHelper.InitializeAsync();
@@ -322,6 +325,9 @@ async Task<OperateProxyServiceResult> StopProxyServiceCoreAsync(bool isExit)
 #endif
         switch (proxyMode) // 先停止接入代理流量
         {
+#if REMOVE_DNS_INTERCEPT
+            case ProxyMode.DNSIntercept:
+#endif
             case ProxyMode.Hosts:
                 var needClear = hostsFileService.ContainsHostsByTag();
                 if (needClear)
@@ -358,7 +364,7 @@ async Task<OperateProxyServiceResult> StopProxyServiceCoreAsync(bool isExit)
                     await platformService.SetAsSystemPACProxyAsync(false);
                 }
                 break;
-#if WINDOWS
+#if WINDOWS && !REMOVE_DNS_INTERCEPT
             case ProxyMode.DNSIntercept:
                 {
                     // 停止时也调用初始化

diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Settings/ProxySettings.ProxyMode.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Settings/ProxySettings.ProxyMode.cs
@@ -11,7 +11,9 @@ static IEnumerable<EProxyMode> GetProxyModes()
     {
 #if WINDOWS
         yield return EProxyMode.Hosts;
+#if !REMOVE_DNS_INTERCEPT
         yield return EProxyMode.DNSIntercept;
+#endif
         yield return EProxyMode.PAC;
         yield return EProxyMode.System;
 #elif ANDROID
@@ -26,7 +28,7 @@ static IEnumerable<EProxyMode> GetProxyModes()
             yield return EProxyMode.System;
         }
 #else
-            return Array.Empty<EProxyMode>();
+        return Array.Empty<EProxyMode>();
 #endif
     }
 

diff --git a/src/BD.WTTS.Client.Tools.Publish/Properties/launchSettings.json b/src/BD.WTTS.Client.Tools.Publish/Properties/launchSettings.json
@@ -2,9 +2,9 @@
   "profiles": {
     "BD.WTTS.Client.Tools.Publish": {
       "commandName": "Project",
-      "commandLineArgs": "nsis --rids win-x64 --hsm-sign --t 241127_1620486875958",
+      "commandLineArgs": "nsis --rids win-x64 --hsm-sign --t 241127_1710500975164",
       "commandLineArgs_release": "run --rids win-x64 --hsm-sign --stm-upload",
-      "commandLineArgs_nsis": "nsis --rids win-x64 --hsm-sign --t 241127_1620486875958 --debug",
+      "commandLineArgs_nsis": "nsis --rids win-x64 --hsm-sign --t 241127_1710500975164 --debug",
       "commandLineArgs_debug": "run --rids win-x64 --hsm-sign --stm-upload --debug",
       "commandLineArgs_GenerateBridgeContentXml": "csproj --rids win-x64",
       "commandLineArgs_TestUploadFile": "bs --type 2 --old \"C:\\Users\\Mossimo\\Desktop\\Steam++\\ms-test.steampp.net\""

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -23,6 +23,7 @@
 		<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
 		<Deterministic>true</Deterministic>
 		<CheckEolWorkloads>false</CheckEolWorkloads>
+		<DefineConstants>REMOVE_DNS_INTERCEPT;$(DefineConstants)</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Include="..\AssemblyInfo.cs">