Changeset 9453 in orxonox.OLD for branches

Timestamp:

Jul 25, 2006, 11:12:44 AM (18 years ago)

Author:

patrick

Message:

another framework switch

Location:

branches/proxy/src/lib/network

Files:

• network_stream.h (modified) (1 diff)
• synchronizeable.cc (modified) (2 diffs)

branches/proxy/src/lib/network/network_stream.h

@@ -57 +57 @@
     inline bool isUserIdActive( int userID ) { return (peers.find(userID) != peers.end()); }
     inline bool isUserMasterServer( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isMasterServer(); }
-    inline bool isUserProxyServer( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isProxyServerActive(); }
+    inline bool isUserProxyServerActive( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isProxyServerActive(); }
     inline bool isUserClient( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isClient(); }
 

branches/proxy/src/lib/network/synchronizeable.cc

@@ -354 +354 @@
       hasPermission = true;
     // now check PROXY_SERVER permissions
-    else if( this->networkStream->isUserProxyServer( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
+    else if( this->networkStream->isUserProxyServerActive( userId )  && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
       hasPermission = true;
     // now check OWNER permissions
@@ -366 +366 @@
       hasPermission = true;
     // SPECIAL: get write permissions if im sending to a proxy server that does not own this sync
-    else if( this->networkStream->isUserProxyServer( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
+    else if( this->networkStream->isUserProxyServerActive( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
     else