Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9590 in orxonox.OLD for branches/proxy/src/lib


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

some more permission rules for data forwarding to server

File:
1 edited

Legend:

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

    r9588 r9590  
    232232    // SPECIAL: permission to forward to the master server
    233233    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserMasterServer(userId)
    234              && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
     234             && (*it)->checkPermission( PERMISSION_MASTER_SERVER)  && this->networkStream->isUserLocal(userId))
    235235      hasPermission = true;
    236236    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
     
    367367             && SharedNetworkData::getInstance()->isClient())
    368368      hasPermission = true;
     369    // check for forwarded data
     370    else if( this->networkStream->isUserProxyServerActive( userId )  && SharedNetworkData::getInstance()->isMasterServer() &&
     371             !this->networkStream->isUserLocal( userId ))
     372      hasPermission = true;
    369373    // now check OWNER permissions
    370374    else if( this->owner == userId && (*it)->checkPermission( PERMISSION_OWNER ))
Note: See TracChangeset for help on using the changeset viewer.