From 61affc3d88d0993f2a1b4be7ada8cd8b3a8dd74e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 6 May 2014 13:35:35 +0200 Subject: [PATCH] Added sendUserInfoQuery for experimental reasons. Can only be used by supervisors, but interesting for some tests. Maybe removed again later, but does not harm anything. --- src/blackcore/network.h | 7 +++++++ src/blackcore/network_vatlib.cpp | 11 +++++++++++ src/blackcore/network_vatlib.h | 1 + 3 files changed, 19 insertions(+) diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 34011c477..f85fbca1c 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -273,6 +273,13 @@ namespace BlackCore */ virtual void sendFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0; + /*! + * Send a user info query, which only shall be sent by supervisiors. Reply is received as + * text message + * \pre Network must be connected when calling this function. + */ + virtual void sendUserInfoQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0; + /*! * Set our own aircraft data. * \param aircraft Only the situation and avionics parts are used. Callsign, user, and ICAO code parts are ignored. diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index de4aad553..a1513132c 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -565,6 +565,17 @@ namespace BlackCore catch (...) { exceptionDispatcher(Q_FUNC_INFO); } } + void CNetworkVatlib::sendUserInfoQuery(const BlackMisc::Aviation::CCallsign &callsign) + { + Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected"); + + try + { + m_net->SendInfoQuery(Cvatlib_Network::infoQuery_UserInfo, toFSD(callsign)); + } + catch (...) { exceptionDispatcher(Q_FUNC_INFO); } + } + void CNetworkVatlib::sendServerQuery(const BlackMisc::Aviation::CCallsign &callsign) { Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected"); diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h index 3a81d65c2..c56d1ee63 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/network_vatlib.h @@ -69,6 +69,7 @@ namespace BlackCore virtual void sendCapabilitiesQuery(const BlackMisc::Aviation::CCallsign &callsign) override; virtual void sendIcaoCodesQuery(const BlackMisc::Aviation::CCallsign &callsign) override; virtual void sendFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign) override; + virtual void sendUserInfoQuery(const BlackMisc::Aviation::CCallsign &callsign) override; virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft) override; virtual void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override; virtual void setOwnAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;