pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-10-15 09:45:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix (#9143)

Browse Source 
* Adjust XHTTP style

* Add xray tun custom support
This commit is contained in:
DHR60
2026-04-18 11:18:17 +00:00
committed by GitHub
parent 021e64e20b
commit eeecef4db9
22 changed files with 211 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs
+8 -2
View File
@@ -5,12 +5,18 @@ public partial class CoreConfigV2rayService
private string ApplyFullConfigTemplate()
{
var fullConfigTemplate = context.FullConfigTemplate;
if (fullConfigTemplate == null || !fullConfigTemplate.Enabled || fullConfigTemplate.Config.IsNullOrEmpty())
if (fullConfigTemplate is not { Enabled: true })
{
return JsonUtils.Serialize(_coreConfig);
}
var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplate.Config);
var fullConfigTemplateItem = context.IsTunEnabled ? fullConfigTemplate.TunConfig : fullConfigTemplate.Config;
if (fullConfigTemplateItem.IsNullOrEmpty())
{
return JsonUtils.Serialize(_coreConfig);
}
var fullConfigTemplateNode = JsonNode.Parse(fullConfigTemplateItem);
if (fullConfigTemplateNode == null)
{
return JsonUtils.Serialize(_coreConfig);
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs
+5 -5
View File
@@ -370,11 +370,11 @@ public partial class CoreConfigV2rayService
try
{
var item = context.RawDnsItem;
var normalDNS = item?.NormalDNS;
var customDNS = context.IsTunEnabled ? item?.TunDNS : item?.NormalDNS;
var domainStrategy4Freedom = item?.DomainStrategy4Freedom;
if (normalDNS.IsNullOrEmpty())
if (customDNS.IsNullOrEmpty())
{
normalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
customDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
}
//Outbound Freedom domainStrategy
@@ -389,11 +389,11 @@ public partial class CoreConfigV2rayService
}
}
var obj = JsonUtils.ParseJson(normalDNS);
var obj = JsonUtils.ParseJson(customDNS);
if (obj is null)
{
List<string> servers = [];
var arrDNS = normalDNS.Split(',');
var arrDNS = customDNS.Split(',');
foreach (var str in arrDNS)
{
servers.Add(str);