Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9597 in orxonox.OLD for branches/proxy


Ignore:
Timestamp:
Jul 29, 2006, 1:58:13 AM (18 years ago)
Author:
patrick
Message:

new address space works, there is probably a permission error somewhere

Location:
branches/proxy/src/lib/network
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/README.NETWORK

    r9573 r9597  
    11
     2
     3WORD OF WARNING:
     4================
     5 - Allways keep the network_settings.conf file from the data repos up-to-date!! Its very important, that the user numbers are synchronized!
    26
    37
  • branches/proxy/src/lib/network/network_stream.cc

    r9595 r9597  
    259259  Handshake* hs = new Handshake(this->pInfo->nodeType);
    260260  // fake the unique id
    261   hs->setUniqueID( NET_UID_HANDSHAKE );
     261  hs->setUniqueID( userId);
    262262  assert( this->peers[userId].handshake == NULL );
    263263  this->peers[userId].handshake = hs;
     
    993993        {
    994994          // client thinks his handshake has a special id: hostId * 1000 (host id of this server)
    995           if ( (*it)->getUniqueID() == uniqueId ||
    996                  ( uniqueId == 0  && (*it)->getUniqueID() == peer->second.userId ) )
     995          if ( (*it)->getUniqueID() == uniqueId ||                                          // so this client exists already go to sync work
     996                 ( uniqueId == 0  && (*it)->getUniqueID() == peer->second.userId ) )        // so this is a Handshake!
    997997          {
    998998            sync = *it;
Note: See TracChangeset for help on using the changeset viewer.