Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9576 in orxonox.OLD for branches


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/network_stream.cc

    r9575 r9576  
    386386    if ( tempNetworkSocket )
    387387    {
    388       // determine the network node id
    389       if ( freeSocketSlots.size() > 0 )
     388      // get a userId
     389//       if ( freeSocketSlots.size() > 0 )
     390//       {
     391//         // this should never be called
     392//         userId = freeSocketSlots.back();
     393//         freeSocketSlots.pop_back();
     394//       }
     395//       else
    390396      {
    391         // this should never be called
    392         assert(false);
    393         userId = freeSocketSlots.back();
    394         freeSocketSlots.pop_back();
    395       }
    396       else
    397       {
    398         //userId = 1;
    399397        // each server (proxy and master) have an address space for new network nodes of 1000 nodes
    400398        userId = SharedNetworkData::getInstance()->getHostID() * 1000 + 1;
Note: See TracChangeset for help on using the changeset viewer.