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

WebService: implemented dhcp changes.

Browse Source
This commit is contained in:
Shreyas Zare
2020-09-26 18:50:40 +05:30
parent 76f4276e87
commit 589cf73a4e
1 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
DnsServerCore/WebService.cs
View File

@@ -3517,33 +3517,30 @@ namespace DnsServerCore
jsonWriter.WriteEndArray();
}
if (scope.ReservedLeases != null)
jsonWriter.WritePropertyName("reservedLeases");
jsonWriter.WriteStartArray();
foreach (Lease reservedLease in scope.ReservedLeases)
{
jsonWriter.WritePropertyName("reservedLeases");
jsonWriter.WriteStartArray();
jsonWriter.WriteStartObject();
foreach (Lease reservedLease in scope.ReservedLeases)
{
jsonWriter.WriteStartObject();
jsonWriter.WritePropertyName("hostName");
jsonWriter.WriteValue(reservedLease.HostName);
jsonWriter.WritePropertyName("hostName");
jsonWriter.WriteValue(reservedLease.HostName);
jsonWriter.WritePropertyName("hardwareAddress");
jsonWriter.WriteValue(BitConverter.ToString(reservedLease.HardwareAddress));
jsonWriter.WritePropertyName("hardwareAddress");
jsonWriter.WriteValue(BitConverter.ToString(reservedLease.HardwareAddress));
jsonWriter.WritePropertyName("address");
jsonWriter.WriteValue(reservedLease.Address.ToString());
jsonWriter.WritePropertyName("address");
jsonWriter.WriteValue(reservedLease.Address.ToString());
jsonWriter.WritePropertyName("comments");
jsonWriter.WriteValue(reservedLease.Comments);
jsonWriter.WritePropertyName("comments");
jsonWriter.WriteValue(reservedLease.Comments);
jsonWriter.WriteEndObject();
}
jsonWriter.WriteEndArray();
jsonWriter.WriteEndObject();
}
jsonWriter.WriteEndArray();
jsonWriter.WritePropertyName("allowOnlyReservedLeases");
jsonWriter.WriteValue(scope.AllowOnlyReservedLeases);
}
@@ -3587,7 +3584,17 @@ namespace DnsServerCore
else
{
scopeExists = true;
scope.ChangeNetwork(IPAddress.Parse(strStartingAddress), IPAddress.Parse(strEndingAddress), IPAddress.Parse(strSubnetMask));
IPAddress startingAddress = IPAddress.Parse(strStartingAddress);
IPAddress endingAddress = IPAddress.Parse(strEndingAddress);
//validate scope address
foreach (Scope existingScope in _dhcpServer.Scopes)
{
if (existingScope.IsAddressInRange(startingAddress) || existingScope.IsAddressInRange(endingAddress))
throw new DhcpServerException("Scope with overlapping range already exists.");
}
scope.ChangeNetwork(startingAddress, endingAddress, IPAddress.Parse(strSubnetMask));
}
string strLeaseTimeDays = request.QueryString["leaseTimeDays"];
@@ -3743,22 +3750,13 @@ namespace DnsServerCore
for (int i = 0; i < strReservedLeaseParts.Length; i++)
{
string[] leaseParts = strReservedLeaseParts[i].Split(';');
string hostname = null;
Lease reservedLease = new Lease(LeaseType.Reserved, null, leaseParts[0], IPAddress.Parse(leaseParts[1]), leaseParts[2]);
if (scope.ReservedLeases != null)
{
//search for current hostname
foreach (Lease lease in scope.ReservedLeases)
{
if (BitConverter.ToString(lease.HardwareAddress) == leaseParts[0])
{
hostname = lease.HostName;
break;
}
}
}
Lease existingReservedLease = scope.GetReservedLease(reservedLease.ClientIdentifier);
if (existingReservedLease != null)
reservedLease.SetHostName(existingReservedLease.HostName);
reservedLeases[i] = new Lease(LeaseType.Reserved, hostname, leaseParts[0], IPAddress.Parse(leaseParts[1]), leaseParts[2]);
reservedLeases[i] = reservedLease;
}
scope.ReservedLeases = reservedLeases;