Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9453 in orxonox.OLD for branches/proxy/src/lib/network


Ignore:
Timestamp:
Jul 25, 2006, 11:12:44 AM (18 years ago)
Author:
patrick
Message:

another framework switch

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

Legend:

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

    r9452 r9453  
    5757    inline bool isUserIdActive( int userID ) { return (peers.find(userID) != peers.end()); }
    5858    inline bool isUserMasterServer( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isMasterServer(); }
    59     inline bool isUserProxyServer( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isProxyServerActive(); }
     59    inline bool isUserProxyServerActive( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isProxyServerActive(); }
    6060    inline bool isUserClient( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isClient(); }
    6161
  • branches/proxy/src/lib/network/synchronizeable.cc

    r9452 r9453  
    354354      hasPermission = true;
    355355    // now check PROXY_SERVER permissions
    356     else if( this->networkStream->isUserProxyServer( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
     356    else if( this->networkStream->isUserProxyServerActive( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
    357357      hasPermission = true;
    358358    // now check OWNER permissions
     
    366366      hasPermission = true;
    367367    // SPECIAL: get write permissions if im sending to a proxy server that does not own this sync
    368     else if( this->networkStream->isUserProxyServer( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
     368    else if( this->networkStream->isUserProxyServerActive( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
    369369      hasPermission = true;
    370370    else
Note: See TracChangeset for help on using the changeset viewer.