Compare commits

..

No commits in common. "2ab1b9068f2fb83492a4e9ef976d0372d3275584" and "5d2aea6b4feb14731577715be4d22d7d673f30ad" have entirely different histories.

2 changed files with 14 additions and 16 deletions

View file

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>7.12.4</Version> <Version>7.12.3</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

View file

@ -1048,30 +1048,28 @@ public class CoreConfigSingboxService
private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe) private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
{ {
var dnsExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase); lstDnsExe = new();
var directExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase); lstDirectExe = new();
var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
var coreInfoResult = CoreInfoHandler.Instance.GetCoreInfo(); foreach (var it in coreInfo)
foreach (var coreConfig in coreInfoResult)
{ {
if (coreConfig.CoreType == ECoreType.v2rayN) if (it.CoreType == ECoreType.v2rayN)
{ {
continue; continue;
} }
foreach (var it2 in it.CoreExes)
foreach (var baseExeName in coreConfig.CoreExes)
{ {
if (coreConfig.CoreType != ECoreType.sing_box) if (!lstDnsExe.Contains(it2) && it.CoreType != ECoreType.sing_box)
{ {
dnsExeSet.Add(Utils.GetExeName(baseExeName)); lstDnsExe.Add($"{it2}.exe");
}
if (!lstDirectExe.Contains(it2))
{
lstDirectExe.Add($"{it2}.exe");
} }
directExeSet.Add(Utils.GetExeName(baseExeName));
} }
} }
lstDnsExe = new List<string>(dnsExeSet);
lstDirectExe = new List<string>(directExeSet);
} }
private async Task<int> GenRoutingUserRule(RulesItem item, List<Rule4Sbox> rules) private async Task<int> GenRoutingUserRule(RulesItem item, List<Rule4Sbox> rules)