flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 10:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FSD] Refactor m_socket member

Browse Source
This commit is contained in:
Mat Sutcliffe
2022-02-16 20:56:44 +00:00
parent f945f296c8
commit 5106859ed9
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/blackcore/fsd/fsdclient.cpp
View File

@@ -108,10 +108,7 @@ namespace BlackCore::Fsd
m_tokenBucket(10, 5000, 1) m_tokenBucket(10, 5000, 1)
{ {
initializeMessageTypes(); initializeMessageTypes();
connect(&m_socket, &QTcpSocket::readyRead, this, &CFSDClient::readDataFromSocket, Qt::QueuedConnection); connectSocketSignals();
connect(&m_socket, &QTcpSocket::connected, this, &CFSDClient::handleSocketConnected);
connect(&m_socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &CFSDClient::printSocketError, Qt::QueuedConnection);
connect(&m_socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &CFSDClient::handleSocketError, Qt::QueuedConnection);
m_positionUpdateTimer.setObjectName(this->objectName().append(":m_positionUpdateTimer")); m_positionUpdateTimer.setObjectName(this->objectName().append(":m_positionUpdateTimer"));
connect(&m_positionUpdateTimer, &QTimer::timeout, this, &CFSDClient::sendPilotDataUpdate); connect(&m_positionUpdateTimer, &QTimer::timeout, this, &CFSDClient::sendPilotDataUpdate);
@@ -137,6 +134,14 @@ namespace BlackCore::Fsd
} }
} }
void CFSDClient::connectSocketSignals()
{
connect(m_socket.get(), &QTcpSocket::readyRead, this, &CFSDClient::readDataFromSocket, Qt::QueuedConnection);
connect(m_socket.get(), &QTcpSocket::connected, this, &CFSDClient::handleSocketConnected);
connect(m_socket.get(), &QTcpSocket::errorOccurred, this, &CFSDClient::printSocketError, Qt::QueuedConnection);
connect(m_socket.get(), &QTcpSocket::errorOccurred, this, &CFSDClient::handleSocketError, Qt::QueuedConnection);
}
void CFSDClient::setClientIdAndKey(quint16 id, const QByteArray &key) void CFSDClient::setClientIdAndKey(quint16 id, const QByteArray &key)
{ {
QWriteLocker l(&m_lockUserClientBuffered); QWriteLocker l(&m_lockUserClientBuffered);
@@ -241,7 +246,7 @@ namespace BlackCore::Fsd
return; return;
} }
if (m_socket.isOpen()) { return; } if (m_socket->isOpen()) { return; }
Q_ASSERT(!m_clientName.isEmpty()); Q_ASSERT(!m_clientName.isEmpty());
Q_ASSERT((m_versionMajor + m_versionMinor) > 0); Q_ASSERT((m_versionMajor + m_versionMinor) > 0);
Q_ASSERT(m_capabilities != Capabilities::None); Q_ASSERT(m_capabilities != Capabilities::None);
@@ -266,7 +271,7 @@ namespace BlackCore::Fsd
const CServer s = this->getServer(); const CServer s = this->getServer();
const QString host = s.getAddress(); const QString host = s.getAddress();
const quint16 port = static_cast<quint16>(s.getPort()); const quint16 port = static_cast<quint16>(s.getPort());
m_socket.connectToHost(host, port); m_socket->connectToHost(host, port);
this->startPositionTimers(); this->startPositionTimers();
} }
@@ -286,12 +291,12 @@ namespace BlackCore::Fsd
// allow also to close if broken // allow also to close if broken
CLoginMode mode = this->getLoginMode(); CLoginMode mode = this->getLoginMode();
if (m_socket.isOpen()) if (m_socket->isOpen())
{ {
if (mode.isPilot()) { this->sendDeletePilot(); } if (mode.isPilot()) { this->sendDeletePilot(); }
else if (mode.isObserver()) { this->sendDeleteAtc(); } else if (mode.isObserver()) { this->sendDeleteAtc(); }
} }
m_socket.close(); m_socket->close();
this->updateConnectionStatus(CConnectionStatus::Disconnected); this->updateConnectionStatus(CConnectionStatus::Disconnected);
this->clearState(); this->clearState();
@@ -817,7 +822,7 @@ namespace BlackCore::Fsd
if (message.isEmpty()) { return; } if (message.isEmpty()) { return; }
const QByteArray bufferEncoded = m_fsdTextCodec->fromUnicode(message); const QByteArray bufferEncoded = m_fsdTextCodec->fromUnicode(message);
if (m_printToConsole) { qDebug() << "FSD Sent=>" << bufferEncoded; } if (m_printToConsole) { qDebug() << "FSD Sent=>" << bufferEncoded; }
if (!m_unitTestMode) { m_socket.write(bufferEncoded); } if (!m_unitTestMode) { m_socket->write(bufferEncoded); }
// remove CR/LF and emit // remove CR/LF and emit
emitRawFsdMessage(message.trimmed(), true); emitRawFsdMessage(message.trimmed(), true);
@@ -972,7 +977,7 @@ namespace BlackCore::Fsd
std::array<char, 50> sysuid = {}; std::array<char, 50> sysuid = {};
vatsim_get_system_unique_id(sysuid.data()); vatsim_get_system_unique_id(sysuid.data());
const QString userInfo = QStringLiteral("CID=") % cid % " " % m_clientName % " IP=" % m_socket.localAddress().toString() % const QString userInfo = QStringLiteral("CID=") % cid % " " % m_clientName % " IP=" % m_socket->localAddress().toString() %
" SYS_UID=" % sysuid.data() % " FSVER=" % m_hostApplication % " LT=" % QString::number(latitude) % " SYS_UID=" % sysuid.data() % " FSVER=" % m_hostApplication % " LT=" % QString::number(latitude) %
" LO=" % QString::number(longitude) % " AL=" % QString::number(altitude) % " LO=" % QString::number(longitude) % " AL=" % QString::number(altitude) %
" " % realName; " " % realName;
@@ -2127,14 +2132,14 @@ namespace BlackCore::Fsd
void CFSDClient::readDataFromSocketMaxLines(int maxLines) void CFSDClient::readDataFromSocketMaxLines(int maxLines)
{ {
if (m_socket.bytesAvailable() < 1) { return; } if (m_socket->bytesAvailable() < 1) { return; }
int lines = 0; int lines = 0;
// reads at least one line if available // reads at least one line if available
while (m_socket.canReadLine()) while (m_socket->canReadLine())
{ {
const QByteArray dataEncoded = m_socket.readLine(); const QByteArray dataEncoded = m_socket->readLine();
if (dataEncoded.isEmpty()) { continue; } if (dataEncoded.isEmpty()) { continue; }
const QString data = m_fsdTextCodec->toUnicode(dataEncoded); const QString data = m_fsdTextCodec->toUnicode(dataEncoded);
this->parseMessage(data); this->parseMessage(data);
@@ -2164,9 +2169,9 @@ namespace BlackCore::Fsd
QString CFSDClient::socketErrorString(QAbstractSocket::SocketError error) const QString CFSDClient::socketErrorString(QAbstractSocket::SocketError error) const
{ {
QString e = CFSDClient::socketErrorToQString(error); QString e = CFSDClient::socketErrorToQString(error);
if (!m_socket.errorString().isEmpty()) if (!m_socket->errorString().isEmpty())
{ {
e += QStringLiteral(": ") % m_socket.errorString(); e += QStringLiteral(": ") % m_socket->errorString();
} }
return e; return e;
} }

3
src/blackcore/fsd/fsdclient.h
View File

@@ -473,7 +473,8 @@ namespace BlackCore::Fsd
// Parser // Parser
QHash<QString, MessageType> m_messageTypeMapping; QHash<QString, MessageType> m_messageTypeMapping;
QTcpSocket m_socket { this }; //!< used TCP socket, parent needed as it runs in worker thread std::unique_ptr<QTcpSocket> m_socket = std::make_unique<QTcpSocket>(this); //!< used TCP socket, parent needed as it runs in worker thread
void connectSocketSignals();
std::atomic_bool m_unitTestMode { false }; std::atomic_bool m_unitTestMode { false };
std::atomic_bool m_printToConsole { false }; std::atomic_bool m_printToConsole { false };