Changeset 9590 in orxonox.OLD

Timestamp:

Jul 28, 2006, 11:45:42 PM (18 years ago)

Author:

patrick

Message:

some more permission rules for data forwarding to server

File:

• branches/proxy/src/lib/network/synchronizeable.cc (modified) (2 diffs)

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

@@ -232 +232 @@
     // SPECIAL: permission to forward to the master server
     else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserMasterServer(userId)
-             && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
+             && (*it)->checkPermission( PERMISSION_MASTER_SERVER)  && this->networkStream->isUserLocal(userId))
       hasPermission = true;
     else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
@@ -367 +367 @@
              && SharedNetworkData::getInstance()->isClient())
       hasPermission = true;
+    // check for forwarded data
+    else if( this->networkStream->isUserProxyServerActive( userId )  && SharedNetworkData::getInstance()->isMasterServer() &&
+             !this->networkStream->isUserLocal( userId ))
+      hasPermission = true;
     // now check OWNER permissions
     else if( this->owner == userId && (*it)->checkPermission( PERMISSION_OWNER ))