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

WebServiceDhcpApi: updated SetDhcpScopeAsync() to make startingAddress, endingAddress, and subnetMask api parameters optional when updating the scope.

Browse Source
This commit is contained in:
Shreyas Zare
2022-02-20 17:17:39 +05:30
parent 91226cd5a1
commit 96fbe9df25
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
DnsServerCore/WebServiceDhcpApi.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2021 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2022 Shreyas Zare (shreyas@technitium.com)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -380,30 +380,47 @@ namespace DnsServerCore
}
string strStartingAddress = request.QueryString["startingAddress"];
if (string.IsNullOrEmpty(strStartingAddress))
throw new DnsWebServiceException("Parameter 'startingAddress' missing.");
string strEndingAddress = request.QueryString["endingAddress"];
if (string.IsNullOrEmpty(strEndingAddress))
throw new DnsWebServiceException("Parameter 'endingAddress' missing.");
string strSubnetMask = request.QueryString["subnetMask"];
if (string.IsNullOrEmpty(strSubnetMask))
throw new DnsWebServiceException("Parameter 'subnetMask' missing.");
bool scopeExists;
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
if (scope is null)
{
//scope does not exists; create new scope
if (string.IsNullOrEmpty(strStartingAddress))
throw new DnsWebServiceException("Parameter 'startingAddress' missing.");
if (string.IsNullOrEmpty(strEndingAddress))
throw new DnsWebServiceException("Parameter 'endingAddress' missing.");
if (string.IsNullOrEmpty(strSubnetMask))
throw new DnsWebServiceException("Parameter 'subnetMask' missing.");
scopeExists = false;
scope = new Scope(scopeName, true, IPAddress.Parse(strStartingAddress), IPAddress.Parse(strEndingAddress), IPAddress.Parse(strSubnetMask));
}
else
{
scopeExists = true;
IPAddress startingAddress = IPAddress.Parse(strStartingAddress);
IPAddress endingAddress = IPAddress.Parse(strEndingAddress);
IPAddress startingAddress;
if (string.IsNullOrEmpty(strStartingAddress))
startingAddress = scope.StartingAddress;
else
startingAddress = IPAddress.Parse(strStartingAddress);
IPAddress endingAddress;
if (string.IsNullOrEmpty(strEndingAddress))
endingAddress = scope.EndingAddress;
else
endingAddress = IPAddress.Parse(strEndingAddress);
IPAddress subnetMask;
if (string.IsNullOrEmpty(strSubnetMask))
subnetMask = scope.SubnetMask;
else
subnetMask = IPAddress.Parse(strSubnetMask);
//validate scope address
foreach (KeyValuePair<string, Scope> entry in _dnsWebService.DhcpServer.Scopes)
@@ -417,7 +434,7 @@ namespace DnsServerCore
throw new DhcpServerException("Scope with overlapping range already exists: " + existingScope.StartingAddress.ToString() + "-" + existingScope.EndingAddress.ToString());
}
scope.ChangeNetwork(startingAddress, endingAddress, IPAddress.Parse(strSubnetMask));
scope.ChangeNetwork(startingAddress, endingAddress, subnetMask);
}
string strLeaseTimeDays = request.QueryString["leaseTimeDays"];