Changeset 9532 in orxonox.OLD

Timestamp:

Jul 27, 2006, 10:16:34 PM (18 years ago)

Author:

patrick

Message:

the synchronizeable now got the correct id

File:

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

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

@@ -799 +799 @@
       assert( offset + INTSIZE <= UDP_PACKET_SIZE );
 
-      // server fakes uniqueid == 0 for handshake
+      // server fakes uniqueid == 0 for handshake synchronizeable
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient() ) &&
              sync.getUniqueID() <= SharedNetworkData::getInstance()->getMaxPlayer() + 1) // plus one to handle one client more than the max to redirect it
-        n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
+        n = Converter::intToByteArray( SharedNetworkData::getInstance()->getHostID()*1000, buf + offset, UDP_PACKET_SIZE - offset );
       else
         n = Converter::intToByteArray( sync.getUniqueID(), buf + offset, UDP_PACKET_SIZE - offset );
@@ -936 +936 @@
       while ( offset + 2 * INTSIZE < length )
       {
+        // read the unique id of the sync
         assert( offset > 0 );
         assert( Converter::byteArrayToInt( buf + offset, &uniqueId ) == INTSIZE );
         offset += INTSIZE;
 
+        // read the data length
         assert( Converter::byteArrayToInt( buf + offset, &syncDataLength ) == INTSIZE );
         offset += INTSIZE;
@@ -951 +953 @@
         for ( SynchronizeableList::iterator it = synchronizeables.begin(); it != synchronizeables.end(); it++ )
         {
-          // client thinks his handshake has id 0!!!!!
-          if ( (*it)->getUniqueID() == uniqueId || ( uniqueId == 0 && (*it)->getUniqueID() == peer->second.userId ) )
+          // client thinks his handshake has a special id: hostId * 1000 (host id of this server)
+          if ( (*it)->getUniqueID() == uniqueId ||
+                 ( uniqueId == 0  && (*it)->getUniqueID() == peer->second.userId ) )
           {
             sync = *it;