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-25 22:44:31 +08:00
parent a9cd6394d0
commit c76c302e44
3 changed files with 47 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
v2rayN/ServiceLib/Handler/ConfigHandler.cs
View file

@ -1249,6 +1249,47 @@ public static class ConfigHandler
return itemSocks; return itemSocks;
} }
public static CoreConfigContext? GetPreSocksCoreConfigContext(CoreConfigContext nodeContext)
{
var config = nodeContext.AppConfig;
var node = nodeContext.Node;
var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
var preSocksItem = GetPreSocksItem(config, node, coreType);
if (preSocksItem != null)
{
return nodeContext with { Node = preSocksItem, };
}
if ((!nodeContext.IsTunEnabled)
|| coreType != ECoreType.Xray
|| node.ConfigType == EConfigType.Custom)
{
return null;
}
var tunProtectSsPort = Utils.GetFreePort();
var proxyRelaySsPort = Utils.GetFreePort();
var preItem = new ProfileItem()
{
CoreType = ECoreType.sing_box,
ConfigType = EConfigType.Shadowsocks,
Address = Global.Loopback,
Port = proxyRelaySsPort,
Password = Global.None,
};
preItem.SetProtocolExtra(preItem.GetProtocolExtra() with
{
SsMethod = Global.None,
});
var preContext = nodeContext with
{
Node = preItem,
TunProtectSsPort = tunProtectSsPort,
ProxyRelaySsPort = proxyRelaySsPort,
};
return preContext;
}
/// <summary> /// <summary>
/// Remove servers with invalid test results (timeout) /// Remove servers with invalid test results (timeout)
/// Useful for cleaning up subscription lists /// Useful for cleaning up subscription lists

32
v2rayN/ServiceLib/Manager/CoreManager.cs
View file

@ -67,37 +67,13 @@ public class CoreManager
var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName); var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName);
var context = await CoreConfigHandler.BuildCoreConfigContext(_config, node); var context = await CoreConfigHandler.BuildCoreConfigContext(_config, node);
CoreConfigContext? preContext = null; var preContext = ConfigHandler.GetPreSocksCoreConfigContext(context);
if (context.IsTunEnabled) if (preContext is not null)
{ {
var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType); context = context with
if (coreType == ECoreType.Xray && node.ConfigType != EConfigType.Custom)
{ {
var tunProtectSsPort = Utils.GetFreePort(); TunProtectSsPort = preContext.TunProtectSsPort, ProxyRelaySsPort = preContext.ProxyRelaySsPort,
var proxyRelaySsPort = Utils.GetFreePort();
context = context with { TunProtectSsPort = tunProtectSsPort, ProxyRelaySsPort = proxyRelaySsPort, };
var preItem = new ProfileItem()
{
CoreType = ECoreType.sing_box,
ConfigType = EConfigType.Shadowsocks,
Address = Global.Loopback,
Port = proxyRelaySsPort,
Password = Global.None,
}; };
preItem.SetProtocolExtra(preItem.GetProtocolExtra() with
{
SsMethod = Global.None,
});
preContext = context with { Node = preItem, };
}
else
{
var preItem = ConfigHandler.GetPreSocksItem(_config, node, coreType);
if (preItem is not null)
{
preContext = context with { Node = preItem, };
}
}
} }
var result = await CoreConfigHandler.GenerateClientConfig(context, fileName); var result = await CoreConfigHandler.GenerateClientConfig(context, fileName);
if (result.Success != true) if (result.Success != true)

2
v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs
View file

@ -304,7 +304,7 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
var protectNode = new ProfileItem() var protectNode = new ProfileItem()
{ {
CoreType = ECoreType.sing_box, CoreType = ECoreType.Xray,
ConfigType = EConfigType.Shadowsocks, ConfigType = EConfigType.Shadowsocks,
Address = Global.Loopback, Address = Global.Loopback,
Port = context.TunProtectSsPort, Port = context.TunProtectSsPort,