github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 19:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed crash together with a kernel crash

Browse Source
This commit is contained in:
Qv2ray-dev 2020-07-08 15:41:41 +08:00
parent 0af5b8666f
commit f89ed8ff2d
No known key found for this signature in database
GPG Key ID: E7FAEFAFCD031D4B
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5735 5736

15
src/core/handler/KernelInstanceHandler.cpp
View File

@ -119,7 +119,7 @@ namespace Qv2ray::core::handler
// //
QMap<QvPluginKernel::KernelSetting, QVariant> _inboundSettings; QMap<QvPluginKernel::KernelSetting, QVariant> _inboundSettings;
LOG(MODULE_VCORE, "V2rayIntegration: " + QSTRN(pluginPort) + "=" + outProtocol) LOG(MODULE_VCORE, "V2rayIntegration: " + QSTRN(pluginPort) + " = " + outProtocol)
_inboundSettings[_k::KERNEL_HTTP_ENABLED] = false; _inboundSettings[_k::KERNEL_HTTP_ENABLED] = false;
_inboundSettings[_k::KERNEL_SOCKS_ENABLED] = true; _inboundSettings[_k::KERNEL_SOCKS_ENABLED] = true;
_inboundSettings[_k::KERNEL_SOCKS_PORT] = pluginPort; _inboundSettings[_k::KERNEL_SOCKS_PORT] = pluginPort;
@ -163,8 +163,10 @@ namespace Qv2ray::core::handler
{ {
LOG(MODULE_CONNECTION, "Starting kernel for protocol: " + outboundProtocol) LOG(MODULE_CONNECTION, "Starting kernel for protocol: " + outboundProtocol)
bool status = kernelObject->StartKernel(); bool status = kernelObject->StartKernel();
connect(kernelObject.get(), &QvPluginKernel::OnKernelCrashed, this, &KernelInstanceHandler::OnKernelCrashed_p); connect(kernelObject.get(), &QvPluginKernel::OnKernelCrashed, this, &KernelInstanceHandler::OnKernelCrashed_p,
connect(kernelObject.get(), &QvPluginKernel::OnKernelLogAvailable, this, &KernelInstanceHandler::OnKernelLog_p); Qt::QueuedConnection);
connect(kernelObject.get(), &QvPluginKernel::OnKernelLogAvailable, this, &KernelInstanceHandler::OnKernelLog_p,
Qt::QueuedConnection);
hasAllKernelStarted = hasAllKernelStarted && status; hasAllKernelStarted = hasAllKernelStarted && status;
if (!status) if (!status)
{ {
@ -204,9 +206,10 @@ namespace Qv2ray::core::handler
} }
Q_ASSERT(activeKernels.size() == 1); Q_ASSERT(activeKernels.size() == 1);
#define theKernel (activeKernels.front().second.get()) #define theKernel (activeKernels.front().second.get())
connect(theKernel, &QvPluginKernel::OnKernelStatsAvailable, this, &KernelInstanceHandler::OnPluginStatsDataRcvd_p); connect(theKernel, &QvPluginKernel::OnKernelStatsAvailable, this, &KernelInstanceHandler::OnPluginStatsDataRcvd_p,
connect(theKernel, &QvPluginKernel::OnKernelCrashed, this, &KernelInstanceHandler::OnKernelCrashed_p); Qt::QueuedConnection);
connect(theKernel, &QvPluginKernel::OnKernelLogAvailable, this, &KernelInstanceHandler::OnKernelLog_p); connect(theKernel, &QvPluginKernel::OnKernelCrashed, this, &KernelInstanceHandler::OnKernelCrashed_p, Qt::QueuedConnection);
connect(theKernel, &QvPluginKernel::OnKernelLogAvailable, this, &KernelInstanceHandler::OnKernelLog_p, Qt::QueuedConnection);
currentId = id; currentId = id;
// //
QMap<QvPluginKernel::KernelSetting, QVariant> pluginSettings; QMap<QvPluginKernel::KernelSetting, QVariant> pluginSettings;