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

Fix policy group (#10495)

Browse Source
This commit is contained in:
DHR60
2026-11-02 01:29:45 +00:00
committed by GitHub
parent 0856ffd7d8
commit d4880dbe02
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
+3 -3
View File
@@ -176,13 +176,13 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
var tag = Global.ProxyTag + inbound.port.ToString();
var isBalancer = false;
//outbound
var proxyOutbounds =
new CoreConfigV2rayService(context with { Node = item }).BuildAllProxyOutbounds(tag);
var service = new CoreConfigV2rayService(context with { Node = item });
var proxyOutbounds = service.BuildAllProxyOutbounds(tag);
_coreConfig.outbounds.AddRange(proxyOutbounds);
if (proxyOutbounds.Count(n => n.tag.StartsWith(tag)) > 1)
{
isBalancer = true;
var multipleLoad = _node.GetProtocolExtra().MultipleLoad ?? EMultipleLoad.LeastPing;
var multipleLoad = service.FindFirstPolicyGroupMultipleLoad() ?? EMultipleLoad.LeastPing;
GenObservatory(multipleLoad, tag);
GenBalancer(multipleLoad, tag);
}
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
+29 -1
View File
@@ -8,7 +8,7 @@ public partial class CoreConfigV2rayService
_coreConfig.outbounds.InsertRange(0, proxyOutboundList);
if (proxyOutboundList.Count(n => n.tag.StartsWith(Global.ProxyTag)) > 1)
{
var multipleLoad = _node.GetProtocolExtra().MultipleLoad ?? EMultipleLoad.LeastPing;
var multipleLoad = FindFirstPolicyGroupMultipleLoad() ?? EMultipleLoad.LeastPing;
GenObservatory(multipleLoad);
GenBalancer(multipleLoad);
}
@@ -914,4 +914,32 @@ public partial class CoreConfigV2rayService
}
return clonedOutbounds;
}
private EMultipleLoad? FindFirstPolicyGroupMultipleLoad()
{
if (!_node.ConfigType.IsGroupType())
{
return null;
}
// BFS: the nearest policy group in the group tree decides the multiple load strategy.
var queue = new Queue<ProfileItem>([_node]);
while (queue.Count > 0)
{
var node = queue.Dequeue();
if (node.ConfigType == EConfigType.PolicyGroup)
{
return node.GetProtocolExtra().MultipleLoad;
}
foreach (var childId in Utils.String2List(node.GetProtocolExtra().ChildItems) ?? [])
{
if (context.AllProxiesMap.TryGetValue(childId, out var childNode)
&& childNode.ConfigType.IsGroupType())
{
queue.Enqueue(childNode);
}
}
}
return null;
}
}
v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs
+3 -2
View File
@@ -200,11 +200,12 @@ public partial class CoreConfigV2rayService
return tag;
}
var proxyOutbounds = new CoreConfigV2rayService(context with { Node = node, }).BuildAllProxyOutbounds(tag);
var service = new CoreConfigV2rayService(context with { Node = node, });
var proxyOutbounds = service.BuildAllProxyOutbounds(tag);
_coreConfig.outbounds.AddRange(proxyOutbounds);
if (proxyOutbounds.Count(n => n.tag.StartsWith(tag)) > 1)
{
var multipleLoad = node.GetProtocolExtra().MultipleLoad ?? EMultipleLoad.LeastPing;
var multipleLoad = service.FindFirstPolicyGroupMultipleLoad() ?? EMultipleLoad.LeastPing;
GenObservatory(multipleLoad, tag);
GenBalancer(multipleLoad, tag);
}