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

Scope: replaces LeaseTime with day, hour and minute based time selection.

Browse Source
This commit is contained in:
Shreyas Zare
2019-06-15 20:56:48 +05:30
parent 88e391896e
commit 030ebc2da6
2 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
DnsServerCore/Dhcp/Scope.cs
View File

@@ -43,7 +43,9 @@ namespace DnsServerCore.Dhcp
IPAddress _startingAddress;
IPAddress _endingAddress;
IPAddress _subnetMask;
uint _leaseTime = 86400; //default 1 day lease
ushort _leaseTimeDays = 1; //default 1 day lease
byte _leaseTimeHours = 0;
byte _leaseTimeMinutes = 0;
ushort _offerDelayTime;
//dhcp options
@@ -67,8 +69,6 @@ namespace DnsServerCore.Dhcp
IPAddress _networkAddress;
IPAddress _broadcastAddress;
string _reverseZone;
uint _renewTime;
uint _rebindTime;
//internal parameters
const int OFFER_EXPIRY_SECONDS = 60; //1 mins offer expiry
@@ -87,9 +87,6 @@ namespace DnsServerCore.Dhcp
_enabled = enabled;
ChangeNetwork(startingAddress, endingAddress, subnetMask);
_renewTime = _leaseTime / 2;
_rebindTime = Convert.ToUInt32(_leaseTime * 0.875);
}
public Scope(BinaryReader bR)
@@ -105,9 +102,9 @@ namespace DnsServerCore.Dhcp
ChangeNetwork(IPAddressExtension.Parse(bR), IPAddressExtension.Parse(bR), IPAddressExtension.Parse(bR));
_leaseTime = bR.ReadUInt32();
_renewTime = _leaseTime / 2;
_rebindTime = Convert.ToUInt32(_leaseTime * 0.875);
_leaseTimeDays = bR.ReadUInt16();
_leaseTimeHours = bR.ReadByte();
_leaseTimeMinutes = bR.ReadByte();
_offerDelayTime = bR.ReadUInt16();
@@ -226,6 +223,11 @@ namespace DnsServerCore.Dhcp
#region private
private uint GetLeaseTime()
{
return Convert.ToUInt32((_leaseTimeDays * 24 * 60 * 60) + (_leaseTimeHours * 60 * 60) + (_leaseTimeMinutes * 60));
}
private bool IsAddressAvailable(ref IPAddress address)
{
if (address.Equals(_routerAddress))
@@ -363,7 +365,7 @@ namespace DnsServerCore.Dhcp
if (reservedLease.ClientIdentifier.Equals(clientIdentifier))
{
//reserved address exists
Lease reservedOffer = new Lease(request.ClientIdentifier, request.HostName?.HostName, request.ClientHardwareAddress, reservedLease.Address, _leaseTime);
Lease reservedOffer = new Lease(request.ClientIdentifier, request.HostName?.HostName, request.ClientHardwareAddress, reservedLease.Address, GetLeaseTime());
return _offers.AddOrUpdate(request.ClientIdentifier, reservedOffer, delegate (ClientIdentifierOption key, Lease existingValue)
{
@@ -375,7 +377,7 @@ namespace DnsServerCore.Dhcp
if (_allowOnlyReservedLeases)
return null; //client does not have reserved address as per scope requirements
Lease dummyOffer = new Lease(request.ClientIdentifier, request.HostName?.HostName, request.ClientHardwareAddress, null, _leaseTime);
Lease dummyOffer = new Lease(request.ClientIdentifier, request.HostName?.HostName, request.ClientHardwareAddress, null, 0);
Lease existingOffer = _offers.GetOrAdd(request.ClientIdentifier, dummyOffer);
if (dummyOffer != existingOffer)
@@ -384,7 +386,7 @@ namespace DnsServerCore.Dhcp
return null; //dummy offer so another thread is handling offer; do nothing
//offer already exists
existingOffer.ResetLeaseTime(_leaseTime);
existingOffer.ResetLeaseTime(GetLeaseTime());
return existingOffer;
}
@@ -428,7 +430,7 @@ namespace DnsServerCore.Dhcp
_lastAddressOffered = offerAddress;
}
Lease offerLease = new Lease(request.ClientIdentifier, request.HostName?.HostName, request.ClientHardwareAddress, offerAddress, _leaseTime);
Lease offerLease = new Lease(request.ClientIdentifier, request.HostName?.HostName, request.ClientHardwareAddress, offerAddress, GetLeaseTime());
return _offers.AddOrUpdate(request.ClientIdentifier, offerLease, delegate (ClientIdentifierOption key, Lease existingValue)
{
@@ -472,9 +474,11 @@ namespace DnsServerCore.Dhcp
{
case DhcpMessageType.Discover:
case DhcpMessageType.Request:
options.Add(new IpAddressLeaseTimeOption(_leaseTime));
options.Add(new RenewalTimeValueOption(_renewTime));
options.Add(new RebindingTimeValueOption(_rebindTime));
uint leaseTime = GetLeaseTime();
options.Add(new IpAddressLeaseTimeOption(leaseTime));
options.Add(new RenewalTimeValueOption(leaseTime / 2));
options.Add(new RebindingTimeValueOption(Convert.ToUInt32(leaseTime * 0.875)));
break;
}
@@ -568,7 +572,7 @@ namespace DnsServerCore.Dhcp
internal void CommitLease(Lease lease)
{
lease.ResetLeaseTime(_leaseTime);
lease.ResetLeaseTime(GetLeaseTime());
_leases.AddOrUpdate(lease.ClientIdentifier, lease, delegate (ClientIdentifierOption key, Lease existingValue)
{
@@ -657,7 +661,7 @@ namespace DnsServerCore.Dhcp
uint endingAddressNumber = endingAddress.ConvertIpToNumber();
if (startingAddressNumber >= endingAddressNumber)
throw new ArgumentException("Ending address must be greater than starting address.", "endingAddress");
throw new ArgumentException("Ending address must be greater than starting address.");
_startingAddress = startingAddress;
_endingAddress = endingAddress;
@@ -666,9 +670,16 @@ namespace DnsServerCore.Dhcp
//compute other parameters
uint subnetMaskNumber = _subnetMask.ConvertIpToNumber();
uint networkAddressNumber = startingAddressNumber & subnetMaskNumber;
uint broadcastAddressNumber = networkAddressNumber | ~subnetMaskNumber;
if (networkAddressNumber == startingAddressNumber)
throw new ArgumentException("Starting address cannot be same as the network address.");
if (broadcastAddressNumber == endingAddressNumber)
throw new ArgumentException("Ending address cannot be same as the broadcast address.");
_networkAddress = IPAddressExtension.ConvertNumberToIp(networkAddressNumber);
_broadcastAddress = IPAddressExtension.ConvertNumberToIp(networkAddressNumber | ~subnetMaskNumber);
_broadcastAddress = IPAddressExtension.ConvertNumberToIp(broadcastAddressNumber);
_reverseZone = GetReverseZone(_networkAddress, _subnetMask);
_lastAddressOffered = _startingAddress;
@@ -684,7 +695,9 @@ namespace DnsServerCore.Dhcp
_startingAddress.WriteTo(bW);
_endingAddress.WriteTo(bW);
_subnetMask.WriteTo(bW);
bW.Write(_leaseTime);
bW.Write(_leaseTimeDays);
bW.Write(_leaseTimeHours);
bW.Write(_leaseTimeMinutes);
bW.Write(_offerDelayTime);
if (string.IsNullOrEmpty(_domainName))
@@ -850,14 +863,39 @@ namespace DnsServerCore.Dhcp
public IPAddress SubnetMask
{ get { return _subnetMask; } }
public uint LeaseTime
public ushort LeaseTimeDays
{
get { return _leaseTime; }
get { return _leaseTimeDays; }
set
{
_leaseTime = value;
_renewTime = _leaseTime / 2;
_rebindTime = Convert.ToUInt32(_leaseTime * 0.875);
if (value > 999)
throw new ArgumentOutOfRangeException("Lease time in days must be between 0 to 999.");
_leaseTimeDays = value;
}
}
public byte LeaseTimeHours
{
get { return _leaseTimeHours; }
set
{
if (value > 23)
throw new ArgumentOutOfRangeException("Lease time in hours must be between 0 to 23.");
_leaseTimeHours = value;
}
}
public byte LeaseTimeMinutes
{
get { return _leaseTimeMinutes; }
set
{
if (value > 59)
throw new ArgumentOutOfRangeException("Lease time in minutes must be between 0 to 59.");
_leaseTimeMinutes = value;
}
}

24
DnsServerCore/WebService.cs
View File

@@ -3000,8 +3000,14 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("subnetMask");
jsonWriter.WriteValue(scope.SubnetMask.ToString());
jsonWriter.WritePropertyName("leaseTime");
jsonWriter.WriteValue(scope.LeaseTime);
jsonWriter.WritePropertyName("leaseTimeDays");
jsonWriter.WriteValue(scope.LeaseTimeDays);
jsonWriter.WritePropertyName("leaseTimeHours");
jsonWriter.WriteValue(scope.LeaseTimeHours);
jsonWriter.WritePropertyName("leaseTimeMinutes");
jsonWriter.WriteValue(scope.LeaseTimeMinutes);
jsonWriter.WritePropertyName("offerDelayTime");
jsonWriter.WriteValue(scope.OfferDelayTime);
@@ -3160,9 +3166,17 @@ namespace DnsServerCore
scope.ChangeNetwork(IPAddress.Parse(strStartingAddress), IPAddress.Parse(strEndingAddress), IPAddress.Parse(strSubnetMask));
}
string strLeaseTime = request.QueryString["leaseTime"];
if (!string.IsNullOrEmpty(strLeaseTime))
scope.LeaseTime = uint.Parse(strLeaseTime);
string strLeaseTimeDays = request.QueryString["leaseTimeDays"];
if (!string.IsNullOrEmpty(strLeaseTimeDays))
scope.LeaseTimeDays = ushort.Parse(strLeaseTimeDays);
string strLeaseTimeHours = request.QueryString["leaseTimeHours"];
if (!string.IsNullOrEmpty(strLeaseTimeHours))
scope.LeaseTimeHours = byte.Parse(strLeaseTimeHours);
string strLeaseTimeMinutes = request.QueryString["leaseTimeMinutes"];
if (!string.IsNullOrEmpty(strLeaseTimeMinutes))
scope.LeaseTimeMinutes = byte.Parse(strLeaseTimeMinutes);
string strOfferDelayTime = request.QueryString["offerDelayTime"];
if (!string.IsNullOrEmpty(strOfferDelayTime))