Skip to content

dhcp: allow reserved leases outside scope pool range but within subnet #2032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CoryCharlton wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

dhcp: allow reserved leases outside scope pool range but within subnet #2032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion DnsServerCore/Dhcp/DhcpServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,14 @@ private Scope FindScope(DhcpMessage request, IPAddress remoteAddress, IPPacketIn
{
Scope scope = entry.Value;

if (scope.Enabled && scope.IsAddressInRange(request.ClientIpAddress))
if (!scope.Enabled)
continue;

Lease reservedLease = scope.GetReservedLease(request);
if ((reservedLease is not null) && reservedLease.Address.Equals(request.ClientIpAddress))
return scope; //ciaddr is this client's reserved address (may be out of pool range)

if (scope.IsAddressInRange(request.ClientIpAddress))
return scope;
}

Expand Down
7 changes: 5 additions & 2 deletions DnsServerCore/Dhcp/Scope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,9 @@ public void ChangeNetwork(IPAddress startingAddress, IPAddress endingAddress, IP

public bool TryAddReservedLease(Lease reservedLease)
{
if (!IsAddressInNetwork(reservedLease.Address))
throw new ArgumentOutOfRangeException(nameof(reservedLease), "Reserved address must be within the scope's subnet.");

if (_reservedLeases.TryAdd(reservedLease.ClientIdentifier, reservedLease))
{
_dhcpServer.AddDnsEntries(this, reservedLease);
Expand Down Expand Up @@ -2175,8 +2178,8 @@ public IReadOnlyCollection<Lease> ReservedLeases
{
foreach (Lease reservedLease in value)
{
if (!IsAddressInRange(reservedLease.Address))
throw new ArgumentOutOfRangeException(nameof(ReservedLeases), "Reserved address must be in scope range.");
if (!IsAddressInNetwork(reservedLease.Address))
throw new ArgumentOutOfRangeException(nameof(ReservedLeases), "Reserved address must be within the scope's subnet.");
}

//remove DNS entries for reserved leases being removed or has updated domain name
Expand Down