flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-28 11:45:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed undescriptive error message generated by CNetworkUtils::canConnect.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-03-30 00:50:53 +01:00
parent 9dbb984e1a
commit c1a82ad60e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -164,7 +164,7 @@ namespace BlackCore
{ {
return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid ICAO data for own aircraft"); return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid ICAO data for own aircraft");
} }
else if (!CNetworkUtils::canConnect(server, msg, 2000)) else if (!CNetworkUtils::canConnect(server, msg, 5000))
{ {
return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, msg); return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, msg);
} }

15
src/blackmisc/network/networkutils.cpp
View File

@@ -22,6 +22,7 @@
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QNetworkReply> #include <QNetworkReply>
#include <QObject> #include <QObject>
#include <QSignalMapper>
#include <QSslCertificate> #include <QSslCertificate>
#include <QSslConfiguration> #include <QSslConfiguration>
#include <QSslKey> #include <QSslKey>
@@ -88,20 +89,26 @@ namespace BlackMisc
bool CNetworkUtils::canConnect(const QString &hostAddress, int port, QString &message, int timeoutMs) bool CNetworkUtils::canConnect(const QString &hostAddress, int port, QString &message, int timeoutMs)
{ {
QTcpSocket socket; QTcpSocket socket;
bool connected = CEventLoop::processEventsUntil(&socket, &QTcpSocket::connected, timeoutMs, [&] QSignalMapper mapper;
QObject::connect(&socket, &QTcpSocket::connected, &mapper, QOverload<>::of(&QSignalMapper::map));
QObject::connect(&socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), &mapper, QOverload<>::of(&QSignalMapper::map));
mapper.setMapping(&socket, 0);
const bool timedOut = !CEventLoop::processEventsUntil(&mapper, QOverload<int>::of(&QSignalMapper::mapped), timeoutMs, [&]
{ {
socket.connectToHost(hostAddress, static_cast<quint16>(port)); socket.connectToHost(hostAddress, static_cast<quint16>(port));
}); });
if (!connected) if (socket.state() != QTcpSocket::ConnectedState)
{ {
message = QObject::tr("Connection failed : %1", "BlackMisc").arg(socket.errorString()); const QString error = timedOut ? QObject::tr("Timed out", "BlackMisc") : socket.errorString();
message = QObject::tr("Connection failed : %1", "BlackMisc").arg(error);
return false;
} }
else else
{ {
message = QObject::tr("OK, connected", "BlackMisc"); message = QObject::tr("OK, connected", "BlackMisc");
return true;
} }
return connected;
} }
bool CNetworkUtils::canConnect(const Network::CServer &server, QString &message, int timeoutMs) bool CNetworkUtils::canConnect(const Network::CServer &server, QString &message, int timeoutMs)