Changeset 9591 in orxonox.OLD

Timestamp:

Jul 28, 2006, 11:51:26 PM (18 years ago)

Author:

patrick

Message:

proxy server permissions do not yet work absolutly well

File:

• branches/proxy/src/lib/network/synchronizeable.cc (modified) (1 diff)

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

@@ -210 +210 @@
     // check if this synchronizeable has the permissions to write the data
 
-    // first check MASTER_SERVER permissions
+    //  MASTER_SERVER |====> *
     if( SharedNetworkData::getInstance()->isMasterServer() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
       hasPermission = true;
-    // now check PROXY_SERVER permissions
+    else if( SharedNetworkData::getInstance()->isMasterServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
+      hasPermission = true;
+    // PROXY_SERVER  |====> *
     else if( SharedNetworkData::getInstance()->isProxyServerActive() && (*it)->checkPermission( PERMISSION_PROXY_SERVER ))
       hasPermission = true;
-    // now check OWNER permissions
+    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
+      hasPermission = true;
+    // OWNER         |====> *
     else if( this->owner == SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
-    // now check ALL permissions
+    // ALL           |====> *
     else if( (*it)->checkPermission( PERMISSION_ALL ))
-      hasPermission = true;
-    // SPECIAL: get write permissions if i am master server and i am able to overwrite the client stuff
-#warning this could probably override also clients that are connected to another proxy: the master server overwrites it
-    else if( SharedNetworkData::getInstance()->isMasterServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
     // SPECIAL: permission to forward syncs from the master server to the clients