fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-02-22 15:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

default app: fixed null exception bug.

Browse Source
This commit is contained in:
Shreyas Zare
2021-03-21 18:17:24 +05:30
parent 0a120576da
commit 5813ef614f
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DefaultDnsApplication/GeoDistanceAddress.cs
View File

@@ -113,11 +113,11 @@ namespace DefaultDnsApplication
location = response.Location;
dynamic jsonAppRecordData = JsonConvert.DeserializeObject(appRecordData);
dynamic jsonLastServer = null;
dynamic jsonClosestServer = null;
if ((location == null) || !location.HasCoordinates)
{
jsonLastServer = jsonAppRecordData[0];
jsonClosestServer = jsonAppRecordData[0];
}
else
{
@@ -133,14 +133,17 @@ namespace DefaultDnsApplication
if (distance < lastDistance)
{
lastDistance = distance;
jsonLastServer = jsonServer;
jsonClosestServer = jsonServer;
}
}
}
if (jsonClosestServer == null)
return Task.FromResult<DnsDatagram>(null);
List<DnsResourceRecord> answers = new List<DnsResourceRecord>();
foreach (dynamic jsonAddress in jsonLastServer.addresses)
foreach (dynamic jsonAddress in jsonClosestServer.addresses)
{
IPAddress address = IPAddress.Parse(jsonAddress.Value);

37
DefaultDnsApplication/GeoDistanceCNAME.cs
View File

@@ -108,11 +108,11 @@ namespace DefaultDnsApplication
location = response.Location;
dynamic jsonAppRecordData = JsonConvert.DeserializeObject(appRecordData);
dynamic jsonLastServer = null;
dynamic jsonClosestServer = null;
if ((location == null) || !location.HasCoordinates)
{
jsonLastServer = jsonAppRecordData[0];
jsonClosestServer = jsonAppRecordData[0];
}
else
{
@@ -128,29 +128,30 @@ namespace DefaultDnsApplication
if (distance < lastDistance)
{
lastDistance = distance;
jsonLastServer = jsonServer;
jsonClosestServer = jsonServer;
}
}
}
dynamic jsonCname = jsonLastServer.cname;
if (jsonCname != null)
{
string cname = jsonCname.Value;
if (!string.IsNullOrEmpty(cname))
{
IReadOnlyList<DnsResourceRecord> answers;
if (jsonClosestServer == null)
return Task.FromResult<DnsDatagram>(null);
if (request.Question[0].Name.Equals(zoneName, StringComparison.OrdinalIgnoreCase)) //check for zone apex
answers = new DnsResourceRecord[] { new DnsResourceRecord(request.Question[0].Name, DnsResourceRecordType.ANAME, DnsClass.IN, appRecordTtl, new DnsANAMERecord(cname)) }; //use ANAME
else
answers = new DnsResourceRecord[] { new DnsResourceRecord(request.Question[0].Name, DnsResourceRecordType.CNAME, DnsClass.IN, appRecordTtl, new DnsCNAMERecord(cname)) };
dynamic jsonCname = jsonClosestServer.cname;
if (jsonCname == null)
return Task.FromResult<DnsDatagram>(null);
return Task.FromResult(new DnsDatagram(request.Identifier, true, request.OPCODE, true, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, answers));
}
}
string cname = jsonCname.Value;
if (string.IsNullOrEmpty(cname))
return Task.FromResult<DnsDatagram>(null);
return Task.FromResult<DnsDatagram>(null);
IReadOnlyList<DnsResourceRecord> answers;
if (request.Question[0].Name.Equals(zoneName, StringComparison.OrdinalIgnoreCase)) //check for zone apex
answers = new DnsResourceRecord[] { new DnsResourceRecord(request.Question[0].Name, DnsResourceRecordType.ANAME, DnsClass.IN, appRecordTtl, new DnsANAMERecord(cname)) }; //use ANAME
else
answers = new DnsResourceRecord[] { new DnsResourceRecord(request.Question[0].Name, DnsResourceRecordType.CNAME, DnsClass.IN, appRecordTtl, new DnsCNAMERecord(cname)) };
return Task.FromResult(new DnsDatagram(request.Identifier, true, request.OPCODE, true, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, answers));
}
#endregion