Changeset 9598 in orxonox.OLD

Timestamp:

Jul 29, 2006, 2:15:52 AM (18 years ago)

Author:

patrick

Message:

redirection seems to work good now

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

@@ -732 +732 @@
   // disconnect from the current server and reconnect to proxy server
   this->handleDisconnect( userId);
-  this->connectToProxyServer(NET_ID_PROXY_SERVER_01, 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

@@ -364 +364 @@
     // check if this synchronizeable has the permissions to write the data
 
-#if 0
-
-    //  MASTER_SERVER |====> *
-    if( SharedNetworkData::getInstance()->isMasterServer() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
-      hasPermission = true;
-    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;
-    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
-      hasPermission = true;
-    // PROXY_SERVER  |====> MASTER_SERVER
-    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserMasterServer(userId)
-             && this->networkStream->isUserLocal(userId) && (*it)->checkPermission( PERMISSION_MASTER_SERVER))
-      hasPermission = true;
-    // PROXY_SERVER  |====> CLIENT
-    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
-             && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) )
-      hasPermission = true;
-    else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->networkStream->isUserClient(userId)
-             && (*it)->checkPermission( PERMISSION_MASTER_SERVER) )
-      hasPermission = true;
-
-    // OWNER         |====> *
-    else if( this->owner == SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
-      hasPermission = true;
-
-    // ALL           |====> *
-    else if( (*it)->checkPermission( PERMISSION_ALL ))
-      hasPermission = true;
-
-    else
-      hasPermission = false;
-
-#endif
+