fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-03 07:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scope: changes done to include start and end address in offer. minor error message changes done.

Browse Source
This commit is contained in:
Shreyas Zare
2019-06-16 13:45:35 +05:30
parent 282e47f6a5
commit 39dd66f44b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DnsServerCore/Dhcp/Scope.cs
View File

@@ -413,13 +413,14 @@ namespace DnsServerCore.Dhcp
{
//find free address from scope
offerAddress = _lastAddressOffered;
uint endingAddressNumber = _endingAddress.ConvertIpToNumber();
bool offerAddressWasResetFromEnd = false;
while (true)
{
offerAddress = IPAddressExtension.ConvertNumberToIp(offerAddress.ConvertIpToNumber() + 1u);
uint nextOfferAddressNumber = offerAddress.ConvertIpToNumber() + 1u;
if (offerAddress.Equals(_endingAddress))
if (nextOfferAddressNumber > endingAddressNumber)
{
if (offerAddressWasResetFromEnd)
return null; //ip pool exhausted
@@ -429,6 +430,8 @@ namespace DnsServerCore.Dhcp
continue;
}
offerAddress = IPAddressExtension.ConvertNumberToIp(nextOfferAddressNumber);
if (IsAddressAvailable(ref offerAddress))
break;
}
@@ -688,7 +691,7 @@ namespace DnsServerCore.Dhcp
_broadcastAddress = IPAddressExtension.ConvertNumberToIp(broadcastAddressNumber);
_reverseZone = GetReverseZone(_networkAddress, _subnetMask);
_lastAddressOffered = _startingAddress;
_lastAddressOffered = IPAddressExtension.ConvertNumberToIp(startingAddressNumber - 1u);
}
public void WriteTo(BinaryWriter bW)
@@ -973,10 +976,10 @@ namespace DnsServerCore.Dhcp
foreach (Exclusion exclusion in value)
{
if (!IsAddressInRange(exclusion.StartingAddress))
throw new ArgumentOutOfRangeException("StartingAddress", "Exclusion address must be in scope range.");
throw new ArgumentOutOfRangeException("Exclusion starting address must be in scope range.");
if (!IsAddressInRange(exclusion.EndingAddress))
throw new ArgumentOutOfRangeException("EndingAddress", "Exclusion address must be in scope range.");
throw new ArgumentOutOfRangeException("Exclusion ending address must be in scope range.");
}
_exclusions = value;
@@ -998,7 +1001,7 @@ namespace DnsServerCore.Dhcp
foreach (Lease reservedLease in value)
{
if (!IsAddressInRange(reservedLease.Address))
throw new ArgumentOutOfRangeException("Address", "Reserved address must be in scope range.");
throw new ArgumentOutOfRangeException("Reserved address must be in scope range.");
}
_reservedLeases = value;