fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-03-18 03:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

forwarder config serialization implemented to support DoH Uri.

Browse Source
This commit is contained in:
Shreyas Zare
2018-06-17 23:20:28 +05:30
parent ce6f9e22fe
commit a83545442a
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DnsServerCore/DnsServer.cs
View File

@@ -97,6 +97,8 @@ namespace DnsServerCore
minWorker = Environment.ProcessorCount * 32;
ThreadPool.SetMinThreads(minWorker, minIOC);
}
ServicePointManager.DefaultConnectionLimit = 100; //concurrent http request limit required when using DNS-over-HTTPS
}
#endregion

45
DnsServerCore/DnsWebService.cs
View File

@@ -717,7 +717,7 @@ namespace DnsServerCore
jsonWriter.WriteStartArray();
foreach (NameServerAddress forwarder in _dnsServer.Forwarders)
jsonWriter.WriteValue(forwarder.EndPoint.ToString());
jsonWriter.WriteValue(forwarder.ToString());
jsonWriter.WriteEndArray();
}
@@ -787,18 +787,25 @@ namespace DnsServerCore
for (int i = 0; i < strForwardersList.Length; i++)
{
string[] strParts = strForwardersList[i].Split(':');
string host = strParts[0];
int port = 53;
if (strParts.Length > 1)
port = int.Parse(strParts[1]);
if (IPAddress.TryParse(host, out IPAddress ipAddress))
forwarders[i] = new NameServerAddress(new IPEndPoint(ipAddress, port));
if (strForwardersList[i].StartsWith("https://", StringComparison.CurrentCultureIgnoreCase) || strForwardersList[i].StartsWith("http://", StringComparison.CurrentCultureIgnoreCase))
{
forwarders[i] = new NameServerAddress(new Uri(strForwardersList[i]));
}
else
forwarders[i] = new NameServerAddress(new DomainEndPoint(host, port));
{
string[] strParts = strForwardersList[i].Split(':');
string host = strParts[0];
int port = 53;
if (strParts.Length > 1)
port = int.Parse(strParts[1]);
if (IPAddress.TryParse(host, out IPAddress ipAddress))
forwarders[i] = new NameServerAddress(new IPEndPoint(ipAddress, port));
else
forwarders[i] = new NameServerAddress(new DomainEndPoint(host, port));
}
}
_dnsServer.Forwarders = forwarders;
@@ -1452,7 +1459,11 @@ namespace DnsServerCore
int port = 53;
{
if (server.StartsWith("["))
if (server.StartsWith("https://", StringComparison.CurrentCultureIgnoreCase) || server.StartsWith("http://", StringComparison.CurrentCultureIgnoreCase))
{
//do nothing
}
else if (server.StartsWith("["))
{
//ipv6
if (server.EndsWith("]"))
@@ -1520,6 +1531,10 @@ namespace DnsServerCore
nameServers = new NameServerAddress[] { new NameServerAddress(_serverDomain, IPAddress.Parse("127.0.0.1")) };
proxy = null; //no proxy required for this server
}
else if (server.StartsWith("https://", StringComparison.CurrentCultureIgnoreCase) || server.StartsWith("http://", StringComparison.CurrentCultureIgnoreCase))
{
nameServers = new NameServerAddress[] { new NameServerAddress(new Uri(server)) };
}
else if (IPAddress.TryParse(server, out IPAddress serverIP))
{
string serverDomain = null;
@@ -1865,7 +1880,7 @@ namespace DnsServerCore
NameServerAddress[] forwarders = new NameServerAddress[count];
for (int i = 0; i < count; i++)
forwarders[i] = new NameServerAddress(EndPointExtension.Parse(bR));
forwarders[i] = new NameServerAddress(bR);
_dnsServer.Forwarders = forwarders;
}
@@ -2036,7 +2051,7 @@ namespace DnsServerCore
bW.Write(Convert.ToByte(_dnsServer.Forwarders.Length));
foreach (NameServerAddress forwarder in _dnsServer.Forwarders)
forwarder.EndPoint.WriteTo(bW);
forwarder.WriteTo(bW);
}
bW.Write((byte)_dnsServer.ForwarderProtocol);