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

DhcpServer: fixed issue in FindScope() which required the relay agent ip address to be in the scope range.

Browse Source
This commit is contained in:
Shreyas Zare
2020-10-04 13:49:31 +05:30
parent e7277a6cec
commit ad74afa91e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DnsServerCore/Dhcp/DhcpServer.cs
View File

@@ -610,7 +610,7 @@ namespace DnsServerCore.Dhcp
//unicast request
foreach (Scope scope in _scopes.Values)
{
if (scope.Enabled && scope.IsAddressInRange(remoteAddress))
if (scope.Enabled && scope.IsAddressInRange(request.ClientIpAddress))
return scope;
}
@@ -624,15 +624,16 @@ namespace DnsServerCore.Dhcp
foreach (Scope scope in _scopes.Values)
{
if (scope.Enabled && scope.InterfaceAddress.Equals(IPAddress.Any))
if (scope.Enabled && scope.InterfaceAddress.Equals(IPAddress.Any) && scope.IsAddressInNetwork(request.RelayAgentIpAddress))
{
if (scope.GetReservedLease(request) != null)
return scope; //found reserved lease on this scope
if (!request.ClientIpAddress.Equals(IPAddress.Any) && scope.IsAddressInRange(request.ClientIpAddress))
foundScope = scope; //client IP address is in scope range
else if ((foundScope == null) && scope.IsAddressInRange(request.RelayAgentIpAddress))
foundScope = scope; //relay agent IP address is in scope range
return scope; //client IP address is in scope range
if ((foundScope == null) && !scope.AllowOnlyReservedLeases)
foundScope = scope;
}
}