Changeset 9399 in orxonox.OLD

Timestamp:

Jul 24, 2006, 12:00:47 AM (18 years ago)

Author:

patrick

Message:

working on the client number < 3 bug

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (2 diffs)
• proxy/network_settings.cc (modified) (1 diff)

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

@@ -719 +719 @@
 
       // server fakes uniqueid == 0 for handshake
-      if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer() ) && sync.getUniqueID() < SharedNetworkData::getInstance()->getMaxPlayer() - 1 )
+      if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer() ) &&
+             sync.getUniqueID() < SharedNetworkData::getInstance()->getMaxPlayer() - 1 )
         n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
       else
@@ -865 +866 @@
         for ( SynchronizeableList::iterator it = synchronizeables.begin(); it != synchronizeables.end(); it++ )
         {
-        //                                        client thinks his handshake has id 0!!!!!
+          // client thinks his handshake has id 0!!!!!
           if ( (*it)->getUniqueID() == uniqueId || ( uniqueId == 0 && (*it)->getUniqueID() == peer->second.userId ) )
           {

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

@@ -88 +88 @@
 
   // set the new unique id offset
+  // setUniqueID( maxCon+2 ) because we need one id for every handshake
+  // and one for handshake to reject client maxCon+1
   SharedNetworkData::getInstance()->setNewUniqueID( this->maxPlayer + 2);
 }