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

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)

File:

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

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