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

update: updated port detection error message

Browse Source
This commit is contained in:
QxQ 2020-10-11 22:00:55 +08:00
parent b6170b72b2
commit cdc428d1f6
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5985
5986

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

@ -41,30 +41,22 @@ namespace Qv2ray::core::handler
std::optional<QString> KernelInstanceHandler::CheckPort(const QMap<QString, ProtocolSettingsInfoObject> &info, int plugins)
{
//
// Check inbound port allocation issue.
QStringList portDetectionErrorMessage;
auto portDetectionMsg = tr("Another process is using the port required to start the connection:") + NEWLINE + NEWLINE;
auto portDetectionMsg = tr("There are other processes occupying the ports necessary to start the connection:") + NEWLINE + NEWLINE;
for (const auto &key : info.keys())
{
auto result = components::port::CheckTCPPortStatus(info[key].address, info[key].port);
const auto result = components::port::CheckTCPPortStatus(info[key].address, info[key].port);
if (!result)
{
portDetectionErrorMessage << tr("Port: %1 for listening IP: %2 for inbound tag: \"%3\"") //
.arg(info[key].port)
.arg(info[key].address)
.arg(key);
}
portDetectionErrorMessage << tr("Endpoint: %1:%2 for inbound: \"%3\"").arg(info[key].address).arg(info[key].port).arg(key);
}
if (GlobalConfig.pluginConfig.v2rayIntegration)
{
for (int i = 0; i < plugins; i++)
for (auto i = 0; i < plugins; i++)
{
auto result = components::port::CheckTCPPortStatus("127.0.0.1", GlobalConfig.pluginConfig.portAllocationStart + i);
const auto thisPort = GlobalConfig.pluginConfig.portAllocationStart + i;
const auto result = components::port::CheckTCPPortStatus("127.0.0.1", thisPort);
if (!result)
{
portDetectionErrorMessage << tr("Port: %1 for plugin integration.").arg(GlobalConfig.pluginConfig.portAllocationStart + i);
}
portDetectionErrorMessage << tr("Local port: %1 for plugin integration.").arg(thisPort);
}
}
if (!portDetectionErrorMessage.isEmpty())