From 4b00c0e3bfecea4c45d9c077fbb49f46fe4fee4a Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sat, 29 Jan 2022 14:32:11 +0000 Subject: [PATCH] Bump Vatsim protocol version number --- src/blackcore/fsd/fsdclient.cpp | 2 +- src/blackcore/fsd/fsdclient.h | 1 + tests/blackcore/fsd/testfsdclient/testfsdclient.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp index d51ff929b..4692d444b 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/blackcore/fsd/fsdclient.cpp @@ -149,7 +149,7 @@ namespace BlackCore::Fsd const QString codecName(server.getFsdSetup().getTextCodec()); QTextCodec *textCodec = QTextCodec::codecForName(codecName.toLocal8Bit()); if (!textCodec) { textCodec = QTextCodec::codecForName("utf-8"); } - const int protocolRev = (server.getServerType() == CServer::FSDServerVatsim) ? PROTOCOL_REVISION_VATSIM_AUTH : PROTOCOL_REVISION_CLASSIC; + const int protocolRev = (server.getServerType() == CServer::FSDServerVatsim) ? PROTOCOL_REVISION_VATSIM_VELOCITY : PROTOCOL_REVISION_CLASSIC; QWriteLocker l(&m_lockUserClientBuffered); m_server = server; diff --git a/src/blackcore/fsd/fsdclient.h b/src/blackcore/fsd/fsdclient.h index 55abc7e8b..9dfdea44b 100644 --- a/src/blackcore/fsd/fsdclient.h +++ b/src/blackcore/fsd/fsdclient.h @@ -54,6 +54,7 @@ #define PROTOCOL_REVISION_CLASSIC 9 #define PROTOCOL_REVISION_VATSIM_ATC 10 #define PROTOCOL_REVISION_VATSIM_AUTH 100 +#define PROTOCOL_REVISION_VATSIM_VELOCITY 101 //! @} namespace BlackFsdTest { class CTestFSDClient; } diff --git a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp b/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp index 1c68f38cc..7f59a3572 100644 --- a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp +++ b/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp @@ -379,7 +379,7 @@ namespace BlackFsdTest QList arguments = spy.takeFirst(); QCOMPARE(arguments.size(), 1); CRawFsdMessage fsdMessage = arguments.at(0).value(); - QCOMPARE(fsdMessage.getRawMessage(), "FSD Sent=>#APABCD:SERVER:1234567:123456:1:100:16:Test User"); + QCOMPARE(fsdMessage.getRawMessage(), "FSD Sent=>#APABCD:SERVER:1234567:123456:1:101:16:Test User"); } void CTestFSDClient::testSendAtcLogin() @@ -393,7 +393,7 @@ namespace BlackFsdTest QList arguments = spy.takeFirst(); QCOMPARE(arguments.size(), 1); CRawFsdMessage fsdMessage = arguments.at(0).value(); - QCOMPARE(fsdMessage.getRawMessage(), "FSD Sent=>#AAABCD:SERVER:Test User:1234567:123456:5:100"); + QCOMPARE(fsdMessage.getRawMessage(), "FSD Sent=>#AAABCD:SERVER:Test User:1234567:123456:5:101"); } void CTestFSDClient::testSendDeletePilot()