fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-04 15:55:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ResolverDnsCache: updated Query() method with correct check conditions for auth and cache response.

Browse Source
This commit is contained in:
Shreyas Zare
2021-05-08 16:15:19 +05:30
parent 87738f5c65
commit 889ee022e7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DnsServerCore/Dns/ResolverDnsCache.cs
View File

@@ -43,25 +43,25 @@ namespace DnsServerCore.Dns
#region public
public virtual DnsDatagram Query(DnsDatagram request, bool serveStale = false)
public virtual DnsDatagram Query(DnsDatagram request, bool serveStaleAndResetExpiry = false)
{
DnsDatagram authResponse = _authZoneManager.Query(request, true);
if ((authResponse != null))
if (authResponse is not null)
{
if ((authResponse.Answer.Count > 0) || ((authResponse.Authority.Count > 0) && (authResponse.Authority[0].Type == DnsResourceRecordType.SOA)))
if ((authResponse.RCODE != DnsResponseCode.NoError) || (authResponse.Answer.Count > 0) || (authResponse.Authority.Count == 0) || (authResponse.Authority[0].Type == DnsResourceRecordType.SOA))
return authResponse;
}
DnsDatagram cacheResponse = _cacheZoneManager.Query(request, serveStale);
if (cacheResponse != null)
DnsDatagram cacheResponse = _cacheZoneManager.Query(request, serveStaleAndResetExpiry);
if (cacheResponse is not null)
{
if ((cacheResponse.Answer.Count > 0) || ((cacheResponse.Authority.Count > 0) && (cacheResponse.Authority[0].Type == DnsResourceRecordType.SOA)))
if ((cacheResponse.RCODE != DnsResponseCode.NoError) || (cacheResponse.Answer.Count > 0) || (cacheResponse.Authority.Count == 0) || (cacheResponse.Authority[0].Type == DnsResourceRecordType.SOA))
return cacheResponse;
}
if ((authResponse != null) && (authResponse.Authority.Count > 0))
if ((authResponse is not null) && (authResponse.Authority.Count > 0))
{
if ((cacheResponse != null) && (cacheResponse.Authority.Count > 0))
if ((cacheResponse is not null) && (cacheResponse.Authority.Count > 0))
{
if (cacheResponse.Authority[0].Name.Length > authResponse.Authority[0].Name.Length)
return cacheResponse;