Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-29 22:36:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat: fix error when testing shadowsocks with other sign_box core types

Browse source
This commit is contained in:
Avestura 2024-01-22 00:32:36 +03:30
parent d76679c2b6
commit 8b5f34d787
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
v2rayN/v2rayN/Handler/CoreHandler.cs
View file

@ -67,19 +67,33 @@ namespace v2rayN.Handler
} }
} }
public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds) private ECoreType PickCoreTypeBasedOnSelecteds(List<ServerTestItem> selecteds)
{
return selecteds.Exists(x => x.configType == EConfigType.Shadowsocks) ? ECoreType.Xray :
selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box :
ECoreType.Xray;
}
public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds, ECoreType? coreType = null)
{ {
int pid = -1; int pid = -1;
var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray; var coreTypeToPick = coreType ?? PickCoreTypeBasedOnSelecteds(selecteds);
string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName); string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0) if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreTypeToPick, out string msg) != 0)
{ {
ShowMsg(false, msg); ShowMsg(false, msg);
} }
else else
{ {
ShowMsg(false, msg); ShowMsg(false, msg);
pid = CoreStartSpeedtest(configPath, coreType); pid = CoreStartSpeedtest(configPath, coreTypeToPick);
var shouldTestAlternativeCoreType = pid == -1 && !coreType.HasValue;
if(shouldTestAlternativeCoreType)
{
var alternatecoreType = coreTypeToPick == ECoreType.Xray ? ECoreType.sing_box : ECoreType.Xray;
pid = LoadCoreConfigSpeedtest(selecteds, alternatecoreType);
}
} }
return pid; return pid;
} }