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

ZoneTree: fixed bug in TryRemove() which caused removal of all sub domains of another zone in tree branch.

Browse Source
This commit is contained in:
Shreyas Zare
2020-07-04 16:31:10 +05:30
parent 4de8c5c8cf
commit d103e729be
1 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
DnsServerCore/Dns/Zones/ZoneTree.cs
View File

@@ -399,37 +399,73 @@ namespace DnsServerCore.Dns.Zones
public override bool TryRemove(string domain, out T value)
{
if (TryRemove(domain, out value, out Node closestNode))
if (typeof(T) == typeof(CacheZone))
{
if ((value != null) && !(value is SubDomainZone))
bool removed = TryRemove(domain, out value, out Node closestNode);
//remove all cache zones under current zone
Node current = closestNode;
do
{
//remove all sub domain or cache zones
Node current = closestNode;
current = current.GetNextNodeWithValue(closestNode.Depth);
if (current == null)
break;
while (true)
NodeValue v = current.Value;
if (v != null)
{
current = current.GetNextNodeWithValue(closestNode.Depth);
if (current == null)
break;
NodeValue v = current.Value;
if (v != null)
T zone = v.Value;
if (zone != null)
{
T zone = v.Value;
if ((zone != null) && ((zone is SubDomainZone) || (zone is CacheZone)))
{
current.RemoveNodeValue(v.Key, out _); //remove node value
current.CleanThisBranch();
}
current.RemoveNodeValue(v.Key, out _); //remove node value
current.CleanThisBranch();
removed = true;
}
}
}
while (true);
closestNode.CleanThisBranch();
return true;
if (removed)
closestNode.CleanThisBranch();
return removed;
}
else
{
if (TryRemove(domain, out value, out Node closestNode))
{
if ((value != null) && ((value is PrimaryZone) || (value is SecondaryZone) || (value is StubZone) || (value is ForwarderZone)))
{
//remove all sub domains under current zone
Node current = closestNode;
return false;
do
{
current = GetNextSubDomainZoneNode(current, closestNode.Depth);
if (current == null)
break;
NodeValue v = current.Value;
if (v != null)
{
T zone = v.Value;
if (zone != null)
{
current.RemoveNodeValue(v.Key, out _); //remove node value
current.CleanThisBranch();
}
}
}
while (true);
}
closestNode.CleanThisBranch();
return true;
}
return false;
}
}
public List<T> GetZoneWithSubDomainZones(string domain)