Changeset 9402 in orxonox.OLD

Timestamp:

Jul 24, 2006, 9:26:31 AM (18 years ago)

Author:

patrick

Message:

fixed another bug: anomality in the permissions settings. Mr Data made a full scan, investigation closed. Mr Helm, bring us out of orbit

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -720 +720 @@
       // server fakes uniqueid == 0 for handshake
       if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer() ) &&
-             sync.getUniqueID() < SharedNetworkData::getInstance()->getMaxPlayer() + 1 )
+             sync.getUniqueID() <= SharedNetworkData::getInstance()->getMaxPlayer())
         n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
       else

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

@@ -229 +229 @@
     else
       hasPermission = false;
+
+    PRINTF(0)("i have |%i| permission to getStateDiff %s\n", hasPermission, (*it)->getName().c_str());
 
 
@@ -357 +359 @@
       hasPermission = true;
     // now check OWNER permissions
-    else if( this->owner == SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
+    else if( this->owner == userId && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
     // now check ALL permissions
     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
-    else if( this->networkStream->isUserMasterServer( userId ) && 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
-    else if( this->networkStream->isUserProxyServer( userId )  && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
+    // SPECIAL: get write permissions if im sending to a master server that does not own this sync
+    else if( this->networkStream->isUserMasterServer( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
+      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 ))
       hasPermission = true;
     else
       hasPermission = false;
+
+
+    PRINTF(0)("i have |%i| permission to write %s\n", hasPermission, (*it)->getName().c_str());
 
     // if it has the permission to write do it