diff --git a/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayN/v2rayN/Handler/CoreHandler.cs index 6c7e64bd..b6b37c2f 100644 --- a/v2rayN/v2rayN/Handler/CoreHandler.cs +++ b/v2rayN/v2rayN/Handler/CoreHandler.cs @@ -208,18 +208,19 @@ namespace v2rayN.Handler { if ((node.configType == EConfigType.Custom && node.preSocksPort > 0)) { + var preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray; var itemSocks = new ProfileItem() { - coreType = ECoreType.sing_box, + coreType = preCoreType, configType = EConfigType.Socks, address = Global.Loopback, port = node.preSocksPort }; - _config.runningCoreType = ECoreType.sing_box; + _config.runningCoreType = preCoreType; string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName); if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0) { - var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box); + var coreInfo2 = LazyConfig.Instance.GetCoreInfo(preCoreType); var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true); if (proc2 is not null) { diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index 10c8a1de..97b872dd 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -3149,7 +3149,7 @@ namespace v2rayN.Resx { } /// - /// 查找类似 * After setting this value, an socks service will be started using sing-box to provide functions such as speed display 的本地化字符串。 + /// 查找类似 * After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display 的本地化字符串。 /// public static string TipPreSocksPort { get { diff --git a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx index 4f4202d8..b524278e 100644 --- a/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx +++ b/v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx @@ -698,7 +698,7 @@ txtPreSocksPort - * After setting this value, an socks service will be started using sing-box to provide functions such as speed display + * After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display Browse diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 78eeb13f..9dbd1826 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -701,7 +701,7 @@ txtPreSocksPort - * After setting this value, an socks service will be started using sing-box to provide functions such as speed display + * After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display Browse diff --git a/v2rayN/v2rayN/Resx/ResUI.ru.resx b/v2rayN/v2rayN/Resx/ResUI.ru.resx index 1dcfded4..46c3ddba 100644 --- a/v2rayN/v2rayN/Resx/ResUI.ru.resx +++ b/v2rayN/v2rayN/Resx/ResUI.ru.resx @@ -701,7 +701,7 @@ txtPreSocksPort - * После установки этого значения служба socks будет запущена с использованием sing-box для обеспечения таких функций, как отображение скорости + * После установки этого значения служба socks будет запущена с использованием Xray/sing-box(Tun) для обеспечения таких функций, как отображение скорости Просмотр diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index b53aa46f..fa0d4851 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -701,7 +701,7 @@ Socks端口 - * 自定义配置的Socks端口值,可不设置;当设置此值后,将使用sing-box额外启动一个前置Socks服务,提供分流和速度显示等功能 + * 自定义配置的Socks端口值,可不设置;当设置此值后,将使用Xray/sing-box(Tun)额外启动一个前置Socks服务,提供分流和速度显示等功能 浏览 diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx index 6e6ff80e..42981ede 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hant.resx @@ -700,7 +700,7 @@ SOCKS埠 - * 自訂配置的Socks埠值,可不設定;當設定此值後,將使用sing-box額外啟動一個前置Socks服務,提供分流和速度顯示等功能 + * 自訂配置的Socks埠值,可不設定;當設定此值後,將使用Xray/sing-box(Tun)額外啟動一個前置Socks服務,提供分流和速度顯示等功能