diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs index 54a0108a..29223c54 100644 --- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs +++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs @@ -1816,9 +1816,9 @@ public static class ConfigHandler ProfileItem? activeProfile = null; if (isSub && subid.IsNotEmpty()) { - await RemoveServersViaSubid(config, subid, true); lstOriSub = await AppManager.Instance.ProfileItems(subid); activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId); + await RemoveServersViaSubid(config, subid, true); } var counter = 0; diff --git a/v2rayN/ServiceLib/Handler/Fmt/InnerFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/InnerFmt.cs index 16420e74..c9ad5844 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/InnerFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/InnerFmt.cs @@ -230,6 +230,9 @@ public class InnerFmt jsonObj["TransportExtraObj"] = transportExtraObj; jsonObj.Remove("TransportExtra"); } + // remove subid and isSub + jsonObj.Remove("Subid"); + jsonObj.Remove("IsSub"); // Remove empty properties to reduce the length of the exported string RemoveEmptyJson(jsonObj); var jsonStr = JsonUtils.Serialize(jsonObj, false); diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs index 7aba3abe..cab76bb5 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs +++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs @@ -3718,7 +3718,7 @@ namespace ServiceLib.Resx { } /// - /// 查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode 的本地化字符串。 + /// 查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode 的本地化字符串。 /// public static string TbSettingsBindInterfaceTip { get { diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx index 21a6c7f1..9ac5aaa8 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx @@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if Bind Interface - For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode + For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode PreSharedKey diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx index d73a170c..ab481d0e 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx @@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if Bind Interface - For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode + For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode PreSharedKey diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx index 13883be4..b80c4e56 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.resx @@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if Bind Interface - For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode + For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode PreSharedKey diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx index e8617160..4b8e0351 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx @@ -1720,7 +1720,7 @@ 绑定网口 - 用于多网口环境,填写要绑定的网口名称,仅生效于 Windows 系统和 TUN 模式 + 用于多网口环境,填写要绑定的网口名称,仅生效于 Windows 系统或 TUN 模式 PreSharedKey diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx index 61f231b1..1a8d6675 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx @@ -1720,7 +1720,7 @@ 綁定網路介面 - 適用於多網路介面環境,請填寫要綁定的介面名稱;Windows 系統有效,其他系統僅在 TUN 模式下生效。 + 適用於多網路介面環境,請填寫要綁定的介面名稱;Windows 系統有效,其他系統僅在 TUN 模式下生效 PreSharedKey @@ -1728,4 +1728,4 @@ 匯出 v2rayN 內部分享連結至剪貼簿(多選) - + \ No newline at end of file diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs index 91c8c133..239c68ad 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayInboundService.cs @@ -10,9 +10,9 @@ public partial class CoreConfigV2rayService var listenPort = AppManager.Instance.GetLocalPort(EInboundProtocol.socks); _coreConfig.inbounds = []; var inbound = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks, true); + var isUsingLocalMixedPort = _node.Address == Global.Loopback && _node.Port == listenPort; - if (!context.IsTunEnabled - || (context.IsTunEnabled && _node.Address != Global.Loopback && _node.Port != listenPort)) + if (!context.IsTunEnabled || !isUsingLocalMixedPort) { _coreConfig.inbounds.Add(inbound);