Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9588 in orxonox.OLD for branches/proxy


Ignore:
Timestamp:
Jul 28, 2006, 11:13:01 PM (18 years ago)
Author:
patrick
Message:

found another bug: forward permissions from proxy to master

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

Legend:

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

    r9587 r9588  
    671671                ProxyControl::getInstance()->signalNewClient( it->second.userId);
    672672
    673 #warning dont know if this works: nick name handling
    674673                if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
    675674                {
  • branches/proxy/src/lib/network/synchronizeable.cc

    r9581 r9588  
    226226    else if( SharedNetworkData::getInstance()->isMasterServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
    227227      hasPermission = true;
    228     // SPECIAL: get write permissions if i am proxy server and i am able to overwrite the client stuff
     228    // SPECIAL: permission to forward syncs from the master server to the clients
    229229    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
     230             && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
     231      hasPermission = true;
     232    // SPECIAL: permission to forward to the master server
     233    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserMasterServer(userId)
    230234             && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
    231235      hasPermission = true;
Note: See TracChangeset for help on using the changeset viewer.