Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-01-15 02:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add sing-box ech support

Browse source
This commit is contained in:
DHR60 2026-01-07 15:42:46 +08:00
parent 4562d4cf00
commit 6174e93ad6
4 changed files with 67 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
v2rayN/ServiceLib/Global.cs
View file

@ -88,6 +88,7 @@ public class Global
public const string SingboxLocalDNSTag = "local_local";
public const string SingboxHostsDNSTag = "hosts_dns";
public const string SingboxFakeDNSTag = "fake_dns";
public const string SingboxEchDNSTag = "ech_dns";
public static readonly List<string> IEProxyProtocols =
[

8
v2rayN/ServiceLib/Models/SingboxConfig.cs
View file

@ -182,6 +182,14 @@ public class Tls4Sbox
public string? fragment_fallback_delay { get; set; }
public bool? record_fragment { get; set; }
public List<string>? certificate { get; set; }
public Ech4Sbox? ech { get; set; }
}
public class Ech4Sbox
{
public bool enabled { get; set; }
public List<string>? config { get; set; }
public string? query_server_name { get; set; }
}
public class Multiplex4Sbox

42
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
View file

@ -13,8 +13,8 @@ public partial class CoreConfigSingboxService
}
var simpleDNSItem = _config.SimpleDNSItem;
await GenDnsServers(singboxConfig, simpleDNSItem);
await GenDnsRules(singboxConfig, simpleDNSItem);
await GenDnsServers(node, singboxConfig, simpleDNSItem);
await GenDnsRules(node, singboxConfig, simpleDNSItem);
singboxConfig.dns ??= new Dns4Sbox();
singboxConfig.dns.independent_cache = true;
@ -52,7 +52,7 @@ public partial class CoreConfigSingboxService
return 0;
}
private async Task<int> GenDnsServers(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
private async Task<int> GenDnsServers(ProfileItem? node, SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
{
var finalDns = await GenDnsDomains(singboxConfig, simpleDNSItem);
@ -133,6 +133,27 @@ public partial class CoreConfigSingboxService
singboxConfig.dns.servers.Add(fakeip);
}
// ech
if (node?.StreamSecurity == Global.StreamSecurity
&& node?.EchConfigList?.Contains("://") == true)
{
// example.com+https://1.1.1.1/dns-query
var idx = node.EchConfigList.IndexOf('+');
var echDnsServer = idx > 0 ? node.EchConfigList[(idx + 1)..] : node.EchConfigList;
var echDnsObject = ParseDnsAddress(echDnsServer);
echDnsObject.tag = Global.SingboxEchDNSTag;
if (echDnsObject.server is not null
&& hostsDns.predefined.ContainsKey(echDnsObject.server))
{
echDnsObject.domain_resolver = Global.SingboxHostsDNSTag;
}
else
{
echDnsObject.domain_resolver = Global.SingboxLocalDNSTag;
}
singboxConfig.dns.servers.Add(echDnsObject);
}
return await Task.FromResult(0);
}
@ -146,7 +167,7 @@ public partial class CoreConfigSingboxService
return await Task.FromResult(finalDns);
}
private async Task<int> GenDnsRules(SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
private async Task<int> GenDnsRules(ProfileItem? node, SingboxConfig singboxConfig, SimpleDNSItem simpleDNSItem)
{
singboxConfig.dns ??= new Dns4Sbox();
singboxConfig.dns.rules ??= new List<Rule4Sbox>();
@ -168,6 +189,19 @@ public partial class CoreConfigSingboxService
}
});
if (node?.StreamSecurity == Global.StreamSecurity
&& node?.EchConfigList?.Contains("://") == true)
{
var idx = node.EchConfigList.IndexOf('+');
var queryServerName = idx > 0 ? node.EchConfigList[..idx] : node.Sni;
singboxConfig.dns.rules.Add(new()
{
query_type = new List<int> { 64, 65 },
server = Global.SingboxEchDNSTag,
domain = [queryServerName],
});
}
if (simpleDNSItem.BlockBindingQuery == true)
{
singboxConfig.dns.rules.Add(new()

20
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
View file

@ -334,6 +334,26 @@ public partial class CoreConfigSingboxService
};
tls.insecure = false;
}
if (!node.EchConfigList.IsNullOrEmpty())
{
var ech = new Ech4Sbox()
{
enabled = true,
};
if (node.EchConfigList.Contains("://"))
{
var idx = node.EchConfigList.IndexOf('+');
ech.query_server_name = idx > 0 ? node.EchConfigList[..idx] : null;
}
else
{
ech.config = [$"-----BEGIN ECH CONFIGS-----\n" +
$"{node.EchConfigList}\n" +
$"-----END ECH CONFIGS-----"];
}
tls.ech = ech;
}
outbound.tls = tls;
}
catch (Exception ex)