Browse Source

Fix Speedtest bug

pull/5720/head
2dust 2 months ago
parent
commit
cb1f936d05
  1. 11
      v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigSingbox.cs
  2. 11
      v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigV2ray.cs

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

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

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

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

Loading…
Cancel
Save