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

Fix

Browse source
This commit is contained in:
DHR60 2026-02-23 21:16:18 +08:00
parent 69d027840e
commit 1121e4fed5
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxConfigTemplateService.cs
View file

@ -23,7 +23,7 @@ public partial class CoreConfigSingboxService
} }
// Process outbounds // Process outbounds
var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : new JsonArray(); var customOutboundsNode = fullConfigTemplateNode["outbounds"] is JsonArray outbounds ? outbounds : [];
foreach (var outbound in _coreConfig.outbounds) foreach (var outbound in _coreConfig.outbounds)
{ {
if (outbound.type.ToLower() is "direct" or "block") if (outbound.type.ToLower() is "direct" or "block")
@ -44,7 +44,7 @@ public partial class CoreConfigSingboxService
// Process endpoints // Process endpoints
if (_coreConfig.endpoints != null && _coreConfig.endpoints.Count > 0) if (_coreConfig.endpoints != null && _coreConfig.endpoints.Count > 0)
{ {
var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : new JsonArray(); var customEndpointsNode = fullConfigTemplateNode["endpoints"] is JsonArray endpoints ? endpoints : [];
foreach (var endpoint in _coreConfig.endpoints) foreach (var endpoint in _coreConfig.endpoints)
{ {
if (endpoint.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) if (endpoint.detour.IsNullOrEmpty() && !fullConfigTemplate.ProxyDetour.IsNullOrEmpty())

22
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayConfigTemplateService.cs
View file

@ -19,18 +19,22 @@ public partial class CoreConfigV2rayService
// Handle balancer and rules modifications (for multiple load scenarios) // Handle balancer and rules modifications (for multiple load scenarios)
if (_coreConfig.routing?.balancers?.Count > 0) if (_coreConfig.routing?.balancers?.Count > 0)
{ {
var balancer = _coreConfig.routing.balancers.First(); var balancer =
_coreConfig.routing.balancers.FirstOrDefault(b => b.tag == Global.ProxyTag + Global.BalancerTagSuffix, null);
// Modify existing rules in custom config // Modify existing rules in custom config
var rulesNode = fullConfigTemplateNode["routing"]?["rules"]; if (balancer != null)
if (rulesNode != null)
{ {
foreach (var rule in rulesNode.AsArray()) var rulesNode = fullConfigTemplateNode["routing"]?["rules"];
if (rulesNode != null)
{ {
if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag) foreach (var rule in rulesNode.AsArray())
{ {
rule.AsObject().Remove("outboundTag"); if (rule["outboundTag"]?.GetValue<string>() == Global.ProxyTag)
rule["balancerTag"] = balancer.tag; {
rule.AsObject().Remove("outboundTag");
rule["balancerTag"] = balancer.tag;
}
} }
} }
} }
@ -97,8 +101,8 @@ public partial class CoreConfigV2rayService
continue; continue;
} }
} }
else if ((!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()) else if (!fullConfigTemplate.ProxyDetour.IsNullOrEmpty()
&& ((outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() ?? true) == true)) && (outbound.streamSettings?.sockopt?.dialerProxy.IsNullOrEmpty() ?? true))
{ {
var outboundAddress = outbound.settings?.servers?.FirstOrDefault()?.address var outboundAddress = outbound.settings?.servers?.FirstOrDefault()?.address
?? outbound.settings?.vnext?.FirstOrDefault()?.address ?? outbound.settings?.vnext?.FirstOrDefault()?.address

4
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
View file

@ -39,9 +39,9 @@ public partial class CoreConfigV2rayService
.ToList() ?? []; .ToList() ?? [];
if (balancerTagList.Count > 0) if (balancerTagList.Count > 0)
{ {
foreach (var rulesItem in _coreConfig.routing.rules.Where(r => balancerTagList.Contains(r.outboundTag))) foreach (var rulesItem in _coreConfig.routing.rules.Where(r => balancerTagList.Contains(r.outboundTag + Global.BalancerTagSuffix)))
{ {
rulesItem.balancerTag = rulesItem.outboundTag; rulesItem.balancerTag = rulesItem.outboundTag + Global.BalancerTagSuffix;
rulesItem.outboundTag = null; rulesItem.outboundTag = null;
} }
} }