flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #883, refs #869 using ping as socket is slow/sometimes has trouble

Browse Source
This commit is contained in:
Klaus Basan
2017-02-18 05:06:00 +01:00
committed by Mathew Sutcliffe
parent 3b3cdf4566
commit c460505d2e
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@
#include <QEventLoop>
#include <QVariant>
#include <QtDebug>
#include <QTimer>
#include <QRegularExpression>
using namespace BlackConfig;
@@ -118,20 +119,31 @@ namespace BlackMisc
return false;
}
// KB: I have had an issue with QTcpSocket. It was stuck in HostLookupState and did
// only recover after a reboot for no obvious reason.
// Currently trying the ping alternative
bool ping = CNetworkUtils::canPing(hostAddress);
if (ping) { return true; }
// http://qt-project.org/forums/viewthread/9346
// socket.waitForConnected() unrelaiable under Windows, see Qt docu
QTcpSocket socket;
bool connected = false;
socket.connectToHost(hostAddress, static_cast<quint16>(port));
if (!socket.waitForConnected(timeoutMs))
QTcpSocket::SocketState socketState;
socket.connectToHost(hostAddress, static_cast<quint16>(port), QTcpSocket::ReadOnly);
socketState = socket.state();
bool connected = (socketState == QTcpSocket::ConnectedState);
if (!connected)
{
message = QObject::tr("Connection failed : %1", "BlackMisc").arg(socket.errorString());
connected = false;
}
else
{
message = QObject::tr("OK, connected", "BlackMisc");
connected = true;
QEventLoop eventLoop;
QObject::connect(&socket, &QTcpSocket::connected, &eventLoop, &QEventLoop::quit);
QTimer::singleShot(timeoutMs, &eventLoop, &QEventLoop::quit);
eventLoop.exec();
}
socketState = socket.state();
connected = (socketState == QTcpSocket::ConnectedState);
message = connected ?
QObject::tr("OK, connected", "BlackMisc") :
QObject::tr("Connection failed : '%1'", "BlackMisc").arg(socket.errorString());
socket.close();
return connected;
}