flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 19:35:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid colons in VATLIB packets https://discordapp.com/channels/539048679160676382/567983892791951374/585899398387728395

Browse Source
This commit is contained in:
Klaus Basan
2019-06-08 22:16:23 +02:00
parent 50610390c2
commit abe800cc16
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -303,7 +303,11 @@ namespace BlackCore
QByteArray CNetworkVatlib::toFSDnoColon(const QString &qstr) const
{
if (!qstr.contains(':')) { return toFSD(qstr); }
BLACK_VERIFY_X(false, Q_FUNC_INFO, "Illegal char :");
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
// so we can investigate
BLACK_VERIFY_X(false, Q_FUNC_INFO, "Illegal char :");
}
QString copy(qstr);
return toFSD(copy.remove(':'));
}
@@ -719,7 +723,7 @@ namespace BlackCore
void CNetworkVatlib::replyToNameQuery(const CCallsign &callsign) // private
{
QStringList response { m_server.getUser().getRealNameAndHomeBase(), "" };
QStringList response { removeColon(m_server.getUser().getRealNameAndHomeBase()), "" };
Vat_SendClientQueryResponse(m_net.data(), vatClientQueryName, toFSD(callsign), toFSD(response)(), response.size());
}
@@ -729,7 +733,7 @@ namespace BlackCore
config.insert(CAircraftParts::attributeNameIsFullJson(), true);
QString data = QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact);
data = convertToUnicodeEscaped(data);
Vat_SendAircraftConfig(m_net.data(), toFSD(callsign), toFSD(data));
Vat_SendAircraftConfig(m_net.data(), toFSD(callsign), toFSDnoColon(data));
}
void CNetworkVatlib::sendIcaoCodesQuery(const CCallsign &callsign)
@@ -1340,6 +1344,10 @@ namespace BlackCore
{
QPointer<CNetworkVatlib> self(cbvar_cast(cbvar));
const CCallsign callsign(self->fromFSD(callsignString));
const bool valid = !callsign.isEmpty();
BLACK_AUDIT_X(valid, Q_FUNC_INFO, "No callsign");
if (!valid) { return; }
switch (type)
{
case vatClientQueryFreq: