ouczbs/FastGithub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dns解析重试

Browse Source
This commit is contained in:
老九 2021-08-29 23:17:34 +08:00
parent 8cc28f5f47
commit 14aa806058
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
FastGithub.DomainResolve/DomainResolver.cs
View File

@ -81,7 +81,7 @@ namespace FastGithub.DomainResolve
try try
{ {
await semaphore.WaitAsync(); await semaphore.WaitAsync();
return await this.LookupAsync(domain, cancellationToken); return await this.ResolveNoCacheAsync(domain, cancellationToken);
} }
finally finally
{ {
@ -90,12 +90,13 @@ namespace FastGithub.DomainResolve
} }
/// <summary> /// <summary>
/// 查找ip /// 解析域名
/// 不使用缓存
/// </summary> /// </summary>
/// <param name="domain"></param> /// <param name="domain"></param>
/// <param name="cancellationToken"></param> /// <param name="cancellationToken"></param>
/// <returns></returns> /// <returns></returns>
private async Task<IPAddress> LookupAsync(DnsEndPoint domain, CancellationToken cancellationToken) private async Task<IPAddress> ResolveNoCacheAsync(DnsEndPoint domain, CancellationToken cancellationToken)
{ {
if (this.domainResolveCache.TryGetValue<IPAddress>(domain, out var address)) if (this.domainResolveCache.TryGetValue<IPAddress>(domain, out var address))
{ {
@ -105,7 +106,7 @@ namespace FastGithub.DomainResolve
var expiration = this.dnscryptExpiration; var expiration = this.dnscryptExpiration;
if (this.dnscryptProxy.LocalEndPoint != null) if (this.dnscryptProxy.LocalEndPoint != null)
{ {
address = await this.LookupCoreAsync(this.dnscryptProxy.LocalEndPoint, domain, cancellationToken); address = await this.LookupAsync(this.dnscryptProxy.LocalEndPoint, domain, cancellationToken);
} }
if (address == null) if (address == null)
@ -140,7 +141,7 @@ namespace FastGithub.DomainResolve
{ {
foreach (var dns in this.fastGithubConfig.FallbackDns) foreach (var dns in this.fastGithubConfig.FallbackDns)
{ {
var address = await this.LookupCoreAsync(dns, domain, cancellationToken); var address = await this.LookupAsync(dns, domain, cancellationToken);
if (address != null) if (address != null)
{ {
return address; return address;
@ -149,7 +150,6 @@ namespace FastGithub.DomainResolve
return default; return default;
} }
/// <summary> /// <summary>
/// 查找ip /// 查找ip
/// </summary> /// </summary>
@ -157,22 +157,33 @@ namespace FastGithub.DomainResolve
/// <param name="domain"></param> /// <param name="domain"></param>
/// <param name="cancellationToken"></param> /// <param name="cancellationToken"></param>
/// <returns></returns> /// <returns></returns>
private async Task<IPAddress?> LookupCoreAsync(IPEndPoint dns, DnsEndPoint domain, CancellationToken cancellationToken) private async Task<IPAddress?> LookupAsync(IPEndPoint dns, DnsEndPoint domain, CancellationToken cancellationToken)
{ {
try const int MAX_TRY_COUNT = 2;
for (var i = 0; i < MAX_TRY_COUNT; i++)
{ {
var dnsClient = new DnsClient(dns); try
using var timeoutTokenSource = new CancellationTokenSource(this.lookupTimeout); {
using var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutTokenSource.Token); var dnsClient = new DnsClient(dns);
var addresses = await dnsClient.Lookup(domain.Host, RecordType.A, linkedTokenSource.Token); using var timeoutTokenSource = new CancellationTokenSource(this.lookupTimeout);
addresses = addresses.Where(address => this.disableIPAddressCache.TryGetValue(address, out _) == false).ToList(); using var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutTokenSource.Token);
return await this.FindFastValueAsync(addresses, domain.Port, cancellationToken); var addresses = await dnsClient.Lookup(domain.Host, RecordType.A, linkedTokenSource.Token);
} addresses = addresses.Where(address => this.disableIPAddressCache.TryGetValue(address, out _) == false).ToList();
catch (Exception ex) return await this.FindFastValueAsync(addresses, domain.Port, cancellationToken);
{ }
this.logger.LogWarning($"dns({dns})无法解析{domain.Host}：{ex.Message}"); catch (OperationCanceledException)
return default; {
continue;
}
catch (Exception ex)
{
this.logger.LogWarning($"dns({dns})无法解析{domain.Host}：{ex.Message}");
return default;
}
} }
this.logger.LogWarning($"dns({dns})无法解析{domain.Host}");
return default;
} }
@ -220,7 +231,7 @@ namespace FastGithub.DomainResolve
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
this.SetDisabled(address, TimeSpan.FromMilliseconds(1d)); this.SetDisabled(address, TimeSpan.FromMilliseconds(2d));
return default; return default;
} }
catch (Exception) catch (Exception)