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

Merge pull request #828 from alexhorner/dns64_fix

Browse Source 
Fix AAAA responses not being produced when there are no DNS64 exclusions
This commit is contained in:
Shreyas Zare
2024-01-11 13:12:08 +05:30
committed by GitHub
parent 856772f628 d962a84b7f
commit 98217d357c
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Apps/Dns64App/App.cs
View File

@@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
using DnsServerCore.ApplicationCommon;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Text.Json;
@@ -123,22 +124,34 @@ namespace Dns64
List<DnsResourceRecord> newAnswer = new List<DnsResourceRecord>(response.Answer.Count);
bool synthesizeAAAA = true;
bool anyExclusions = group.ExcludedIpv6.Any();
foreach (DnsResourceRecord answer in response.Answer)
{
//If this isn't an AAAA, include it in the new answer as we don't need to mess with it
if (answer.Type != DnsResourceRecordType.AAAA)
{
newAnswer.Add(answer);
continue;
}
//If there aren't any exclusions, and we have an AAAA already, we can just accept that AAAA and not synthesize anything
if (answer.Type == DnsResourceRecordType.AAAA && !anyExclusions)
{
newAnswer.Add(answer);
synthesizeAAAA = false;
continue;
}
//At this point, we have an AAAA and we have at least one exclusion. We need to check the AAAA against the exclusion list
IPAddress ipv6Address = (answer.RDATA as DnsAAAARecordData).Address;
foreach (NetworkAddress excludedIpv6 in group.ExcludedIpv6)
{
if (!excludedIpv6.Contains(ipv6Address))
{
//found non-excluded AAAA record so no need to synthesize AAAA
//This AAAA is not excluded and so we can just accept it and not synthesize anything
newAnswer.Add(answer);
synthesizeAAAA = false;
}