fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-05 16:24:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

CacheZone: added support for conditional forwarding client subnet.

Browse Source
This commit is contained in:
Shreyas Zare
2023-04-23 16:15:12 +05:30
parent 1d3a1c5c3b
commit 216695a3cd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DnsServerCore/Dns/Zones/CacheZone.cs
View File

@@ -199,8 +199,10 @@ namespace DnsServerCore.Dns.Zones
ConcurrentDictionary<DnsResourceRecordType, IReadOnlyList<DnsResourceRecord>> entries;
NetworkAddress eDnsClientSubnet = records[0].GetCacheRecordInfo().EDnsClientSubnet;
if ((eDnsClientSubnet is null) || !IsTypeSupportedForEDnsClientSubnet(type))
CacheRecordInfo cacheRecordInfo = records[0].GetCacheRecordInfo();
NetworkAddress eDnsClientSubnet = cacheRecordInfo.EDnsClientSubnet;
if ((eDnsClientSubnet is null) || (!cacheRecordInfo.ConditionalForwardingClientSubnet && !IsTypeSupportedForEDnsClientSubnet(type)))
{
entries = _entries;
}
@@ -385,11 +387,11 @@ namespace DnsServerCore.Dns.Zones
return count;
}
public IReadOnlyList<DnsResourceRecord> QueryRecords(DnsResourceRecordType type, bool serveStale, bool skipSpecialCacheRecord, NetworkAddress eDnsClientSubnet)
public IReadOnlyList<DnsResourceRecord> QueryRecords(DnsResourceRecordType type, bool serveStale, bool skipSpecialCacheRecord, NetworkAddress eDnsClientSubnet, bool conditionalForwardingClientSubnet)
{
ConcurrentDictionary<DnsResourceRecordType, IReadOnlyList<DnsResourceRecord>> entries;
if ((eDnsClientSubnet is null) || !IsTypeSupportedForEDnsClientSubnet(type))
if ((eDnsClientSubnet is null) || (!conditionalForwardingClientSubnet && !IsTypeSupportedForEDnsClientSubnet(type)))
{
entries = _entries;
}
@@ -408,7 +410,7 @@ namespace DnsServerCore.Dns.Zones
if (cacheSubnet.PrefixLength > eDnsClientSubnet.PrefixLength)
continue;
if (cacheSubnet.Equals(eDnsClientSubnet) || cacheSubnet.Contains(eDnsClientSubnet.Address))
if (cacheSubnet.Equals(eDnsClientSubnet) || (!conditionalForwardingClientSubnet && cacheSubnet.Contains(eDnsClientSubnet.Address)))
{
if ((selectedNetwork is null) || (cacheSubnet.PrefixLength > selectedNetwork.PrefixLength))
{