Skip to content

Commit 661affd

Browse files
authored
Tag add remark (2dust#8980)
1 parent 14c5b92 commit 661affd

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ private List<BaseServer4Sbox> BuildOutboundsList(string baseTagName = Global.Pro
571571
for (var i = 0; i < nodes.Count; i++)
572572
{
573573
var node = nodes[i];
574-
var currentTag = $"{baseTagName}-{i + 1}";
574+
var currentTag = $"{baseTagName}-{i + 1}-{node.Remarks}";
575575

576576
if (nodes.Count == 1)
577577
{
@@ -607,8 +607,8 @@ private List<BaseServer4Sbox> BuildChainOutboundsList(string baseTagName = Globa
607607
for (var i = 0; i < nodesReverse.Count; i++)
608608
{
609609
var node = nodesReverse[i];
610-
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}";
611-
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}" : null;
610+
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}-{node.Remarks}";
611+
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}-{node.Remarks}" : null;
612612
if (node.ConfigType.IsGroupType())
613613
{
614614
var childProfiles = new CoreConfigSingboxService(context with { Node = node, }).BuildGroupProxyOutbounds(currentTag);

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ private string GenRoutingUserRuleOutbound(string outboundTag)
494494
return Global.ProxyTag;
495495
}
496496

497-
var tag = $"{node.IndexId}-{Global.ProxyTag}";
497+
var tag = $"{node.IndexId}-{Global.ProxyTag}-{node.Remarks}";
498498
if (_coreConfig.outbounds.Any(o => o.tag.StartsWith(tag))
499499
|| (_coreConfig.endpoints != null && _coreConfig.endpoints.Any(e => e.tag.StartsWith(tag))))
500500
{

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ private List<Outbounds4Ray> BuildOutboundsList(string baseTagName = Global.Proxy
688688
for (var i = 0; i < nodes.Count; i++)
689689
{
690690
var node = nodes[i];
691-
var currentTag = $"{baseTagName}-{i + 1}";
691+
var currentTag = $"{baseTagName}-{i + 1}-{node.Remarks}";
692692

693693
if (nodes.Count == 1)
694694
{
@@ -724,8 +724,8 @@ private List<Outbounds4Ray> BuildChainOutboundsList(string baseTagName = Global.
724724
for (var i = 0; i < nodesReverse.Count; i++)
725725
{
726726
var node = nodesReverse[i];
727-
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}";
728-
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}" : null;
727+
var currentTag = i == 0 ? baseTagName : $"chain-{baseTagName}-{i}-{node.Remarks}";
728+
var dialerProxyTag = i != nodesReverse.Count - 1 ? $"chain-{baseTagName}-{i + 1}-{node.Remarks}" : null;
729729
if (node.ConfigType.IsGroupType())
730730
{
731731
var childProfiles = new CoreConfigV2rayService(context with { Node = node, }).BuildGroupProxyOutbounds(currentTag);

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private string GenRoutingUserRuleOutbound(string outboundTag)
164164
return Global.ProxyTag;
165165
}
166166

167-
var tag = $"{node.IndexId}-{Global.ProxyTag}";
167+
var tag = $"{node.IndexId}-{Global.ProxyTag}-{node.Remarks}";
168168
if (_coreConfig.outbounds.Any(p => p.tag.StartsWith(tag)))
169169
{
170170
return tag;

0 commit comments

Comments
 (0)