Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9488 in orxonox.OLD


Ignore:
Timestamp:
Jul 26, 2006, 11:27:32 AM (18 years ago)
Author:
patrick
Message:

now clients do also accept proxys as athorities, i hope

File:
1 edited

Legend:

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

    r9487 r9488  
    357357      hasPermission = true;
    358358    // now check PROXY_SERVER permissions
    359     else if( this->networkStream->isUserProxyServerActive( userId )  && (*it)->checkPermission( PERMISSION_PROXY_SERVER ))
     359    else if( this->networkStream->isUserProxyServerActive( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER )
     360             && SharedNetworkData::getInstance()->isClient())
    360361      hasPermission = true;
    361362    // now check OWNER permissions
     
    392393    else
    393394    {
    394       PRINTF(0)("DONT SET VAR BECAUSE OF PERMISSION: %s perm: %d %d %d - %d %d %d\n", (*it)->getName().c_str(), (*it)->checkPermission( PERMISSION_MASTER_SERVER ), (*it)->checkPermission( PERMISSION_OWNER ), (*it)->checkPermission( PERMISSION_ALL ), networkStream->isUserMasterServer( userId ), this->owner, userId );
     395//       PRINTF(0)("DONT SET VAR BECAUSE OF PERMISSION: %s perm: %d %d %d - %d %d %d\n", (*it)->getName().c_str(), (*it)->checkPermission( PERMISSION_MASTER_SERVER ), (*it)->checkPermission( PERMISSION_OWNER ), (*it)->checkPermission( PERMISSION_ALL ), networkStream->isUserMasterServer( userId ), this->owner, userId );
    395396      n = (*it)->getSizeFromBuf( stateTo->data + i, stateTo->dataLength - i );
    396397      //NETPRINTF(0)("%s::setvar %s %d\n", getClassCName(), (*it)->getName().c_str(), n);
Note: See TracChangeset for help on using the changeset viewer.