Changeset 9531 in orxonox.OLD

Timestamp:

Jul 27, 2006, 9:59:32 PM (18 years ago)

Author:

patrick

Message:

found the bug reason: assigning an individual address space for every server (proxy and master)

Location:

branches/proxy/src/lib/network

Files:

• README.NETWORK (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)
• player_stats.cc (modified) (1 diff)

branches/proxy/src/lib/network/README.NETWORK

@@ -49 +49 @@
 
 
+The ids are created by the master/proxy servers. Each server receives an address space of 1000 nodes where it is able to assign nodes to. This address space could be extended quite easely, since we got plenty of numbers in 4bytes (integer)
+
+
 
 uniqueId:

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

@@ -388 +388 @@
       if ( freeSocketSlots.size() > 0 )
       {
+        // this should never be called
+        assert(false);
         userId = freeSocketSlots.back();
         freeSocketSlots.pop_back();
@@ -393 +395 @@
       else
       {
-        userId = 1;
+        //userId = 1;
+        // each server (proxy and master) have an address space for new network nodes of 1000 nodes
+        userId = SharedNetworkData::getInstance()->getHostID() * 1000;
 
         for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
           if ( it->first >= userId )
             userId = it->first + 1;
+
+        assert( userId < (SharedNetworkData::getInstance()->getHostID() + 1) * 1000);
       }
       // this creates a new entry in the peers list

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

@@ -141 +141 @@
 void PlayerStats::setPlayableUniqueId( int uniqueId )
 {
-  PRINTF(0)("SET PLAYABLE!!!!!!!!!!11\n\n");
   const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );