Changeset 9285 in orxonox.OLD

Timestamp:

Jul 14, 2006, 10:46:13 AM (18 years ago)

Author:

patrick

Message:

another standardisation: less different types with the same content

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -157 +157 @@
 }
 
+
+void NetworkMonitor::debug()
+{
+  PRINTF(0)("================================= Network Monitor ========\n");
+  PRINTF(0)(" Total count of network nodes: %i\n", this->playerNumber);
+
+}
+

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

@@ -56 +56 @@
 
     void process();
+    void debug();
 
 

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

@@ -64 +64 @@
   this->init();
   /* initialize the references */
-  this->nodeType = NET_CLIENT;
+  this->pInfo->nodeType = NET_CLIENT;
 }
 
@@ -75 +75 @@
 NetworkStream::NetworkStream( std::string host, int port )
 {
-  this->nodeType = NET_CLIENT;
   this->init();
+  // init the peers[0] the server to ceonnect to
   this->peers[0].socket = new UdpSocket( host, port );
   this->peers[0].userId = 0;
   this->peers[0].nodeType = NET_MASTER_SERVER;
   this->peers[0].connectionMonitor = new ConnectionMonitor( 0 );
+  // and set also the localhost
+  this->pInfo->nodeType = NET_CLIENT;
 }
 
@@ -90 +92 @@
 NetworkStream::NetworkStream( int port )
 {
-  this->nodeType = NET_MASTER_SERVER;
   this->init();
   this->serverSocket = new UdpServerSocket(port);
+  this->pInfo->nodeType = NET_MASTER_SERVER;
 }
 
@@ -108 +110 @@
 
   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;
 
@@ -184 +185 @@
 void NetworkStream::startHandshake()
 {
-  Handshake* hs = new Handshake(this->nodeType);
+  Handshake* hs = new Handshake(this->pInfo->nodeType);
   hs->setUniqueID( 0 );
   assert( peers[0].handshake == NULL );
@@ -245 +246 @@
   }
 
-  if ( this->nodeType == NET_MASTER_SERVER )
+  if ( this->pInfo->nodeType == NET_MASTER_SERVER )
   {
     // execute everytthing the master server shoudl do
@@ -253 +254 @@
     this->updateConnectionList();
   }
-  else if( this->nodeType == NET_PROXY_SERVER)
+  else if( this->pInfo->nodeType == NET_PROXY_SERVER)
   {
     // execute everything the proxy server should do
@@ -311 +312 @@
       freeSocketSlots.pop_back();
       peers[clientId].socket = tempNetworkSocket;
-      peers[clientId].handshake = new Handshake(this->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
+      peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
       peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
       peers[clientId].handshake->setUniqueID(clientId);
@@ -326 +327 @@
 
       peers[clientId].socket = tempNetworkSocket;
-      peers[clientId].handshake = new Handshake(this->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
+      peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
@@ -408 +409 @@
 {
   if( this->isMasterServer())
-    PRINT(0)(" Host ist Server with ID: %i\n", this->myHostId);
+    PRINT(0)(" Host ist Server with ID: %i\n", this->pInfo->userId);
   else
-    PRINT(0)(" Host ist Client with ID: %i\n", this->myHostId);
+    PRINT(0)(" Host ist Client with ID: %i\n", this->pInfo->userId);
 
   PRINT(0)(" Got %i connected Synchronizeables, showing active Syncs:\n", this->synchronizeables.size());
@@ -456 +457 @@
           if ( !it->second.handshake->allowDel() )
           {
-            if ( this->nodeType == NET_CLIENT )
+            if ( this->pInfo->nodeType == NET_CLIENT )
             {
               SharedNetworkData::getInstance()->setHostID( it->second.handshake->getHostId() );
-              myHostId = SharedNetworkData::getInstance()->getHostID();
-
-//               PRINTF(0)("remote host is a %i\n", it->second.handshake->getRemoteNodeType());
+              this->pInfo->userId = SharedNetworkData::getInstance()->getHostID();
+
               it->second.nodeType = it->second.handshake->getRemoteNodeType();
               this->networkMonitor->addNode(&it->second);
@@ -480 +480 @@
             if ( it->second.handshake->canDel() )
             {
-              if ( this->nodeType == NET_MASTER_SERVER )
+              if ( this->pInfo->nodeType == NET_MASTER_SERVER )
               {
                 it->second.nodeType = it->second.handshake->getRemoteNodeType();

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

@@ -48 +48 @@
 
     /* functions for the localhost settings */
-    inline bool isMasterServer() const { return (this->nodeType == NET_MASTER_SERVER)? true:false; }
-    inline bool isProxyServer() const { return (this->nodeType == NET_PROXY_SERVER)? true:false; }
-    inline bool isClient() const { return (this->nodeType == NET_CLIENT)? true:false; }
+    inline bool isMasterServer() const { return (this->pInfo->nodeType == NET_MASTER_SERVER)? true:false; }
+    inline bool isProxyServer() const { return (this->pInfo->nodeType == NET_PROXY_SERVER)? true:false; }
+    inline bool isClient() const { return (this->pInfo->nodeType == NET_CLIENT)? true:false; }
 //     inline bool isActive() const { return this->bActive; }
     inline int getMaxConnections(){ return MAX_CONNECTIONS; }
@@ -94 +94 @@
 
     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
 
     std::list<int>             freeSocketSlots;             //!< list of free sockets (to ensure not to resycle sockets)