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

WebServiceDhcpApi: Updated RemoveDhcpLease() to directly find scope and use its methods. Updated ConvertToReservedLease() and ConvertToDynamicLease() methods to support using both hardware address and client identifier.

Browse Source
This commit is contained in:
Shreyas Zare
2022-04-30 13:04:36 +05:30
parent 0e4f8f4d57
commit dce60e2a29
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DnsServerCore/WebServiceDhcpApi.cs
View File

@@ -697,13 +697,17 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
if (scope is null)
throw new DnsWebServiceException("DHCP scope does not exists: " + scopeName);
string strClientIdentifier = request.QueryString["clientIdentifier"];
string strHardwareAddress = request.QueryString["hardwareAddress"];
if (!string.IsNullOrEmpty(strClientIdentifier))
_dnsWebService.DhcpServer.RemoveLeaseByClientIdentifier(scopeName, strClientIdentifier);
scope.RemoveLease(ClientIdentifierOption.Parse(strClientIdentifier));
else if (!string.IsNullOrEmpty(strHardwareAddress))
_dnsWebService.DhcpServer.RemoveLeaseByHardwareAddress(scopeName, strHardwareAddress);
scope.RemoveLease(strHardwareAddress);
else
throw new DnsWebServiceException("Parameter 'hardwareAddress' or 'clientIdentifier' missing. At least one of them must be specified.");
@@ -722,11 +726,15 @@ namespace DnsServerCore
if (scope == null)
throw new DnsWebServiceException("DHCP scope does not exists: " + scopeName);
string strClientIdentifier = request.QueryString["clientIdentifier"];
string strHardwareAddress = request.QueryString["hardwareAddress"];
if (string.IsNullOrEmpty(strHardwareAddress))
throw new DnsWebServiceException("Parameter 'hardwareAddress' missing.");
scope.ConvertToReservedLease(strHardwareAddress);
if (!string.IsNullOrEmpty(strClientIdentifier))
scope.ConvertToReservedLease(ClientIdentifierOption.Parse(strClientIdentifier));
else if (!string.IsNullOrEmpty(strHardwareAddress))
scope.ConvertToReservedLease(strHardwareAddress);
else
throw new DnsWebServiceException("Parameter 'hardwareAddress' or 'clientIdentifier' missing. At least one of them must be specified.");
_dnsWebService.DhcpServer.SaveScope(scopeName);
@@ -743,11 +751,15 @@ namespace DnsServerCore
if (scope == null)
throw new DnsWebServiceException("DHCP scope does not exists: " + scopeName);
string strClientIdentifier = request.QueryString["clientIdentifier"];
string strHardwareAddress = request.QueryString["hardwareAddress"];
if (string.IsNullOrEmpty(strHardwareAddress))
throw new DnsWebServiceException("Parameter 'hardwareAddress' missing.");
scope.ConvertToDynamicLease(strHardwareAddress);
if (!string.IsNullOrEmpty(strClientIdentifier))
scope.ConvertToDynamicLease(ClientIdentifierOption.Parse(strClientIdentifier));
else if (!string.IsNullOrEmpty(strHardwareAddress))
scope.ConvertToDynamicLease(strHardwareAddress);
else
throw new DnsWebServiceException("Parameter 'hardwareAddress' or 'clientIdentifier' missing. At least one of them must be specified.");
_dnsWebService.DhcpServer.SaveScope(scopeName);