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

Ref T730, some adjustments in CFSDClient

Browse Source 
* avoid return if value is meant to be in statistics
* removed qFatal, replaced by warning/BLACK_VERIFY
This commit is contained in:
Klaus Basan
2019-09-27 23:04:46 +02:00
committed by Mat Sutcliffe
parent 6a9109bf8f
commit ca26ddd225
2 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,11 +34,13 @@
#include "blackcore/fsd/planeinforequestfsinn.h"
#include "blackcore/fsd/planeinformationfsinn.h"
#include "blackconfig/buildconfig.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/range.h"
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/network/rawfsdmessage.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/range.h"
#include "blackmisc/verify.h"
#include "blackconfig/buildconfig.h"
#include <QHostAddress>
#include <QStringBuilder>
@@ -70,8 +72,7 @@ namespace BlackCore
}
else
{
escaped += "\\u";
escaped += QString::number(code, 16).rightJustified(4, '0');
escaped += "\\u" % QString::number(code, 16).rightJustified(4, '0');
}
}
return escaped;
@@ -223,7 +224,7 @@ namespace BlackCore
updateConnectionStatus(CConnectionStatus::Connecting);
QString host = m_server.getAddress();
quint16 port = m_server.getPort();
quint16 port = static_cast<quint16>(m_server.getPort());
m_socket.connectToHost(host, port);
startPositionTimers();
}
@@ -264,14 +265,14 @@ namespace BlackCore
void CFSDClient::sendDeletePilot()
{
QString cid = m_server.getUser().getId();
const QString cid = m_server.getUser().getId();
DeletePilot deletePilot(m_ownCallsign.asString(), cid);
sendMessage(deletePilot);
}
void CFSDClient::sendDeleteAtc()
{
QString cid = m_server.getUser().getId();
const QString cid = m_server.getUser().getId();
DeleteAtc deleteAtc(m_ownCallsign.asString(), cid);
sendMessage(deleteAtc);
}
@@ -396,32 +397,26 @@ namespace BlackCore
{
ClientQuery clientQuery(m_ownCallsign.asString(), "SERVER", ClientQueryType::IsValidATC, queryData);
sendMessage(clientQuery);
return;
}
else if (queryType == ClientQueryType::Capabilities)
{
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::Capabilities);
sendMessage(clientQuery);
return;
}
else if (queryType == ClientQueryType::Com1Freq)
{
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::Com1Freq);
sendMessage(clientQuery);
return;
}
else if (queryType == ClientQueryType::RealName)
{
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::RealName);
sendMessage(clientQuery);
return;
}
else if (queryType == ClientQueryType::Server)
{
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::Server);
sendMessage(clientQuery);
return;
}
else if (queryType == ClientQueryType::ATIS)
{
@@ -431,33 +426,28 @@ namespace BlackCore
{
m_pendingAtisQueries.insert(receiver, {});
}
return;
}
else if (queryType == ClientQueryType::PublicIP)
{
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::PublicIP);
sendMessage(clientQuery);
return;
}
else if (queryType == ClientQueryType::INF)
{
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::INF);
sendMessage(clientQuery);
return;
}
else if (queryType == ClientQueryType::FP)
{
if (queryData.size() == 0) { return; }
ClientQuery clientQuery(m_ownCallsign.asString(), "SERVER", ClientQueryType::FP, queryData);
sendMessage(clientQuery);
return;
}
if (queryType == ClientQueryType::AircraftConfig)
{
if (queryData.size() == 0) { return; }
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::AircraftConfig, queryData);
sendMessage(clientQuery);
return;
}
this->increaseStatisticsValue(QStringLiteral("sendClientQuery"), toQString(queryType));
@@ -559,6 +549,7 @@ namespace BlackCore
case CFlightPlan::VFR: flightType = FlightType::VFR; break;
case CFlightPlan::SVFR: flightType = FlightType::SVFR; break;
case CFlightPlan::DVFR: flightType = FlightType::DVFR; break;
default: flightType = FlightType::IFR; break;
}
QList<int> timePartsEnroute = flightPlan.getEnrouteTime().getHrsMinSecParts();
@@ -665,38 +656,37 @@ namespace BlackCore
QStringList responseData;
if (queryType == ClientQueryType::IsValidATC)
{
qFatal("Never send that from the client");
this->handleIllegalFsdState("Never use sendClientResponse with IsValidATC from the client");
return;
}
else if (queryType == ClientQueryType::Capabilities)
{
responseData.clear();
if (m_capabilities & Capabilities::AtcInfo)
responseData.push_back(toQString(Capabilities::AtcInfo) + "=1");
responseData.push_back(toQString(Capabilities::AtcInfo) % "=1");
if (m_capabilities & Capabilities::SecondaryPos)
responseData.push_back(toQString(Capabilities::SecondaryPos) + "=1");
responseData.push_back(toQString(Capabilities::SecondaryPos) % "=1");
if (m_capabilities & Capabilities::AircraftInfo)
responseData.push_back(toQString(Capabilities::AircraftInfo) + "=1");
responseData.push_back(toQString(Capabilities::AircraftInfo) % "=1");
if (m_capabilities & Capabilities::OngoingCoord)
responseData.push_back(toQString(Capabilities::OngoingCoord) + "=1");
responseData.push_back(toQString(Capabilities::OngoingCoord) % "=1");
if (m_capabilities & Capabilities::InterminPos)
responseData.push_back(toQString(Capabilities::InterminPos) + "=1");
responseData.push_back(toQString(Capabilities::InterminPos) % "=1");
if (m_capabilities & Capabilities::FastPos)
responseData.push_back(toQString(Capabilities::FastPos) + "=1");
responseData.push_back(toQString(Capabilities::FastPos) % "=1");
if (m_capabilities & Capabilities::Stealth)
responseData.push_back(toQString(Capabilities::Stealth) + "=1");
responseData.push_back(toQString(Capabilities::Stealth) % "=1");
if (m_capabilities & Capabilities::AircraftConfig)
responseData.push_back(toQString(Capabilities::AircraftConfig) + "=1");
ClientResponse clientResponse(m_ownCallsign.asString(), receiver, ClientQueryType::Capabilities, responseData);
responseData.push_back(toQString(Capabilities::AircraftConfig) % "=1");
const ClientResponse clientResponse(m_ownCallsign.asString(), receiver, ClientQueryType::Capabilities, responseData);
sendMessage(clientResponse);
return;
}
else if (queryType == ClientQueryType::Com1Freq)
{
QString com1Frequency = QString::number(getOwnAircraft().getCom1System().getFrequencyActive().value(CFrequencyUnit::MHz()), 'f', 3);
const QString com1Frequency = QString::number(getOwnAircraft().getCom1System().getFrequencyActive().value(CFrequencyUnit::MHz()), 'f', 3);
responseData.push_back(com1Frequency);
ClientResponse pduClientResponse(m_ownCallsign.asString(), receiver, ClientQueryType::Com1Freq, responseData);
const ClientResponse pduClientResponse(m_ownCallsign.asString(), receiver, ClientQueryType::Com1Freq, responseData);
sendMessage(pduClientResponse);
return;
}
else if (queryType == ClientQueryType::RealName)
{
@@ -708,9 +698,8 @@ namespace BlackCore
if (m_loginMode.isObserver()) { responseData.push_back(toQString(m_atcRating)); }
else { responseData.push_back(toQString(m_pilotRating)); }
ClientResponse pduClientQueryResponse(m_ownCallsign.asString(), receiver, ClientQueryType::RealName, responseData);
const ClientResponse pduClientQueryResponse(m_ownCallsign.asString(), receiver, ClientQueryType::RealName, responseData);
sendMessage(pduClientQueryResponse);
return;
}
else if (queryType == ClientQueryType::Server)
{
@@ -720,21 +709,23 @@ namespace BlackCore
}
else if (queryType == ClientQueryType::ATIS)
{
qFatal("Dont send this as pilot client!");
this->handleIllegalFsdState(QStringLiteral("Dont send '%1' as pilot client!").arg(toQString(ClientQueryType::ATIS)));
return;
}
else if (queryType == ClientQueryType::PublicIP)
{
qFatal("Dont send this as pilot client!");
this->handleIllegalFsdState(QStringLiteral("Dont send '%1' as pilot client!").arg(toQString(ClientQueryType::PublicIP)));
return;
}
else if (queryType == ClientQueryType::INF)
{
QString userInfo;
QString cid = m_server.getUser().getId();
CSimulatedAircraft myAircraft(getOwnAircraft());
double latitude = getOwnAircraftPosition().latitude().value(CAngleUnit::deg());
double longitude = getOwnAircraftPosition().longitude().value(CAngleUnit::deg());
int altitude = getOwnAircraft().getAltitude().valueInteger(CLengthUnit::ft());
QString realName = m_server.getUser().getRealName();
const double latitude = getOwnAircraftPosition().latitude().value(CAngleUnit::deg());
const double longitude = getOwnAircraftPosition().longitude().value(CAngleUnit::deg());
const int altitude = getOwnAircraft().getAltitude().valueInteger(CLengthUnit::ft());
const QString realName = m_server.getUser().getRealName();
char sysuid[50];
vatsim_get_system_unique_id(sysuid);
@@ -746,17 +737,17 @@ namespace BlackCore
TextMessage textMessage(m_ownCallsign.asString(), receiver, userInfo);
sendMessage(textMessage);
return;
}
else if (queryType == ClientQueryType::FP)
{
qFatal("Dont send this as pilot client!");
this->handleIllegalFsdState(QStringLiteral("Dont send '%1' as pilot client!").arg(toQString(ClientQueryType::FP)));
return;
}
else if (queryType == ClientQueryType::AircraftConfig)
{
qFatal("This is not defined");
this->handleIllegalFsdState(QStringLiteral("Dont send '%1' as pilot client!").arg(toQString(ClientQueryType::AircraftConfig)));
return;
}
this->increaseStatisticsValue(QStringLiteral("sendClientResponse"), toQString(queryType));
}
@@ -765,11 +756,10 @@ namespace BlackCore
char sysuid[50];
vatsim_get_system_unique_id(sysuid);
QString cid = m_server.getUser().getId();
ClientIdentification clientIdentification(m_ownCallsign.asString(), vatsim_auth_get_client_id(clientAuth), m_clientName, m_versionMajor, m_versionMinor, cid, sysuid, fsdChallenge);
sendMessage(clientIdentification);
sendLogin();
updateConnectionStatus(CConnectionStatus::Connected);
const ClientIdentification clientIdentification(m_ownCallsign.asString(), vatsim_auth_get_client_id(clientAuth), m_clientName, m_versionMajor, m_versionMinor, cid, sysuid, fsdChallenge);
this->sendMessage(clientIdentification);
this->sendLogin();
this->updateConnectionStatus(CConnectionStatus::Connected);
this->increaseStatisticsValue(QStringLiteral("sendClientIdentification"));
}
@@ -892,7 +882,6 @@ namespace BlackCore
if (textMessage.m_type == TextMessage::PrivateMessage)
{
// Other FSD servers send the controller ATIS as text message. The following conditions need to be met:
// * non-VATSIM server. VATSIM has a specific ATIS message
// * Receiver callsign must be owner callsign and not any type of broadcast.
@@ -1901,6 +1890,15 @@ namespace BlackCore
return (l2 > l1) ? l2 : l1;
}
void CFSDClient::handleIllegalFsdState(const QString &message)
{
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(false, Q_FUNC_INFO, "Illegal FSD state");
}
CLogMessage(this).warning(message);
}
const QJsonObject &CFSDClient::JsonPackets::aircraftConfigRequest()
{
static const QJsonObject jsonObject{ { "request", "full" } };

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

@@ -227,9 +227,9 @@ namespace BlackCore
{
if (!message.isValid()) return;
QString payload = message.toTokens().join(':');
QString line = message.pdu() + payload;
QString buffer = line + "\r\n";
const QString payload = message.toTokens().join(':');
const QString line = message.pdu() + payload;
const QString buffer = line + "\r\n";
QByteArray bufferEncoded = m_fsdTextCodec->fromUnicode(buffer);
emitRawFsdMessage(buffer.trimmed(), true);
if (m_printToConsole) { qDebug() << "FSD Sent=>" << bufferEncoded; }
@@ -384,6 +384,7 @@ namespace BlackCore
BlackMisc::CDigestSignal m_dsSendTextMessage { this, &CFSDClient::emitConsolidatedTextMessages, 500, 10 };
BlackMisc::Network::CTextMessageList m_textMessagesToConsolidate;
//! ATIS message
struct AtisMessage
{
QString voiceRoom;
@@ -432,12 +433,15 @@ namespace BlackCore
QTextCodec *m_fsdTextCodec = nullptr;
//! An illegal FSD state has been detected
void handleIllegalFsdState(const QString &message);
static const int MaxOffseTimes = 6; //!< Max offset times kept
static int constexpr c_processingIntervalMsec = 100; //!< interval for the processing timer
static int constexpr c_updatePostionIntervalMsec = 5000; //!< interval for the position update timer (send our position to network)
static int constexpr c_updateInterimPostionIntervalMsec = 1000; //!< interval for iterim position updates (send our position as interim position)
};
}
}
} // ns
} // ns
#endif