Changeset 7681 in orxonox.OLD for branches/network/src/lib/network/network_stream.cc

Timestamp:

May 18, 2006, 2:32:47 PM (18 years ago)

Author:

rennerc

Message:

finished and tested MessageManager

File:

• branches/network/src/lib/network/network_stream.cc (modified) (5 diffs)

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

@@ -134 +134 @@
   // and one for handshake to reject client maxCon+1
   this->networkGameManager->setUniqueID( MAX_CONNECTIONS + 2 );
-
+  MessageManager::getInstance()->setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
 }
 
@@ -219 +219 @@
       freeSocketSlots.pop_back();
       peers[clientId].socket = tempNetworkSocket;
-      peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID());
+      peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].userId = clientId;
@@ -232 +232 @@
       
       peers[clientId].socket = tempNetworkSocket;
-      peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID());
+      peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].userId = clientId;
@@ -333 +333 @@
             this->networkGameManager = NetworkGameManager::getInstance();
             this->networkGameManager->setUniqueID( it->second.handshake->getNetworkGameManagerId() );
+            MessageManager::getInstance()->setUniqueID( it->second.handshake->getMessageManagerId() );
           }
 
@@ -446 +447 @@
       continue;
 
-    while ( packetLength = peer->second.socket->readPacket( buf, UDP_PACKET_SIZE ) > 0 )
+    while ( 0 < (packetLength = peer->second.socket->readPacket( buf, UDP_PACKET_SIZE )) )
     {