voronin9032/v2rayN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Speedtest bug

Browse Source
This commit is contained in:
2dust
2024-09-17 18:41:01 +08:00
parent a7f3a7b1a7
commit cb1f936d05
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigSingbox.cs
View File

@@ -132,10 +132,10 @@ namespace ServiceLib.Handler.CoreConfig
{
continue;
}
var item = LazyConfig.Instance.GetProfileItem(it.indexId);
if (it.configType is EConfigType.VMess or EConfigType.VLESS)
{
var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
if (item is null || Utils.IsNullOrEmpty(item.id) || !Utils.IsGuidByParse(item.id))
{
continue;
}
@@ -178,7 +178,6 @@ namespace ServiceLib.Handler.CoreConfig
singboxConfig.inbounds.Add(inbound);
//outbound
var item = LazyConfig.Instance.GetProfileItem(it.indexId);
if (item is null)
{
continue;
@@ -193,6 +192,12 @@ namespace ServiceLib.Handler.CoreConfig
{
continue;
}
if ((it.configType is EConfigType.VLESS or EConfigType.Trojan)
&& item.streamSecurity == Global.StreamSecurityReality
&& item.publicKey.IsNullOrEmpty())
{
continue;
}
var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
GenOutbound(item, outbound);

11
v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigV2ray.cs
View File

@@ -248,10 +248,10 @@ namespace ServiceLib.Handler.CoreConfig
{
continue;
}
var item = LazyConfig.Instance.GetProfileItem(it.indexId);
if (it.configType is EConfigType.VMess or EConfigType.VLESS)
{
var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
if (item is null || Utils.IsNullOrEmpty(item.id) || !Utils.IsGuidByParse(item.id))
{
continue;
}
@@ -294,7 +294,6 @@ namespace ServiceLib.Handler.CoreConfig
v2rayConfig.inbounds.Add(inbound);
//outbound
var item = LazyConfig.Instance.GetProfileItem(it.indexId);
if (item is null)
{
continue;
@@ -309,6 +308,12 @@ namespace ServiceLib.Handler.CoreConfig
{
continue;
}
if ((it.configType is EConfigType.VLESS or EConfigType.Trojan)
&& item.streamSecurity == Global.StreamSecurityReality
&& item.publicKey.IsNullOrEmpty())
{
continue;
}
var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
GenOutbound(item, outbound);