Changeset 9284 in orxonox.OLD

Timestamp:

Jul 14, 2006, 10:32:02 AM (18 years ago)

Author:

patrick

Message:

peerinfos are now gettable from outside

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -40 +40 @@
   this->networkStream = networkStream;
   this->playerNumber = 0;
-  this->localNode = new NetworkNode();
+  this->localNode = new NetworkNode( this->networkStream->getPeerInfo());
 
   this->setSynchronized(false);

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

@@ -16 +16 @@
 #include "network_node.h"
 
-
 #include "debug.h"
 
@@ -23 +22 @@
  * constructor
  */
-NetworkNode::NetworkNode()
+NetworkNode::NetworkNode(PeerInfo* pInfo)
 {
   this->playerNumber = 0;
-  this->nodeType = NET_CLIENT;
+  this->peerInfo = pInfo;
 }
 

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

@@ -9 +9 @@
 #include "base_object.h"
 #include "synchronizeable.h"
+#include "peer_info.h"
 
 #include <list>
 
-class PeerInfo;
 
 //!< a class representing a node in the network (this can be a MASTER_SERVER, PROXY_SERVER or a CLIENT
@@ -18 +18 @@
 {
   public:
-    NetworkNode();
+    NetworkNode(PeerInfo* pInfo);
     ~NetworkNode();
 
@@ -33 +33 @@
     inline int getPlayerNumber() { return this->playerNumber; }
     /** @returns the node type of this node */
-    inline int getNodeType() { return this->nodeType; }
+    inline int getNodeType() { return this->peerInfo->nodeType; }
 
 
   private:
-    int                          nodeType;                     //!< the type of the node
     int                          playerNumber;                 //!< localy direct connected player number
+    PeerInfo*                    peerInfo;                     //!< the peer informationa about this node
 
     /* network nodes directly connected to this node */

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

@@ -107 +107 @@
   this->networkMonitor = NULL;
 
+  this->pInfo = new PeerInfo();
+  this->pInfo->nodeType = NET_CLIENT;
+  this->pInfo->userId = 0;
+  this->pInfo->lastAckedState = 0;
+  this->pInfo->lastRecvedState = 0;
+
   this->myHostId = 0;
   this->currentState = 0;
@@ -154 +160 @@
   for ( SynchronizeableList::const_iterator it = getSyncBegin(); it != getSyncEnd(); it ++ )
     (*it)->setNetworkStream( NULL );
+
+  if( this->pInfo)
+    delete this->pInfo;
 }
 

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

@@ -60 +60 @@
     inline bool isUserClient( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isClient(); }
 
+    /* peering interface */
+    inline PeerInfo & getPeerInfo( int userId ) { return peers[userId]; }
+    inline PeerInfo* getPeerInfo() { return this->pInfo; }
+    inline PeerList getPeerInfoList() { return this->peers; }
 
+    /* data processing*/
     virtual void processData();
 
+    /* debugging */
     void debug();
 
@@ -70 +76 @@
     inline SynchronizeableList::const_iterator getSyncBegin(){ return synchronizeables.begin(); }
     inline SynchronizeableList::const_iterator getSyncEnd(){ return synchronizeables.end(); }
-    inline PeerInfo & getPeerInfo( int userId ) { return peers[userId]; }
     void cleanUpOldSyncList();
     int getSyncCount();
@@ -88 +93 @@
     PeerList                   peers;                       //!< list of the network node informations
 
+    PeerInfo*                  pInfo;                       //!< the info about the local peer node (not in the PeerList)
     int                        nodeType;                    //!< the type of this host (NET_CLIENT, NET_MASTER_SERVER,...)
     int                        myHostId;                    //!< the host id of the localhost