Changeset 9605 in orxonox.OLD

Timestamp:

Jul 29, 2006, 11:46:07 AM (18 years ago)

Author:

patrick

Message:

MARK: there seems to be still a bug in the permissions system. trying to trace

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -767 +767 @@
 /**
  * this functions handles a reconnect event received from the a NET_MASTER_SERVER or NET_PROXY_SERVER
+ * @param userId
  */
 void NetworkStream::handleReconnect(int userId)
@@ -792 +793 @@
   // disconnect from the current server and reconnect to proxy server
   this->handleDisconnect( userId);
-//   this->connectToProxyServer(NET_ID_PROXY_SERVER_01, proxyIP.ipString(), 9999);
-  this->connectToMasterServer(proxyIP.ipString(), 9999);
+  this->connectToProxyServer(NET_ID_PROXY_SERVER_01, proxyIP.ipString(), 9999);
+//   this->connectToMasterServer(proxyIP.ipString(), 9999);
   #warning the ports are not yet integrated correctly in the ip class
 

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

@@ -365 +365 @@
 
 
-
-
     //  *              <====|  MASTER_SERVER
     if(  this->networkStream->isUserMasterServer( userId ) && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
       hasPermission = true;
-    else if( this->networkStream->isUserMasterServer( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID()
-             && (*it)->checkPermission( PERMISSION_OWNER ))
+    else if( this->networkStream->isUserMasterServer( userId ) &&
+             this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
       hasPermission = true;
 
     //  *              <====|  PROXY_SERVER
-    else if( this->networkStream->isUserProxyServerActive( 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;
     //  CLIENT         <====|  PROXY_SERVER
-    else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()
-             && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
-      hasPermission = true;
-    else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()
-             && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
-      hasPermission = true;
     else if( this->networkStream->isUserProxyServerActive( userId )  && SharedNetworkData::getInstance()->isClient()
              && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))