Changeset 9583 in orxonox.OLD

Timestamp:

Jul 28, 2006, 10:07:15 PM (18 years ago)

Author:

patrick

Message:

integration of the networkmonitor into the shared network data, using the new getPeerByUserId

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.h (modified) (1 diff)
• monitor/network_node.cc (modified) (1 diff)
• monitor/network_node.h (modified) (1 diff)
• network_stream.cc (modified) (1 diff)
• proxy/proxy_control.cc (modified) (1 diff)
• shared_network_data.h (modified) (3 diffs)

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -76 +76 @@
 
     inline const std::list<NetworkNode*>& getNodeList() const { return this->nodeList; };
+    inline PeerInfo* getPeerByUserId( int userId) { this->localNode->getPeerByUserId(userId); }
 
     void toggleGUI();

branches/proxy/src/lib/network/monitor/network_node.cc

@@ -154 +154 @@
  * @return the peer info of this node NULL if nothing found
  */
-PeerInfo* NetworkNode::getNodeByUserId( int userId)
+PeerInfo* NetworkNode::getPeerByUserId( int userId)
 {
   // look through the master server lists

branches/proxy/src/lib/network/monitor/network_node.h

@@ -46 +46 @@
     inline std::list<PeerInfo*> getClient() const { return this->clientList; }
 
-    PeerInfo* getNodeByUserId( int userId);
+    PeerInfo* getPeerByUserId( int userId);
 
     /** @returns the number of players */

branches/proxy/src/lib/network/network_stream.cc

@@ -302 +302 @@
   // create the network monitor after all the init work and before there is any connection handlings
   if( this->networkMonitor == NULL)
+  {
     this->networkMonitor = new NetworkMonitor(this);
+    SharedNetworkData::getInstance()->setNetworkMonitor( this->networkMonitor);
+  }
 
 

branches/proxy/src/lib/network/proxy/proxy_control.cc

@@ -89 +89 @@
   assert( Converter::intToByteArray( userId, data, INTSIZE ) == INTSIZE );
   // and the ip as an int
-
+  PeerInfo* pInfo = SharedNetworkData::getInstance()->getNetworkMonitor()->getPeerByUserId(userId);
   assert( Converter::intToByteArray( userId, data, INTSIZE ) == INTSIZE );
 

branches/proxy/src/lib/network/shared_network_data.h

@@ -16 +16 @@
 
 class Synchronizeable;
+class NetworkMonitor;
 
 
@@ -64 +65 @@
     inline void setDefaultSyncStream(NetworkStream* defaultSyncStream) { this->defaultSyncStream = defaultSyncStream; }
 
+    /** @returns the network monitor reference */
+    inline NetworkMonitor* getNetworkMonitor() { return this->networkMonitor; }
+    /** @param networkMonitor sets the NetworkMonitor reference */
+    inline void setNetworkMonitor( NetworkMonitor* networkMonitor) { this->networkMonitor = networkMonitor; }
+
 
   private:
@@ -75 +81 @@
     int                             hostID;                  //!< The Host-ID of the Manager
     NetworkStream*                  defaultSyncStream;       //!< default synchronize NetworkStream
+    NetworkMonitor*                 networkMonitor;          //!< reference to the NetworkMonitor
 
     static SharedNetworkData*       singletonRef;            //!< Pointer to the only instance of this Class