Round trip protection as described in (4)

https://dev.vatsim-germany.org/boards/22/topics/1792?r=1801#message-1801

* Individual context id
* Allows to connect >1 GUIs with core, works for cockpit so far

samples/blackgui/mainwindow.cpp

@@ -201,7 +201,8 @@ void MainWindow::toggleNetworkConnection()
         this->m_ownAircraft.setIcaoInfo(icao);
 
         // set latest aircraft
-        this->getIContextOwnAircraft()->updateOwnAircraft(this->m_ownAircraft, MainWindow::ownAircraftContextOriginator());
+        this->getIContextOwnAircraft()->updateOwnAircraft(this->m_ownAircraft, MainWindow::sampleBlackGuiOriginator());
+
 
         // Login is based on setting current server
         INetwork::LoginMode mode = INetwork::LoginNormal;

samples/blackgui/mainwindow.h

@@ -207,9 +207,9 @@ private:
     void setHotkeys();
 
     //! Originator for aircraft context
-    static const QString &ownAircraftContextOriginator()
+    static const QString &sampleBlackGuiOriginator()
     {
-        static const QString o("GUISAMPLE1");
+        static const QString o = QString("GUISAMPLE1:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
         return o;
     }
 

samples/blackgui/mainwindow_aircraft.cpp

@@ -45,5 +45,5 @@ void MainWindow::setTestPosition(const QString &wgsLatitude, const QString &wgsL
 
     this->m_ownAircraft.setPosition(coordinate);
     this->m_ownAircraft.setAltitude(altitude);
-    this->getIContextOwnAircraft()->updateOwnPosition(coordinate, altitude, MainWindow::ownAircraftContextOriginator());
+    this->getIContextOwnAircraft()->updateOwnPosition(coordinate, altitude, MainWindow::sampleBlackGuiOriginator());
 }

src/blackcore/context.h

@@ -83,6 +83,9 @@ namespace BlackCore
         //! Simulator
         IContextSimulator *getIContextSimulator();
 
+        //! Id and path name for round trip protection
+        virtual QString getPathAndContextId() const = 0;
+
     protected:
         //! Constructor
         CContext(CRuntimeConfig::ContextMode mode, QObject *parent) :
@@ -91,6 +94,15 @@ namespace BlackCore
 
         CRuntimeConfig::ContextMode m_mode; //!< How context is used
         qint64 m_contextId; //!< unique identifer, avoid redirection rountrips
+
+        //! Path and context id
+        QString buildPathAndContextId(const QString &path) const
+        {
+            return QString(path).
+                   append(':').
+                   append(QString::number(this->getUniqueId()));
+        }
+
     };
 }
 #endif // guard

src/blackcore/context_application.h

@@ -66,6 +66,9 @@ namespace BlackCore
             return s;
         }
 
+        //! \copydoc CContext::getPathAndContextId()
+        virtual QString getPathAndContextId() const { return this->buildPathAndContextId(ObjectPath()); }
+
         //! Destructor
         virtual ~IContextApplication() {}
 

src/blackcore/context_audio.h

@@ -47,6 +47,9 @@ namespace BlackCore
             return s;
         }
 
+        //! \copydoc CContext::getPathAndContextId()
+        virtual QString getPathAndContextId() const { return this->buildPathAndContextId(ObjectPath()); }
+
         //! \brief Destructor
         virtual ~IContextAudio() {}
 

src/blackcore/context_network.h

@@ -43,6 +43,9 @@ namespace BlackCore
             return s;
         }
 
+        //! \copydoc CContext::getPathAndContextId()
+        virtual QString getPathAndContextId() const { return this->buildPathAndContextId(ObjectPath()); }
+
         //! Destructor
         virtual ~IContextNetwork() {}
 

src/blackcore/context_settings.h

@@ -62,6 +62,9 @@ namespace BlackCore
             return s;
         }
 
+        //! \copydoc CContext::getPathAndContextId()
+        virtual QString getPathAndContextId() const { return this->buildPathAndContextId(ObjectPath()); }
+
         /*!
          * \brief Path for network settings
          * \remarks no to be confused with DBus paths

src/blackcore/context_simulator.h

@@ -42,6 +42,9 @@ namespace BlackCore
             return s;
         }
 
+        //! \copydoc CContext::getPathAndContextId()
+        virtual QString getPathAndContextId() const { return this->buildPathAndContextId(ObjectPath()); }
+
         //! Destructor
         virtual ~IContextSimulator() {}
 

src/blackgui/cockpitv1component.cpp

@@ -131,7 +131,7 @@ namespace BlackGui
 
     const QString &CCockpitV1Component::cockpitOriginator()
     {
-        static const QString o("cockpit v1");
+        static const QString o = QString("COCKPITV1:").append(QString::number(QDateTime::currentMSecsSinceEpoch()));
         return o;
     }