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

DhcpServer: minor bug fixes done.

Browse Source
This commit is contained in:
Shreyas Zare
2019-06-16 21:47:27 +05:30
parent 162a053f42
commit ff412bfd03
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DnsServerCore/Dhcp/DhcpServer.cs
View File

@@ -103,11 +103,11 @@ namespace DnsServerCore.Dhcp
if (disposing)
{
Stop();
if (_maintenanceTimer != null)
_maintenanceTimer.Dispose();
Stop();
SaveModifiedScopes();
}
@@ -772,7 +772,8 @@ namespace DnsServerCore.Dhcp
private void UnloadScope(Scope scope)
{
DeactivateScope(scope);
if (scope.Enabled)
DeactivateScope(scope);
if (_scopes.TryRemove(scope.Name, out _))
{
@@ -836,9 +837,9 @@ namespace DnsServerCore.Dhcp
}
}
private void DeleteScopeFile(Scope scope)
private void DeleteScopeFile(string scopeName)
{
string scopeFile = Path.Combine(_configFolder, scope.Name + ".scope");
string scopeFile = Path.Combine(_configFolder, scopeName + ".scope");
try
{
@@ -967,16 +968,19 @@ namespace DnsServerCore.Dhcp
return null;
}
public void RenameScope(string name, string newName)
public void RenameScope(string oldName, string newName)
{
if (!_scopes.TryGetValue(name, out Scope scope))
throw new DhcpServerException("Scope with name '" + name + "' does not exists.");
if (!_scopes.TryGetValue(oldName, out Scope scope))
throw new DhcpServerException("Scope with name '" + oldName + "' does not exists.");
if (!_scopes.TryAdd(newName, scope))
throw new DhcpServerException("Scope with name '" + newName + "' already exists.");
scope.Name = newName;
_scopes.TryRemove(name, out _);
_scopes.TryRemove(oldName, out _);
SaveScopeFile(scope);
DeleteScopeFile(oldName);
}
public void DeleteScope(string name)
@@ -984,7 +988,7 @@ namespace DnsServerCore.Dhcp
if (_scopes.TryGetValue(name, out Scope scope))
{
UnloadScope(scope);
DeleteScopeFile(scope);
DeleteScopeFile(scope.Name);
}
}
@@ -992,7 +996,7 @@ namespace DnsServerCore.Dhcp
{
if (_scopes.TryGetValue(name, out Scope scope))
{
if (ActivateScope(scope))
if (!scope.Enabled && ActivateScope(scope))
{
scope.SetEnabled(true);
SaveScopeFile(scope);
@@ -1008,7 +1012,7 @@ namespace DnsServerCore.Dhcp
{
if (_scopes.TryGetValue(name, out Scope scope))
{
if (DeactivateScope(scope))
if (scope.Enabled && DeactivateScope(scope))
{
scope.SetEnabled(false);
SaveScopeFile(scope);