Changeset 9588 in orxonox.OLD for branches/proxy/src/lib

Timestamp:

Jul 28, 2006, 11:13:01 PM (18 years ago)

Author:

patrick

Message:

found another bug: forward permissions from proxy to master

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (1 diff)
• synchronizeable.cc (modified) (1 diff)

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

@@ -671 +671 @@
                 ProxyControl::getInstance()->signalNewClient( it->second.userId);
 
-#warning dont know if this works: nick name handling
                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
                 {

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

@@ -226 +226 @@
     else if( SharedNetworkData::getInstance()->isMasterServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
-    // SPECIAL: get write permissions if i am proxy server and i am able to overwrite the client stuff
+    // SPECIAL: permission to forward syncs from the master server to the clients
     else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
+             && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
+      hasPermission = true;
+    // SPECIAL: permission to forward to the master server
+    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserMasterServer(userId)
              && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
       hasPermission = true;