fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-29 04:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scope: added feature to block allocation for locally administered mac addresses.

Browse Source
This commit is contained in:
Shreyas Zare
2022-09-24 11:46:41 +05:30
parent ba38a6455e
commit 6d89dbf92e
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
DnsServerCore/Dhcp/Scope.cs
View File

@@ -73,6 +73,7 @@ namespace DnsServerCore.Dhcp
IReadOnlyCollection<Exclusion> _exclusions;
readonly ConcurrentDictionary<ClientIdentifierOption, Lease> _reservedLeases = new ConcurrentDictionary<ClientIdentifierOption, Lease>();
bool _allowOnlyReservedLeases;
bool _blockLocallyAdministeredMacAddresses;
//leases
readonly ConcurrentDictionary<ClientIdentifierOption, Lease> _leases = new ConcurrentDictionary<ClientIdentifierOption, Lease>();
@@ -117,6 +118,7 @@ namespace DnsServerCore.Dhcp
case 3:
case 4:
case 5:
case 6:
_name = bR.ReadShortString();
_enabled = bR.ReadBoolean();
@@ -269,6 +271,11 @@ namespace DnsServerCore.Dhcp
_allowOnlyReservedLeases = bR.ReadBoolean();
}
if (version >= 6)
_blockLocallyAdministeredMacAddresses = bR.ReadBoolean();
else
_blockLocallyAdministeredMacAddresses = false;
{
int count = bR.ReadInt32();
if (count > 0)
@@ -790,6 +797,12 @@ namespace DnsServerCore.Dhcp
if (_allowOnlyReservedLeases)
throw new DhcpServerException("DHCP Server failed to offer IP address to " + request.GetClientFullIdentifier() + ": scope allows only reserved lease allocations.");
if (_blockLocallyAdministeredMacAddresses)
{
if ((request.HardwareAddressType == DhcpMessageHardwareAddressType.Ethernet) && ((request.ClientHardwareAddress[0] & 0x02) > 0))
throw new DhcpServerException("DHCP Server failed to offer IP address to " + request.GetClientFullIdentifier() + ": scope does not allow locally administered MAC addresses.");
}
Lease dummyOffer = new Lease(LeaseType.None, null, null, null, null, null, 0);
Lease existingOffer = _offers.GetOrAdd(request.ClientIdentifier, dummyOffer);
@@ -1262,7 +1275,7 @@ namespace DnsServerCore.Dhcp
public void WriteTo(BinaryWriter bW)
{
bW.Write(Encoding.ASCII.GetBytes("SC"));
bW.Write((byte)5); //version
bW.Write((byte)6); //version
bW.WriteShortString(_name);
bW.Write(_enabled);
@@ -1393,6 +1406,7 @@ namespace DnsServerCore.Dhcp
reservedLease.Value.WriteTo(bW);
bW.Write(_allowOnlyReservedLeases);
bW.Write(_blockLocallyAdministeredMacAddresses);
{
bW.Write(_leases.Count);
@@ -1695,6 +1709,12 @@ namespace DnsServerCore.Dhcp
set { _allowOnlyReservedLeases = value; }
}
public bool BlockLocallyAdministeredMacAddresses
{
get { return _blockLocallyAdministeredMacAddresses; }
set { _blockLocallyAdministeredMacAddresses = value; }
}
public IReadOnlyDictionary<ClientIdentifierOption, Lease> Leases
{ get { return _leases; } }