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

code refactoring changes.

Browse Source
This commit is contained in:
Shreyas Zare
2023-02-05 16:26:18 +05:30
parent 7f2e2c2720
commit 50cf6fdf2e
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DnsServerCore/Auth/User.cs
View File

@@ -92,9 +92,9 @@ namespace DnsServerCore.Auth
_sessionTimeoutSeconds = bR.ReadInt32();
_previousSessionLoggedOn = bR.ReadDateTime();
_previousSessionRemoteAddress = IPAddressExtension.ReadFrom(bR);
_previousSessionRemoteAddress = IPAddressExtensions.ReadFrom(bR);
_recentSessionLoggedOn = bR.ReadDateTime();
_recentSessionRemoteAddress = IPAddressExtension.ReadFrom(bR);
_recentSessionRemoteAddress = IPAddressExtensions.ReadFrom(bR);
{
int count = bR.ReadByte();
@@ -223,9 +223,9 @@ namespace DnsServerCore.Auth
bW.Write(_sessionTimeoutSeconds);
bW.Write(_previousSessionLoggedOn);
IPAddressExtension.WriteTo(_previousSessionRemoteAddress, bW);
IPAddressExtensions.WriteTo(_previousSessionRemoteAddress, bW);
bW.Write(_recentSessionLoggedOn);
IPAddressExtension.WriteTo(_recentSessionRemoteAddress, bW);
IPAddressExtensions.WriteTo(_recentSessionRemoteAddress, bW);
bW.Write(Convert.ToByte(_memberOfGroups.Count));

2
DnsServerCore/Auth/UserSession.cs
View File

@@ -88,7 +88,7 @@ namespace DnsServerCore.Auth
_user = authManager.GetUser(bR.ReadShortString());
_lastSeen = bR.ReadDateTime();
_lastSeenRemoteAddress = IPAddressExtension.ReadFrom(bR);
_lastSeenRemoteAddress = IPAddressExtensions.ReadFrom(bR);
_lastSeenUserAgent = bR.ReadShortString();
if (_lastSeenUserAgent.Length == 0)

4
DnsServerCore/Dhcp/Lease.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2022 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2023 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
@@ -88,7 +88,7 @@ namespace DnsServerCore.Dhcp
_hostName = null;
_hardwareAddress = bR.ReadBuffer();
_address = IPAddressExtension.ReadFrom(bR);
_address = IPAddressExtensions.ReadFrom(bR);
if (version >= 2)
{

4
DnsServerCore/Dhcp/Options/ClasslessStaticRouteOption.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2021 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2023 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
@@ -109,7 +109,7 @@ namespace DnsServerCore.Dhcp.Options
s.ReadBytes(destinationBuffer, 0, Convert.ToInt32(Math.Ceiling(Convert.ToDecimal(subnetMaskWidth) / 8)));
_destination = new IPAddress(destinationBuffer);
_subnetMask = IPAddressExtension.GetSubnetMask(subnetMaskWidth);
_subnetMask = IPAddressExtensions.GetSubnetMask(subnetMaskWidth);
_router = new IPAddress(s.ReadBytes(4));
}

30
DnsServerCore/Dhcp/Scope.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2022 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2023 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
@@ -136,7 +136,7 @@ namespace DnsServerCore.Dhcp
_name = bR.ReadShortString();
_enabled = bR.ReadBoolean();
ChangeNetwork(IPAddressExtension.ReadFrom(bR), IPAddressExtension.ReadFrom(bR), IPAddressExtension.ReadFrom(bR));
ChangeNetwork(IPAddressExtensions.ReadFrom(bR), IPAddressExtensions.ReadFrom(bR), IPAddressExtensions.ReadFrom(bR));
_leaseTimeDays = bR.ReadUInt16();
_leaseTimeHours = bR.ReadByte();
@@ -175,7 +175,7 @@ namespace DnsServerCore.Dhcp
if (version >= 2)
{
_serverAddress = IPAddressExtension.ReadFrom(bR);
_serverAddress = IPAddressExtensions.ReadFrom(bR);
if (_serverAddress.Equals(IPAddress.Any))
_serverAddress = null;
}
@@ -191,7 +191,7 @@ namespace DnsServerCore.Dhcp
_bootFileName = null;
}
_routerAddress = IPAddressExtension.ReadFrom(bR);
_routerAddress = IPAddressExtensions.ReadFrom(bR);
if (_routerAddress.Equals(IPAddress.Any))
_routerAddress = null;
@@ -209,7 +209,7 @@ namespace DnsServerCore.Dhcp
IPAddress[] dnsServers = new IPAddress[count];
for (int i = 0; i < count; i++)
dnsServers[i] = IPAddressExtension.ReadFrom(bR);
dnsServers[i] = IPAddressExtensions.ReadFrom(bR);
_dnsServers = dnsServers;
}
@@ -223,7 +223,7 @@ namespace DnsServerCore.Dhcp
IPAddress[] winsServers = new IPAddress[count];
for (int i = 0; i < count; i++)
winsServers[i] = IPAddressExtension.ReadFrom(bR);
winsServers[i] = IPAddressExtensions.ReadFrom(bR);
_winsServers = winsServers;
}
@@ -236,7 +236,7 @@ namespace DnsServerCore.Dhcp
IPAddress[] ntpServers = new IPAddress[count];
for (int i = 0; i < count; i++)
ntpServers[i] = IPAddressExtension.ReadFrom(bR);
ntpServers[i] = IPAddressExtensions.ReadFrom(bR);
_ntpServers = ntpServers;
}
@@ -296,7 +296,7 @@ namespace DnsServerCore.Dhcp
IPAddress[] capwapAcIpAddresses = new IPAddress[count];
for (int i = 0; i < count; i++)
capwapAcIpAddresses[i] = IPAddressExtension.ReadFrom(bR);
capwapAcIpAddresses[i] = IPAddressExtensions.ReadFrom(bR);
_capwapAcIpAddresses = capwapAcIpAddresses;
}
@@ -310,7 +310,7 @@ namespace DnsServerCore.Dhcp
IPAddress[] tftpServerAddreses = new IPAddress[count];
for (int i = 0; i < count; i++)
tftpServerAddreses[i] = IPAddressExtension.ReadFrom(bR);
tftpServerAddreses[i] = IPAddressExtensions.ReadFrom(bR);
_tftpServerAddreses = tftpServerAddreses;
}
@@ -343,7 +343,7 @@ namespace DnsServerCore.Dhcp
Exclusion[] exclusions = new Exclusion[count];
for (int i = 0; i < count; i++)
exclusions[i] = new Exclusion(IPAddressExtension.ReadFrom(bR), IPAddressExtension.ReadFrom(bR));
exclusions[i] = new Exclusion(IPAddressExtensions.ReadFrom(bR), IPAddressExtensions.ReadFrom(bR));
_exclusions = exclusions;
}
@@ -992,12 +992,12 @@ namespace DnsServerCore.Dhcp
return null;
}
offerAddress = IPAddressExtension.ConvertNumberToIp(_startingAddress.ConvertIpToNumber() - 1u);
offerAddress = IPAddressExtensions.ConvertNumberToIp(_startingAddress.ConvertIpToNumber() - 1u);
offerAddressWasResetFromEnd = true;
continue;
}
offerAddress = IPAddressExtension.ConvertNumberToIp(nextOfferAddressNumber);
offerAddress = IPAddressExtensions.ConvertNumberToIp(nextOfferAddressNumber);
AddressStatus addressStatus = await IsAddressAvailableAsync(offerAddress);
if (addressStatus.IsAddressAvailable)
@@ -1372,13 +1372,13 @@ namespace DnsServerCore.Dhcp
if (broadcastAddressNumber == endingAddressNumber)
throw new ArgumentException("Ending address cannot be same as the broadcast address.");
_networkAddress = IPAddressExtension.ConvertNumberToIp(networkAddressNumber);
_broadcastAddress = IPAddressExtension.ConvertNumberToIp(broadcastAddressNumber);
_networkAddress = IPAddressExtensions.ConvertNumberToIp(networkAddressNumber);
_broadcastAddress = IPAddressExtensions.ConvertNumberToIp(broadcastAddressNumber);
_lastAddressOfferedLock.Wait();
try
{
_lastAddressOffered = IPAddressExtension.ConvertNumberToIp(startingAddressNumber - 1u);
_lastAddressOffered = IPAddressExtensions.ConvertNumberToIp(startingAddressNumber - 1u);
}
finally
{

10
DnsServerCore/Dns/StatsManager.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2022 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2023 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
@@ -1388,7 +1388,7 @@ namespace DnsServerCore.Dns
_clientIpAddresses = new ConcurrentDictionary<IPAddress, Counter>(1, count);
for (int i = 0; i < count; i++)
_clientIpAddresses.TryAdd(IPAddressExtension.ReadFrom(bR), new Counter(bR.ReadInt32()));
_clientIpAddresses.TryAdd(IPAddressExtensions.ReadFrom(bR), new Counter(bR.ReadInt32()));
if (version < 6)
_totalClients = count;
@@ -1413,7 +1413,7 @@ namespace DnsServerCore.Dns
_errorIpAddresses = new ConcurrentDictionary<IPAddress, Counter>(1, count);
for (int i = 0; i < count; i++)
_errorIpAddresses.TryAdd(IPAddressExtension.ReadFrom(bR), new Counter(bR.ReadInt32()));
_errorIpAddresses.TryAdd(IPAddressExtensions.ReadFrom(bR), new Counter(bR.ReadInt32()));
}
else
{
@@ -1465,7 +1465,7 @@ namespace DnsServerCore.Dns
_clientIpAddresses = new ConcurrentDictionary<IPAddress, Counter>(1, count);
for (int i = 0; i < count; i++)
_clientIpAddresses.TryAdd(IPAddressExtension.ReadFrom(bR), new Counter(bR.ReadInt64()));
_clientIpAddresses.TryAdd(IPAddressExtensions.ReadFrom(bR), new Counter(bR.ReadInt64()));
}
{
@@ -1481,7 +1481,7 @@ namespace DnsServerCore.Dns
_errorIpAddresses = new ConcurrentDictionary<IPAddress, Counter>(1, count);
for (int i = 0; i < count; i++)
_errorIpAddresses.TryAdd(IPAddressExtension.ReadFrom(bR), new Counter(bR.ReadInt64()));
_errorIpAddresses.TryAdd(IPAddressExtensions.ReadFrom(bR), new Counter(bR.ReadInt64()));
}
break;

6
DnsServerCore/Dns/Zones/AuthZoneInfo.cs
View File

@@ -117,7 +117,7 @@ namespace DnsServerCore.Dns.Zones
IPAddress[] nameServers = new IPAddress[count];
for (int i = 0; i < count; i++)
nameServers[i] = IPAddressExtension.ReadFrom(bR);
nameServers[i] = IPAddressExtensions.ReadFrom(bR);
_zoneTransferNameServers = nameServers;
}
@@ -132,7 +132,7 @@ namespace DnsServerCore.Dns.Zones
IPAddress[] nameServers = new IPAddress[count];
for (int i = 0; i < count; i++)
nameServers[i] = IPAddressExtension.ReadFrom(bR);
nameServers[i] = IPAddressExtensions.ReadFrom(bR);
_notifyNameServers = nameServers;
}
@@ -148,7 +148,7 @@ namespace DnsServerCore.Dns.Zones
IPAddress[] ipAddresses = new IPAddress[count];
for (int i = 0; i < count; i++)
ipAddresses[i] = IPAddressExtension.ReadFrom(bR);
ipAddresses[i] = IPAddressExtensions.ReadFrom(bR);
_updateIpAddresses = ipAddresses;
}