Ref T259, Ref T243 client provider used with network classes

Also adds a dummy testing class

samples/cliclient/client.cpp

@@ -45,18 +45,18 @@ using namespace BlackCore;
 using namespace BlackCore::Vatsim;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
+using namespace BlackMisc::Network;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 
 namespace BlackSample
 {
-
     Client::Client(QObject *parent)
         : QObject(parent),
           COwnAircraftAware(COwnAircraftProviderDummy::instance()),
           CIdentifiable("samples:cmdClient"),
-          m_net(new CNetworkVatlib(COwnAircraftProviderDummy::instance(), this))
+          m_net(new CNetworkVatlib(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), this))
     {
         connect(m_net, &INetwork::atcPositionUpdate,                this, &Client::atcPositionUpdate);
         connect(m_net, &INetwork::atcDisconnected,                  this, &Client::atcDisconnected);

src/blackcore/context/contextnetworkimpl.cpp

@@ -65,7 +65,7 @@ namespace BlackCore
             CContextNetwork::registerHelp();
 
             // 1. Init by "network driver"
-            m_network = new CNetworkVatlib(this->getRuntime()->getCContextOwnAircraft(), this);
+            m_network = new CNetworkVatlib(nullptr, this->getRuntime()->getCContextOwnAircraft(), this);
             connect(m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::onFsdConnectionStatusChanged);
             connect(m_network, &INetwork::kicked, this, &CContextNetwork::kicked);
             connect(m_network, &INetwork::textMessagesReceived, this, &CContextNetwork::textMessagesReceived);
@@ -80,6 +80,7 @@ namespace BlackCore
             // 3. Airspace contents
             Q_ASSERT_X(this->getRuntime()->getCContextOwnAircraft(), Q_FUNC_INFO, "this and own aircraft context must be local");
             m_airspace = new CAirspaceMonitor(this->getRuntime()->getCContextOwnAircraft(), m_network, this);
+            m_network->setClientProvider(m_airspace);
             connect(m_airspace, &CAirspaceMonitor::changedAtcStationsOnline, this, &CContextNetwork::changedAtcStationsOnline);
             connect(m_airspace, &CAirspaceMonitor::changedAtcStationsBooked, this, &CContextNetwork::changedAtcStationsBooked);
             connect(m_airspace, &CAirspaceMonitor::changedAtcStationOnlineConnectionStatus, this, &CContextNetwork::changedAtcStationOnlineConnectionStatus);
@@ -146,6 +147,7 @@ namespace BlackCore
         {
             this->disconnect(); // all signals
             if (this->isConnected()) { this->disconnectFromNetwork(); }
+            if (m_network)  { m_network->setClientProvider(nullptr); }
             if (m_airspace) { m_airspace->gracefulShutdown(); }
         }
 

src/blackcore/network.h

@@ -17,13 +17,15 @@
 #include "blackmisc/simulation/simulationenvironmentprovider.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
-#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/network/rawfsdmessage.h"
 #include "blackmisc/network/serverlist.h"
+#include "blackmisc/network/clientprovider.h"
+#include "blackmisc/network/clientlist.h"
 #include "blackmisc/network/textmessagelist.h"
 #include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/aviation/callsignset.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/time.h"
@@ -57,6 +59,7 @@ namespace BlackCore
      */
     class BLACKCORE_EXPORT INetwork :
         public QObject,
+        public BlackMisc::Network::CClientAware, // network vatlib consumes own aircraft data and sets ICAO/callsign data
         public BlackMisc::Simulation::COwnAircraftAware, // network vatlib consumes own aircraft data and sets ICAO/callsign data
         public BlackMisc::Simulation::CSimulationEnvironmentAware // allows to consume ground elevations
     {
@@ -66,9 +69,13 @@ namespace BlackCore
         /*!
          * Constructor
          */
-        INetwork(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, QObject *parent = nullptr) :
+        INetwork(
+            BlackMisc::Network::IClientProvider *clientProvider,
+            BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
+            QObject *parent = nullptr) :
             QObject(parent),
-            BlackMisc::Simulation::COwnAircraftAware(ownAircraft) {}
+            BlackMisc::Network::CClientAware(clientProvider),
+            BlackMisc::Simulation::COwnAircraftAware(ownAircraftProvider) {}
 
     public:
         /*!

src/blackcore/vatsim/networkvatlib.cpp

@@ -83,8 +83,9 @@ namespace BlackCore
             return cats;
         }
 
-        CNetworkVatlib::CNetworkVatlib(IOwnAircraftProvider *ownAircraft, QObject *parent)
+        CNetworkVatlib::CNetworkVatlib(IClientProvider *clientProvider,
-            : INetwork(ownAircraft, parent),
+                                       IOwnAircraftProvider *ownAircraftProvider, QObject *parent)
+            : INetwork(clientProvider, ownAircraftProvider, parent),
               m_loginMode(LoginNormal),
               m_status(vatStatusDisconnected),
               m_tokenBucket(10, CTime(5, CTimeUnit::s()), 1)

src/blackcore/vatsim/networkvatlib.h

@@ -64,7 +64,10 @@ namespace BlackCore
             static const BlackMisc::CLogCategoryList &getLogCategories();
 
             //! Constructor
-            CNetworkVatlib(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, QObject *parent = nullptr);
+            CNetworkVatlib(
+                BlackMisc::Network::IClientProvider *clientProvider,
+                BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
+                QObject *parent = nullptr);
 
             //! Destructor
             virtual ~CNetworkVatlib();

src/blackmisc/network/clientprovider.cpp

@@ -118,6 +118,12 @@ namespace BlackMisc
             if (m_clientProvider) { return m_clientProvider->removeClient(callsign); }
             return 0;
         }
+
+        CClientProviderDummy *CClientProviderDummy::instance()
+        {
+            static CClientProviderDummy *dummy = new CClientProviderDummy();
+            return dummy;
+        }
     }
     // namespace
 } // namespace

src/blackmisc/network/clientprovider.h

@@ -105,9 +105,17 @@ namespace BlackMisc
             CClientAware() {}
 
             //! Constructor
-            CClientAware(IClientProvider *clientProvider) : m_clientProvider(clientProvider) { Q_ASSERT(clientProvider); }
+            CClientAware(IClientProvider *clientProvider) : m_clientProvider(clientProvider) { }
             IClientProvider *m_clientProvider = nullptr; //!< access to object
         };
+
+        //! Client provider dummy for testing
+        class BLACKMISC_EXPORT CClientProviderDummy: public IClientProvider
+        {
+        public:
+            //! Dummy instance
+            static CClientProviderDummy *instance();
+        };
     } // namespace
 } // namespace
 

tests/blackcore/testnetwork.cpp

@@ -43,6 +43,11 @@ using namespace BlackMisc::PhysicalQuantities;
 
 namespace BlackCoreTest
 {
+    CTestNetwork::CTestNetwork(QObject *parent) :
+        QObject(parent),
+        m_networkVatlib(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), parent)
+    {}
+
     void CTestNetwork::networkTest(BlackCore::INetwork *net)
     {
         const CServer fsdServer = CServer::swiftFsdTestServer(true);
@@ -76,7 +81,7 @@ namespace BlackCoreTest
 
         EXPECT_UNIT(e)
         .send(&INetwork::sendPing, "server")
-        .expect(&INetwork::pongReceived, [](const CCallsign &callsign, const PhysicalQuantities::CTime &elapsedTime)
+        .expect(&INetwork::pongReceived, [](const CCallsign & callsign, const PhysicalQuantities::CTime & elapsedTime)
         {
             qDebug() << "PONG" << callsign << elapsedTime;
         })

tests/blackcore/testnetwork.h

@@ -33,10 +33,7 @@ namespace BlackCoreTest
 
     public:
         //! Constructor.
-        explicit CTestNetwork(QObject *parent = nullptr) :
+        explicit CTestNetwork(QObject *parent = nullptr);
-            QObject(parent),
-            m_networkVatlib(BlackMisc::Simulation::COwnAircraftProviderDummy::instance(), parent)
-        {}
 
     private slots:
         //! Test the vatlib