Changeset 9576 in orxonox.OLD for branches

Timestamp:

Jul 28, 2006, 5:29:51 PM (18 years ago)

Author:

patrick

Message:

fixed the bug, that only one client could connect to the master.

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (1 diff)

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

@@ -386 +386 @@
     if ( tempNetworkSocket )
     {
-      // determine the network node id
-      if ( freeSocketSlots.size() > 0 )
+      // get a userId
+//       if ( freeSocketSlots.size() > 0 )
+//       {
+//         // this should never be called
+//         userId = freeSocketSlots.back();
+//         freeSocketSlots.pop_back();
+//       }
+//       else
       {
-        // this should never be called
-        assert(false);
-        userId = freeSocketSlots.back();
-        freeSocketSlots.pop_back();
-      }
-      else
-      {
-        //userId = 1;
         // each server (proxy and master) have an address space for new network nodes of 1000 nodes
         userId = SharedNetworkData::getInstance()->getHostID() * 1000 + 1;