Skip to content

Commit 442ad2d

Browse files
committed
Revert "🔥 Remove ProxyMode.DNSIntercept"
This reverts commit 3eae8a8.
1 parent ae9a635 commit 442ad2d

14 files changed

Lines changed: 568 additions & 570 deletions

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@
106106
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
107107
</ItemGroup>
108108

109-
<!--<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
109+
<ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows')) AND ($(RuntimeIdentifier.StartsWith('win-')) OR $(RuntimeIdentifier) == '')">
110110
<PackageReference Include="Aigio.WinDivertSharp" />
111-
</ItemGroup>-->
111+
</ItemGroup>
112112

113113
<ItemGroup>
114114
<ProjectReference Include="..\..\ref\WTTS.MicroServices.ClientSDK\src\BD.WTTS.MicroServices.Primitives.Models\BD.WTTS.MicroServices.Primitives.Models.csproj" />

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Extensions/ServiceCollectionExtensions.cs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -148,28 +148,28 @@ internal static IServiceCollection AddFlowAnalyze(this IServiceCollection servic
148148

149149
#if WINDOWS
150150

151-
///// <summary>
152-
///// 注册数据包拦截器
153-
///// </summary>
154-
///// <param name="services"></param>
155-
///// <returns></returns>
156-
//[MethodImpl(MethodImplOptions.AggressiveInlining)]
157-
//internal static IServiceCollection AddPacketIntercept(this IServiceCollection services)
158-
//{
159-
// // https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/ServiceCollectionExtensions.cs#L21
160-
// //services.AddSingleton<IDnsConflictSolver, HostsConflictSolver>();
161-
// //services.AddSingleton<IDnsConflictSolver, ProxyConflictSolver>();
162-
// services.TryAddSingleton<IDnsInterceptor, DnsInterceptor>();
163-
// services.AddHostedService<DnsInterceptHostedService>();
164-
165-
// services.AddSingleton<ITcpInterceptor, SshInterceptor>();
166-
// services.AddSingleton<ITcpInterceptor, GitInterceptor>();
167-
// services.AddSingleton<ITcpInterceptor, HttpInterceptor>();
168-
// services.AddSingleton<ITcpInterceptor, HttpsInterceptor>();
169-
// services.AddHostedService<TcpInterceptHostedService>();
170-
171-
// return services;
172-
//}
151+
/// <summary>
152+
/// 注册数据包拦截器
153+
/// </summary>
154+
/// <param name="services"></param>
155+
/// <returns></returns>
156+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
157+
internal static IServiceCollection AddPacketIntercept(this IServiceCollection services)
158+
{
159+
// https://github.com/dotnetcore/FastGithub/blob/2.1.4/FastGithub.PacketIntercept/ServiceCollectionExtensions.cs#L21
160+
//services.AddSingleton<IDnsConflictSolver, HostsConflictSolver>();
161+
//services.AddSingleton<IDnsConflictSolver, ProxyConflictSolver>();
162+
services.TryAddSingleton<IDnsInterceptor, DnsInterceptor>();
163+
services.AddHostedService<DnsInterceptHostedService>();
164+
165+
services.AddSingleton<ITcpInterceptor, SshInterceptor>();
166+
services.AddSingleton<ITcpInterceptor, GitInterceptor>();
167+
services.AddSingleton<ITcpInterceptor, HttpInterceptor>();
168+
services.AddSingleton<ITcpInterceptor, HttpsInterceptor>();
169+
services.AddHostedService<TcpInterceptHostedService>();
170+
171+
return services;
172+
}
173173

174174
#endif
175175
}

0 commit comments

Comments
 (0)