From 6a5444590ed6f521fff74c08c38aacbe315afc62 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 22 Oct 2016 04:24:07 +0200 Subject: [PATCH] refs #780, send FsInn Query in airspace monitor --- src/blackcore/airspacemonitor.cpp | 10 +++++++--- src/blackcore/airspacemonitor.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index c3132cde5..2d857429d 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -777,7 +777,7 @@ namespace BlackCore const bool existsAircraft = this->isAircraftInRange(callsign); if (!existsAircraft) { - this->sendInitialPilotQueries(callsign); + this->sendInitialPilotQueries(callsign, false); } this->addOrUpdateAircraftInRange(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, "", modelString, CAircraftModel::TypeFSInnData, pReverseLookupMessages); this->addReverseLookupMessages(callsign, reverseLookupMessages); @@ -964,7 +964,7 @@ namespace BlackCore aircraft.setSituation(situation); aircraft.setTransponder(transponder); this->addNewAircraftinRange(aircraft); - this->sendInitialPilotQueries(callsign); + this->sendInitialPilotQueries(callsign, true); // new client, there is a chance it has been already created by custom packet const CClient c(callsign); @@ -1149,13 +1149,17 @@ namespace BlackCore this->m_network->sendServerQuery(callsign); } - void CAirspaceMonitor::sendInitialPilotQueries(const CCallsign &callsign) + void CAirspaceMonitor::sendInitialPilotQueries(const CCallsign &callsign, bool withFsInn) { if (!this->isConnected()) { return; } this->m_network->sendFrequencyQuery(callsign); this->m_network->sendRealNameQuery(callsign); this->m_network->sendCapabilitiesQuery(callsign); this->m_network->sendServerQuery(callsign); + if (withFsInn) + { + this->m_network->sendCustomFsinnQuery(callsign); + } } bool CAirspaceMonitor::isConnected() const diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h index 4a0644300..73275d963 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/blackcore/airspacemonitor.h @@ -252,7 +252,7 @@ namespace BlackCore void sendInitialAtcQueries(const BlackMisc::Aviation::CCallsign &callsign); //! Network queries for pilots - void sendInitialPilotQueries(const BlackMisc::Aviation::CCallsign &callsign); + void sendInitialPilotQueries(const BlackMisc::Aviation::CCallsign &callsign, bool withFsInn); //! Connected with network? bool isConnected() const;