github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix the problem of using core

pull/2928/head
2dust 2023-01-02 11:02:31 +08:00
parent 1c95c5861c
commit ddd3739ed9
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
v2rayN/v2rayN/Handler/CoreHandler.cs
View File

@ -11,9 +11,9 @@ namespace v2rayN.Handler
/// </summary> /// </summary>
class CoreHandler class CoreHandler
{ {
private static string coreCConfigRes = Global.coreConfigFileName; private static string _coreCConfigRes = Global.coreConfigFileName;
private CoreInfo coreInfo; private CoreInfo _coreInfo;
private int processId = 0; private int _processId = 0;
private Process _process; private Process _process;
Action<bool, string> _updateFunc; Action<bool, string> _updateFunc;
@ -38,7 +38,7 @@ namespace v2rayN.Handler
ShowMsg(false, ResUI.CheckServerSettings); ShowMsg(false, ResUI.CheckServerSettings);
return; return;
} }
string fileName = Utils.GetConfigPath(coreCConfigRes); string fileName = Utils.GetConfigPath(_coreCConfigRes);
if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0) if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
{ {
ShowMsg(false, msg); ShowMsg(false, msg);
@ -62,7 +62,7 @@ namespace v2rayN.Handler
}; };
if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0) if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
{ {
processId = CoreStartViaString(configStr); _processId = CoreStartViaString(configStr);
} }
} }
} }
@ -96,17 +96,17 @@ namespace v2rayN.Handler
} }
else else
{ {
if (coreInfo == null || coreInfo.coreExes == null) if (_coreInfo == null || _coreInfo.coreExes == null)
{ {
return; return;
} }
foreach (string vName in coreInfo.coreExes) foreach (string vName in _coreInfo.coreExes)
{ {
Process[] existing = Process.GetProcessesByName(vName); Process[] existing = Process.GetProcessesByName(vName);
foreach (Process p in existing) foreach (Process p in existing)
{ {
string path = p.MainModule.FileName; string path = p.MainModule.FileName;
if (path == $"{Utils.GetBinPath(vName, coreInfo.coreType)}.exe") if (path == $"{Utils.GetBinPath(vName, _coreInfo.coreType)}.exe")
{ {
KillProcess(p); KillProcess(p);
} }
@ -114,10 +114,10 @@ namespace v2rayN.Handler
} }
} }
if (processId > 0) if (_processId > 0)
{ {
CoreStopPid(processId); CoreStopPid(_processId);
processId = 0; _processId = 0;
} }
} }
@ -140,10 +140,10 @@ namespace v2rayN.Handler
} }
} }
private string CoreFindexe(List<string> lstCoreTemp) private string CoreFindexe(CoreInfo coreInfo)
{ {
string fileName = string.Empty; string fileName = string.Empty;
foreach (string name in lstCoreTemp) foreach (string name in coreInfo.coreExes)
{ {
string vName = $"{name}.exe"; string vName = $"{name}.exe";
vName = Utils.GetBinPath(vName, coreInfo.coreType); vName = Utils.GetBinPath(vName, coreInfo.coreType);
@ -155,7 +155,7 @@ namespace v2rayN.Handler
} }
if (Utils.IsNullOrEmpty(fileName)) if (Utils.IsNullOrEmpty(fileName))
{ {
string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", lstCoreTemp.ToArray()), coreInfo.coreUrl); string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
ShowMsg(false, msg); ShowMsg(false, msg);
} }
return fileName; return fileName;
@ -167,7 +167,7 @@ namespace v2rayN.Handler
try try
{ {
string fileName = CoreFindexe(coreInfo.coreExes); string fileName = CoreFindexe(_coreInfo);
if (fileName == "") return; if (fileName == "") return;
Process p = new Process Process p = new Process
@ -175,7 +175,7 @@ namespace v2rayN.Handler
StartInfo = new ProcessStartInfo StartInfo = new ProcessStartInfo
{ {
FileName = fileName, FileName = fileName,
Arguments = coreInfo.arguments, Arguments = _coreInfo.arguments,
WorkingDirectory = Utils.GetConfigPath(), WorkingDirectory = Utils.GetConfigPath(),
UseShellExecute = false, UseShellExecute = false,
RedirectStandardOutput = node.displayLog, RedirectStandardOutput = node.displayLog,
@ -224,7 +224,8 @@ namespace v2rayN.Handler
try try
{ {
string fileName = CoreFindexe(new List<string> { "xray", "wxray", "wv2ray", "v2ray" }); var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray);
string fileName = CoreFindexe(coreInfo);
if (fileName == "") return -1; if (fileName == "") return -1;
Process p = new Process Process p = new Process
@ -305,9 +306,9 @@ namespace v2rayN.Handler
} }
var coreType = LazyConfig.Instance.GetCoreType(node, node.configType); var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
coreInfo = LazyConfig.Instance.GetCoreInfo(coreType); _coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
if (coreInfo == null) if (_coreInfo == null)
{ {
return -1; return -1;
} }

8
v2rayN/v2rayN/Mode/Config.cs
View File

@ -45,6 +45,8 @@
get; set; get; set;
} }
public bool autoRun { get; set; }
/// <summary> /// <summary>
/// 启用实时网速和流量统计 /// 启用实时网速和流量统计
/// </summary> /// </summary>
@ -124,9 +126,9 @@
} }
public string systemProxyAdvancedProtocol { get; set; } public string systemProxyAdvancedProtocol { get; set; }
public int autoUpdateInterval { get; set; } = 0; public int autoUpdateInterval { get; set; } = 10;
public int autoUpdateSubInterval { get; set; } = 0; public int autoUpdateSubInterval { get; set; } = 10;
public bool checkPreReleaseUpdate { get; set; } = false; public bool checkPreReleaseUpdate { get; set; } = false;
@ -135,7 +137,7 @@
get; set; get; set;
} }
public int trayMenuServersLimit { get; set; } public int trayMenuServersLimit { get; set; } = 20;
public bool autoHideStartup { get; set; } public bool autoHideStartup { get; set; }