Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-19 13:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactors DNS address parsing

Browse source
This commit is contained in:
DHR60 2025-04-11 20:55:15 +08:00
parent 2365012670
commit 9d95143d85
1 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
View file

@ -1453,45 +1453,50 @@ public class CoreConfigSingboxService
var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress; var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
string? localDnsType = null; string? localDnsType = null;
string? dhcpDnsInterface = null; string? dhcpDnsInterface = null;
var dnsProtocols = new List<string>
{
"dhcp",
"https",
"tcp",
"tls",
"quic",
"h3",
"udp"
};
if (localDnsAddress == "local") if (localDnsAddress == "local")
{ {
localDnsType = "local"; localDnsType = "local";
localDnsAddress = null; localDnsAddress = null;
} }
else if (localDnsAddress.StartsWith("dhcp") && localDnsAddress.Length > 7) else if (dnsProtocols.Any(protocol => localDnsAddress.StartsWith(protocol)))
{ {
localDnsType = "dhcp"; var protocol = dnsProtocols.First(p => localDnsAddress.StartsWith(p));
// dhcp:// localDnsType = protocol;
dhcpDnsInterface = localDnsAddress.Substring(7); // +3 for "://"
if (localDnsAddress.Length > protocol.Length + 3)
{
localDnsAddress = localDnsAddress.Substring(protocol.Length + 3);
if (protocol == "dhcp")
{
dhcpDnsInterface = localDnsAddress;
if (dhcpDnsInterface == "auto") if (dhcpDnsInterface == "auto")
{ {
dhcpDnsInterface = null; dhcpDnsInterface = null;
} }
localDnsAddress = null; localDnsAddress = null;
} }
else if (localDnsAddress.StartsWith("tcp") && localDnsAddress.Length > 6) else if (protocol is "https" or "h3")
{ {
localDnsType = "tcp"; if (localDnsAddress.Contains('/'))
// tcp:// {
localDnsAddress = localDnsAddress.Substring(6); localDnsAddress = localDnsAddress.Substring(0, localDnsAddress.IndexOf('/'));
} }
else if (localDnsAddress.StartsWith("tls") && localDnsAddress.Length > 6)
{
localDnsType = "tls";
// tls://
localDnsAddress = localDnsAddress.Substring(6);
} }
else if (localDnsAddress.StartsWith("https") && localDnsAddress.Length > 8)
{
localDnsType = "https";
// https://
localDnsAddress = localDnsAddress.Substring(8);
} }
else if (localDnsAddress.StartsWith("quic") && localDnsAddress.Length > 7) else
{ {
localDnsType = "quic"; localDnsAddress = null;
// quic:// }
localDnsAddress = localDnsAddress.Substring(7);
} }
else else
{ {