fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-22 09:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Shreyas Zare
2024-09-23 19:11:00 +05:30
parent 19a9a66232 44df9d4094
commit 632e2b210d
6 changed files with 107 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -1,5 +1,10 @@
# Technitium DNS Server Change Log
## Version 13.0.1
Release Date: 23 September 2024
- Fixed issue in using proxy with forwarders that caused failure to use DNS-over-TOR with Cloudflare's hidden service.
## Version 13.0
Release Date: 22 September 2024

2
DnsServerApp/DnsServerApp.csproj
View File

@@ -6,7 +6,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ApplicationIcon>logo2.ico</ApplicationIcon>
<Version>13.0</Version>
<Version>13.0.1</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<Company>Technitium</Company>
<Product>Technitium DNS Server</Product>

84
DnsServerCore/Dns/DnsServer.cs
View File

@@ -3315,7 +3315,9 @@ namespace DnsServerCore.Dns
//use forwarders
if (_concurrentForwarding)
{
//recursive resolve forwarder
if (_proxy is null)
{
//recursive resolve forwarders only when proxy is null else let proxy resolve it to allow using .onion or private domains
foreach (NameServerAddress forwarder in _forwarders)
{
if (forwarder.IsIPEndPointStale)
@@ -3323,10 +3325,11 @@ namespace DnsServerCore.Dns
//refresh forwarder IPEndPoint if stale
await TechnitiumLibrary.TaskExtensions.TimeoutAsync(delegate (CancellationToken cancellationToken1)
{
return forwarder.RecursiveResolveIPAddressAsync(dnsCache, _proxy, _preferIPv6, _udpPayloadSize, _randomizeName, _resolverRetries, _resolverTimeout, _resolverConcurrency, _resolverMaxStackCount, cancellationToken1);
return forwarder.RecursiveResolveIPAddressAsync(dnsCache, null, _preferIPv6, _udpPayloadSize, _randomizeName, _resolverRetries, _resolverTimeout, _resolverConcurrency, _resolverMaxStackCount, cancellationToken1);
}, RECURSIVE_RESOLUTION_TIMEOUT, cancellationToken);
}
}
}
//query forwarders and update cache
DnsClient dnsClient = new DnsClient(_forwarders);
@@ -3352,15 +3355,18 @@ namespace DnsServerCore.Dns
foreach (NameServerAddress forwarder in _forwarders)
{
//recursive resolve forwarder
if (_proxy is null)
{
//recursive resolve forwarder only when proxy is null else let proxy resolve it to allow using .onion or private domains
if (forwarder.IsIPEndPointStale)
{
//refresh forwarder IPEndPoint if stale
await TechnitiumLibrary.TaskExtensions.TimeoutAsync(delegate (CancellationToken cancellationToken1)
{
return forwarder.RecursiveResolveIPAddressAsync(dnsCache, _proxy, _preferIPv6, _udpPayloadSize, _randomizeName, _resolverRetries, _resolverTimeout, _resolverConcurrency, _resolverMaxStackCount, cancellationToken1);
return forwarder.RecursiveResolveIPAddressAsync(dnsCache, null, _preferIPv6, _udpPayloadSize, _randomizeName, _resolverRetries, _resolverTimeout, _resolverConcurrency, _resolverMaxStackCount, cancellationToken1);
}, RECURSIVE_RESOLUTION_TIMEOUT, cancellationToken);
}
}
//query forwarder and update cache
DnsClient dnsClient = new DnsClient(forwarder);
@@ -3441,16 +3447,20 @@ namespace DnsServerCore.Dns
if (forwarder.Forwarder.Equals("this-server", StringComparison.OrdinalIgnoreCase))
continue; //skip resolving
//recursive resolve name server
NetProxy proxy = forwarder.GetProxy(_proxy);
if (proxy is null)
{
//recursive resolve forwarder only when proxy is null else let proxy resolve it to allow using .onion or private domains
if (forwarder.NameServer.IsIPEndPointStale)
{
//refresh forwarder IPEndPoint if stale
resolveTasks.Add(TechnitiumLibrary.TaskExtensions.TimeoutAsync(delegate (CancellationToken cancellationToken1)
{
return forwarder.NameServer.RecursiveResolveIPAddressAsync(dnsCache, forwarder.GetProxy(_proxy), _preferIPv6, _udpPayloadSize, _randomizeName, _resolverRetries, _resolverTimeout, _resolverConcurrency, _resolverMaxStackCount, cancellationToken1);
return forwarder.NameServer.RecursiveResolveIPAddressAsync(dnsCache, null, _preferIPv6, _udpPayloadSize, _randomizeName, _resolverRetries, _resolverTimeout, _resolverConcurrency, _resolverMaxStackCount, cancellationToken1);
}, RECURSIVE_RESOLUTION_TIMEOUT));
}
}
}
if (resolveTasks.Count > 0)
await Task.WhenAll(resolveTasks);
@@ -4500,8 +4510,16 @@ namespace DnsServerCore.Dns
private async Task StopDoHAsync()
{
if (_dohWebService is not null)
{
try
{
await _dohWebService.DisposeAsync();
}
catch (Exception ex)
{
_log?.Write(ex);
}
_dohWebService = null;
}
}
@@ -4948,22 +4966,76 @@ namespace DnsServerCore.Dns
}
foreach (Socket udpListener in _udpListeners)
{
try
{
udpListener.Dispose();
}
catch (Exception ex)
{
_log?.Write(ex);
}
}
foreach (Socket udpProxyListener in _udpProxyListeners)
{
try
{
udpProxyListener.Dispose();
}
catch (Exception ex)
{
_log?.Write(ex);
}
}
foreach (Socket tcpListener in _tcpListeners)
{
try
{
tcpListener.Dispose();
}
catch (Exception ex)
{
_log?.Write(ex);
}
}
foreach (Socket tcpProxyListener in _tcpProxyListeners)
{
try
{
tcpProxyListener.Dispose();
}
catch (Exception ex)
{
_log?.Write(ex);
}
}
foreach (Socket tlsListener in _tlsListeners)
{
try
{
tlsListener.Dispose();
}
catch (Exception ex)
{
_log?.Write(ex);
}
}
foreach (QuicListener quicListener in _quicListeners)
{
try
{
await quicListener.DisposeAsync();
}
catch (Exception ex)
{
_log?.Write(ex);
}
}
_udpListeners.Clear();
_udpProxyListeners.Clear();

2
DnsServerCore/DnsServerCore.csproj
View File

@@ -12,7 +12,7 @@
<RepositoryType></RepositoryType>
<Description></Description>
<PackageId>DnsServer</PackageId>
<Version>13.0</Version>
<Version>13.0.1</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
</PropertyGroup>

2
DnsServerWindowsService/DnsServerWindowsService.csproj
View File

@@ -8,7 +8,7 @@
<RootNamespace>DnsServerWindowsService</RootNamespace>
<AssemblyName>DnsService</AssemblyName>
<ApplicationIcon>logo2.ico</ApplicationIcon>
<Version>13.0</Version>
<Version>13.0.1</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<Authors>Shreyas Zare</Authors>
<Company>Technitium</Company>

2
DnsServerWindowsSetup/DnsServerSetup.iss
View File

@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Technitium DNS Server"
#define MyAppVersion "13.0"
#define MyAppVersion "13.0.1"
#define MyAppPublisher "Technitium"
#define MyAppURL "https://technitium.com/dns/"
#define MyAppExeName "DnsServerSystemTrayApp.exe"