fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-02-23 00:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

code refactoring done.

Browse Source
This commit is contained in:
Shreyas Zare
2020-06-13 14:17:14 +05:30
parent 45dfe04768
commit a965e69d93
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DnsServerCore/Dns/DnsServer.cs
View File

@@ -1010,7 +1010,7 @@ namespace DnsServerCore.Dns
{
if (rr.Type == DnsResourceRecordType.NS)
{
string nameServer = (rr.RDATA as DnsNSRecord).NSDomainName;
string nameServer = (rr.RDATA as DnsNSRecord).NameServer;
try
{
@@ -1074,7 +1074,7 @@ namespace DnsServerCore.Dns
int queryCount = 0;
do
{
DnsDatagram newRequest = new DnsDatagram(0, false, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, false, false, false, DnsResponseCode.NoError, new DnsQuestionRecord[] { new DnsQuestionRecord((lastRR.RDATA as DnsCNAMERecord).CNAMEDomainName, questionType, request.Question[0].Class) });
DnsDatagram newRequest = new DnsDatagram(0, false, DnsOpcode.StandardQuery, false, false, request.RecursionDesired, false, false, false, DnsResponseCode.NoError, new DnsQuestionRecord[] { new DnsQuestionRecord((lastRR.RDATA as DnsCNAMERecord).Domain, questionType, request.Question[0].Class) });
//query authoritative zone first
lastResponse = _authZoneManager.Query(newRequest);
@@ -1165,7 +1165,7 @@ namespace DnsServerCore.Dns
DnsDatagram lastResponse;
DnsResourceRecord anameRR = response.Answer[response.Answer.Count - 1];
string lastDomain = (anameRR.RDATA as DnsANAMERecord).ANAMEDomainName;
string lastDomain = (anameRR.RDATA as DnsANAMERecord).Domain;
int queryCount = 0;
do
@@ -1207,9 +1207,9 @@ namespace DnsServerCore.Dns
DnsResourceRecord lastRR = lastResponse.Answer[lastResponse.Answer.Count - 1];
if (lastRR.Type == DnsResourceRecordType.ANAME)
lastDomain = (lastRR.RDATA as DnsANAMERecord).ANAMEDomainName;
lastDomain = (lastRR.RDATA as DnsANAMERecord).Domain;
else if (lastRR.Type == DnsResourceRecordType.CNAME)
lastDomain = (lastRR.RDATA as DnsCNAMERecord).CNAMEDomainName;
lastDomain = (lastRR.RDATA as DnsCNAMERecord).Domain;
else
break; //aname/cname was resolved
}
@@ -1330,7 +1330,7 @@ namespace DnsServerCore.Dns
if (record.Type == DnsResourceRecordType.CNAME)
{
DnsDatagram newRequest = new DnsDatagram(0, false, DnsOpcode.StandardQuery, false, false, true, false, false, false, DnsResponseCode.NoError, new DnsQuestionRecord[] { new DnsQuestionRecord((record.RDATA as DnsCNAMERecord).CNAMEDomainName, request.Question[0].Type, request.Question[0].Class) });
DnsDatagram newRequest = new DnsDatagram(0, false, DnsOpcode.StandardQuery, false, false, true, false, false, false, DnsResponseCode.NoError, new DnsQuestionRecord[] { new DnsQuestionRecord((record.RDATA as DnsCNAMERecord).Domain, request.Question[0].Type, request.Question[0].Class) });
DnsDatagram lastResponse = ProcessBlockedQuery(newRequest);
if (lastResponse != null)
{
@@ -1366,7 +1366,7 @@ namespace DnsServerCore.Dns
do
{
DnsDatagram newRequest = new DnsDatagram(0, false, DnsOpcode.StandardQuery, false, false, true, false, false, false, DnsResponseCode.NoError, new DnsQuestionRecord[] { new DnsQuestionRecord((lastRR.RDATA as DnsCNAMERecord).CNAMEDomainName, request.Question[0].Type, request.Question[0].Class) });
DnsDatagram newRequest = new DnsDatagram(0, false, DnsOpcode.StandardQuery, false, false, true, false, false, false, DnsResponseCode.NoError, new DnsQuestionRecord[] { new DnsQuestionRecord((lastRR.RDATA as DnsCNAMERecord).Domain, request.Question[0].Type, request.Question[0].Class) });
if (checkForCnameCloaking)
{
@@ -1681,7 +1681,7 @@ namespace DnsServerCore.Dns
return null; //too many hops so ignore question
//follow CNAME chain to inspect TTL further
question = new DnsQuestionRecord((lastRR.RDATA as DnsCNAMERecord).CNAMEDomainName, question.Type, question.Class);
question = new DnsQuestionRecord((lastRR.RDATA as DnsCNAMERecord).Domain, question.Type, question.Class);
}
}

4
DnsServerCore/Dns/ResourceRecords/DnsResourceRecordExtension.cs
View File

@@ -52,7 +52,7 @@ namespace DnsServerCore.Dns.ResourceRecords
switch (record.Type)
{
case DnsResourceRecordType.NS:
domain = (record.RDATA as DnsNSRecord).NSDomainName;
domain = (record.RDATA as DnsNSRecord).NameServer;
break;
case DnsResourceRecordType.SOA:
@@ -96,7 +96,7 @@ namespace DnsServerCore.Dns.ResourceRecords
switch (record.Type)
{
case DnsResourceRecordType.NS:
domain = (record.RDATA as DnsNSRecord).NSDomainName;
domain = (record.RDATA as DnsNSRecord).NameServer;
break;
case DnsResourceRecordType.SOA:

8
DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs
View File

@@ -119,14 +119,14 @@ namespace DnsServerCore.Dns.ZoneManagers
foreach (DnsResourceRecord nsResourceRecord in nsResourceRecords)
{
if ((nsResourceRecord.RDATA as DnsNSRecord).NSDomainName.Equals(_serverDomain, StringComparison.OrdinalIgnoreCase))
if ((nsResourceRecord.RDATA as DnsNSRecord).NameServer.Equals(_serverDomain, StringComparison.OrdinalIgnoreCase))
{
UpdateRecord(nsResourceRecord, new DnsResourceRecord(nsResourceRecord.Name, nsResourceRecord.Type, nsResourceRecord.Class, nsResourceRecord.TtlValue, new DnsNSRecord(serverDomain)) { Tag = nsResourceRecord.Tag });
break;
}
}
if (zone.IsInternal)
if (zone.Internal)
continue; //dont save internal zones to disk
try
@@ -234,7 +234,7 @@ namespace DnsServerCore.Dns.ZoneManagers
if (nsRecord.Type != DnsResourceRecordType.NS)
continue;
AuthZone authZone = _root.FindZone((nsRecord.RDATA as DnsNSRecord).NSDomainName, out _, out _, out _);
AuthZone authZone = _root.FindZone((nsRecord.RDATA as DnsNSRecord).NameServer, out _, out _, out _);
if ((authZone != null) && authZone.IsActive)
{
{
@@ -951,7 +951,7 @@ namespace DnsServerCore.Dns.ZoneManagers
//write zone info
AuthZoneInfo zoneInfo = new AuthZoneInfo(zones[0]);
if (zoneInfo.IsInternal)
if (zoneInfo.Internal)
throw new InvalidOperationException("Cannot save zones marked as internal.");
zoneInfo.WriteTo(bW);

2
DnsServerCore/Dns/ZoneManagers/CacheZoneManager.cs
View File

@@ -89,7 +89,7 @@ namespace DnsServerCore.Dns.ZoneManagers
if (nsRecord.Type != DnsResourceRecordType.NS)
continue;
CacheZone cacheZone = _root.FindZone((nsRecord.RDATA as DnsNSRecord).NSDomainName, out _, out _, out _);
CacheZone cacheZone = _root.FindZone((nsRecord.RDATA as DnsNSRecord).NameServer, out _, out _, out _);
if (cacheZone != null)
{
{

4
DnsServerCore/Dns/Zones/AuthZoneInfo.cs
View File

@@ -200,7 +200,7 @@ namespace DnsServerCore.Dns.Zones
}
}
public bool IsInternal
public bool Internal
{
get
{
@@ -208,7 +208,7 @@ namespace DnsServerCore.Dns.Zones
throw new InvalidOperationException();
if (_zone is PrimaryZone)
return (_zone as PrimaryZone).IsInternal;
return (_zone as PrimaryZone).Internal;
return false;
}

4
DnsServerCore/Dns/Zones/PrimaryZone.cs
View File

@@ -113,7 +113,7 @@ namespace DnsServerCore.Dns.Zones
foreach (DnsResourceRecord nsRecord in nsRecords)
{
string nsDomain = (nsRecord.RDATA as DnsNSRecord).NSDomainName;
string nsDomain = (nsRecord.RDATA as DnsNSRecord).NameServer;
if (soa.MasterNameServer.Equals(nsDomain, StringComparison.OrdinalIgnoreCase))
continue; //dont notify self
@@ -307,7 +307,7 @@ namespace DnsServerCore.Dns.Zones
#region properties
public bool IsInternal
public bool Internal
{ get { return _internal; } }
#endregion

2
DnsServerCore/Dns/Zones/StubZone.cs
View File

@@ -156,7 +156,7 @@ namespace DnsServerCore.Dns.Zones
foreach (DnsResourceRecord record in records)
{
string nsDomain = (record.RDATA as DnsNSRecord).NSDomainName;
string nsDomain = (record.RDATA as DnsNSRecord).NameServer;
IReadOnlyList<DnsResourceRecord> glueRecords = record.GetGlueRecords();
if (glueRecords.Count > 0)

10
DnsServerCore/WebService.cs
View File

@@ -2537,7 +2537,7 @@ namespace DnsServerCore
if (rdata != null)
{
jsonWriter.WritePropertyName("value");
jsonWriter.WriteValue(rdata.PTRDomainName);
jsonWriter.WriteValue(rdata.Domain);
}
}
break;
@@ -2562,7 +2562,7 @@ namespace DnsServerCore
if (rdata != null)
{
jsonWriter.WritePropertyName("value");
jsonWriter.WriteValue(rdata.TXTData);
jsonWriter.WriteValue(rdata.Text);
}
}
break;
@@ -2573,7 +2573,7 @@ namespace DnsServerCore
if (rdata != null)
{
jsonWriter.WritePropertyName("value");
jsonWriter.WriteValue(rdata.NSDomainName);
jsonWriter.WriteValue(rdata.NameServer);
}
IReadOnlyList<DnsResourceRecord> glueRecords = resourceRecord.GetGlueRecords();
@@ -2601,7 +2601,7 @@ namespace DnsServerCore
if (rdata != null)
{
jsonWriter.WritePropertyName("value");
jsonWriter.WriteValue(rdata.CNAMEDomainName);
jsonWriter.WriteValue(rdata.Domain);
}
}
break;
@@ -2649,7 +2649,7 @@ namespace DnsServerCore
if (rdata != null)
{
jsonWriter.WritePropertyName("value");
jsonWriter.WriteValue(rdata.ANAMEDomainName);
jsonWriter.WriteValue(rdata.Domain);
}
}
break;