diff --git a/FastGithub.Dns/DnsHostedService.cs b/FastGithub.Dns/DnsOverUdpHostedService.cs
similarity index 76%
rename from FastGithub.Dns/DnsHostedService.cs
rename to FastGithub.Dns/DnsOverUdpHostedService.cs
index dec1c70..b8b147c 100644
--- a/FastGithub.Dns/DnsHostedService.cs
+++ b/FastGithub.Dns/DnsOverUdpHostedService.cs
@@ -13,28 +13,28 @@ namespace FastGithub.Dns
///
/// dns后台服务
///
- sealed class DnsHostedService : BackgroundService
+ sealed class DnsOverUdpHostedService : BackgroundService
{
- private readonly DnsServer dnsServer;
- private readonly IEnumerable dnsValidators;
+ private readonly DnsOverUdpServer dnsOverUdpServer;
+ private readonly IEnumerable conflictValidators;
private readonly IOptionsMonitor options;
- private readonly ILogger logger;
+ private readonly ILogger logger;
///
/// dns后台服务
///
- ///
- ///
+ ///
+ ///
///
///
- public DnsHostedService(
- DnsServer dnsServer,
- IEnumerable dnsValidators,
+ public DnsOverUdpHostedService(
+ DnsOverUdpServer dnsOverUdpServer,
+ IEnumerable conflictValidators,
IOptionsMonitor options,
- ILogger logger)
+ ILogger logger)
{
- this.dnsServer = dnsServer;
- this.dnsValidators = dnsValidators;
+ this.dnsOverUdpServer = dnsOverUdpServer;
+ this.conflictValidators = conflictValidators;
this.options = options;
this.logger = logger;
@@ -54,14 +54,14 @@ namespace FastGithub.Dns
///
public override async Task StartAsync(CancellationToken cancellationToken)
{
- var port = this.options.CurrentValue.Listen.DnsPort;
- this.dnsServer.Bind(IPAddress.Any, port);
+ var dnsPort = this.options.CurrentValue.Listen.DnsPort;
+ this.dnsOverUdpServer.Bind(IPAddress.Any, dnsPort);
this.logger.LogInformation("DNS服务启动成功");
const int DNS_PORT = 53;
- if (port != DNS_PORT)
+ if (dnsPort != DNS_PORT)
{
- this.logger.LogWarning($"由于使用了非标准DNS端口{port},你需要将{nameof(FastGithub)}设置为标准DNS的上游");
+ this.logger.LogWarning($"由于使用了非标准DNS端口{dnsPort},你需要将{nameof(FastGithub)}设置为标准DNS的上游");
}
else if (OperatingSystem.IsWindows())
{
@@ -85,7 +85,7 @@ namespace FastGithub.Dns
this.logger.LogWarning($"不支持自动设置本机DNS,请手工添加{IPAddress.Loopback}做为连接网络的DNS的第一条记录");
}
- foreach (var item in this.dnsValidators)
+ foreach (var item in this.conflictValidators)
{
await item.ValidateAsync();
}
@@ -100,7 +100,7 @@ namespace FastGithub.Dns
///
protected override Task ExecuteAsync(CancellationToken stoppingToken)
{
- return this.dnsServer.ListenAsync(stoppingToken);
+ return this.dnsOverUdpServer.ListenAsync(stoppingToken);
}
///
@@ -110,7 +110,7 @@ namespace FastGithub.Dns
///
public override Task StopAsync(CancellationToken cancellationToken)
{
- this.dnsServer.Dispose();
+ this.dnsOverUdpServer.Dispose();
this.logger.LogInformation("DNS服务已停止");
if (OperatingSystem.IsWindows())
diff --git a/FastGithub.Dns/DnsServer.cs b/FastGithub.Dns/DnsOverUdpServer.cs
similarity index 95%
rename from FastGithub.Dns/DnsServer.cs
rename to FastGithub.Dns/DnsOverUdpServer.cs
index 202270b..0b5b642 100644
--- a/FastGithub.Dns/DnsServer.cs
+++ b/FastGithub.Dns/DnsOverUdpServer.cs
@@ -12,10 +12,10 @@ namespace FastGithub.Dns
///
/// dns服务器
///
- sealed class DnsServer : IDisposable
+ sealed class DnsOverUdpServer : IDisposable
{
private readonly RequestResolver requestResolver;
- private readonly ILogger logger;
+ private readonly ILogger logger;
private readonly Socket socket = new(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
private readonly byte[] buffer = new byte[ushort.MaxValue];
@@ -24,9 +24,9 @@ namespace FastGithub.Dns
///
///
///
- public DnsServer(
+ public DnsOverUdpServer(
RequestResolver requestResolver,
- ILogger logger)
+ ILogger logger)
{
this.requestResolver = requestResolver;
this.logger = logger;
diff --git a/FastGithub.Dns/HostsValidator.cs b/FastGithub.Dns/HostsConflictValidator.cs
similarity index 91%
rename from FastGithub.Dns/HostsValidator.cs
rename to FastGithub.Dns/HostsConflictValidator.cs
index 2004f46..466c24f 100644
--- a/FastGithub.Dns/HostsValidator.cs
+++ b/FastGithub.Dns/HostsConflictValidator.cs
@@ -10,28 +10,28 @@ using System.Threading.Tasks;
namespace FastGithub.Dns
{
///
- /// host文件配置验证器
+ /// host文件冲突验证器
///
- sealed class HostsValidator : IDnsValidator
+ sealed class HostsConflictValidator : IConflictValidator
{
private readonly FastGithubConfig fastGithubConfig;
- private readonly ILogger logger;
+ private readonly ILogger logger;
///
- /// host文件配置验证器
+ /// host文件冲突验证器
///
///
///
- public HostsValidator(
+ public HostsConflictValidator(
FastGithubConfig fastGithubConfig,
- ILogger logger)
+ ILogger logger)
{
this.fastGithubConfig = fastGithubConfig;
this.logger = logger;
}
///
- /// 验证host文件的域名解析配置
+ /// 验证冲突
///
///
public async Task ValidateAsync()
diff --git a/FastGithub.Dns/IDnsValidator.cs b/FastGithub.Dns/IConflictValidator.cs
similarity index 71%
rename from FastGithub.Dns/IDnsValidator.cs
rename to FastGithub.Dns/IConflictValidator.cs
index a252428..a380c7e 100644
--- a/FastGithub.Dns/IDnsValidator.cs
+++ b/FastGithub.Dns/IConflictValidator.cs
@@ -3,12 +3,12 @@
namespace FastGithub.Dns
{
///
- /// Dns验证器
+ /// Dns冲突验证器
///
- interface IDnsValidator
+ interface IConflictValidator
{
///
- /// 验证
+ /// 验证冲突
///
///
Task ValidateAsync();
diff --git a/FastGithub.Dns/ProxyValidtor.cs b/FastGithub.Dns/ProxyConflictValidtor.cs
similarity index 85%
rename from FastGithub.Dns/ProxyValidtor.cs
rename to FastGithub.Dns/ProxyConflictValidtor.cs
index 8d75723..42ed126 100644
--- a/FastGithub.Dns/ProxyValidtor.cs
+++ b/FastGithub.Dns/ProxyConflictValidtor.cs
@@ -8,23 +8,23 @@ using System.Threading.Tasks;
namespace FastGithub.Dns
{
///
- /// 代理验证
+ /// 代理冲突验证
///
- sealed class ProxyValidtor : IDnsValidator
+ sealed class ProxyConflictValidtor : IConflictValidator
{
private readonly IOptions options;
- private readonly ILogger logger;
+ private readonly ILogger logger;
- public ProxyValidtor(
+ public ProxyConflictValidtor(
IOptions options,
- ILogger logger)
+ ILogger logger)
{
this.options = options;
this.logger = logger;
}
///
- /// 验证是否使用了代理
+ /// 验证冲突
///
///
public Task ValidateAsync()
diff --git a/FastGithub.Dns/ServiceCollectionExtensions.cs b/FastGithub.Dns/ServiceCollectionExtensions.cs
index 0d7b51a..1205a86 100644
--- a/FastGithub.Dns/ServiceCollectionExtensions.cs
+++ b/FastGithub.Dns/ServiceCollectionExtensions.cs
@@ -17,11 +17,11 @@ namespace FastGithub
public static IServiceCollection AddDnsServer(this IServiceCollection services)
{
services.TryAddSingleton();
- services.TryAddSingleton();
+ services.TryAddSingleton();
services.TryAddSingleton();
- services.AddSingleton();
- services.AddSingleton();
- return services.AddHostedService();
+ services.AddSingleton();
+ services.AddSingleton();
+ return services.AddHostedService();
}
}
}
diff --git a/FastGithub.ReverseProxy/GithubSshHandler.cs b/FastGithub.ReverseProxy/GithubSshProxyHandler.cs
similarity index 87%
rename from FastGithub.ReverseProxy/GithubSshHandler.cs
rename to FastGithub.ReverseProxy/GithubSshProxyHandler.cs
index 3d83969..7750570 100644
--- a/FastGithub.ReverseProxy/GithubSshHandler.cs
+++ b/FastGithub.ReverseProxy/GithubSshProxyHandler.cs
@@ -8,18 +8,18 @@ using System.Threading.Tasks;
namespace FastGithub.ReverseProxy
{
///
- /// github的ssh处理者
+ /// github的ssh代理处理者
///
- sealed class GithubSshHandler : ConnectionHandler
+ sealed class GithubSshProxyHandler : ConnectionHandler
{
private readonly IDomainResolver domainResolver;
private readonly DnsEndPoint githubSshEndPoint = new("ssh.github.com", 443);
///
- /// github的ssh处理者
+ /// github的ssh代理处理者
///
///
- public GithubSshHandler(IDomainResolver domainResolver)
+ public GithubSshProxyHandler(IDomainResolver domainResolver)
{
this.domainResolver = domainResolver;
}
diff --git a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
index 9ca702b..2df39bc 100644
--- a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
+++ b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
@@ -82,7 +82,7 @@ namespace FastGithub
}
else
{
- kestrel.Listen(IPAddress.Any, sshPort, listen => listen.UseConnectionHandler());
+ kestrel.Listen(IPAddress.Any, sshPort, listen => listen.UseConnectionHandler());
logger.LogInformation("已监听github的ssh代理");
}
}