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

DhcpServer: fixed issue in FindScope() caused due to unnecessary validation to check if RelayAgentIpAddress equals remoteAddress.

Browse Source
This commit is contained in:
Shreyas Zare
2020-09-26 12:20:14 +05:30
parent d3e21a74bb
commit c022e31ad5
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
DnsServerCore/Dhcp/DhcpServer.cs
View File

@@ -578,8 +578,6 @@ namespace DnsServerCore.Dhcp
private Scope FindScope(DhcpMessage request, IPAddress remoteAddress, IPPacketInformation ipPacketInformation)
{
bool broadcast;
if (request.RelayAgentIpAddress.Equals(IPAddress.Any))
{
//no relay agent
@@ -588,39 +586,32 @@ namespace DnsServerCore.Dhcp
if (!ipPacketInformation.Address.Equals(IPAddress.Broadcast))
return null; //message destination address must be broadcast address
broadcast = true; //broadcast request
//broadcast request
foreach (KeyValuePair<string, Scope> scope in _scopes)
{
if (scope.Value.Enabled && (scope.Value.InterfaceIndex == ipPacketInformation.Interface))
return scope.Value;
}
}
else
{
if (!remoteAddress.Equals(request.ClientIpAddress))
return null; //client ip must match udp src addr
broadcast = false; //unicast request
//unicast request
foreach (KeyValuePair<string, Scope> scope in _scopes)
{
if (scope.Value.Enabled && (scope.Value.IsAddressInRange(remoteAddress)))
return scope.Value;
}
}
}
else
{
//relay agent unicast
if (!remoteAddress.Equals(request.RelayAgentIpAddress))
return null; //relay ip must match udp src addr
broadcast = false; //unicast request
}
if (broadcast)
{
foreach (KeyValuePair<string, Scope> scope in _scopes)
{
if (scope.Value.Enabled && (scope.Value.InterfaceIndex == ipPacketInformation.Interface))
return scope.Value;
}
}
else
{
foreach (KeyValuePair<string, Scope> scope in _scopes)
{
if (scope.Value.Enabled && (scope.Value.IsAddressInRange(remoteAddress)))
if (scope.Value.Enabled && (scope.Value.IsAddressInRange(request.RelayAgentIpAddress)))
return scope.Value;
}
}