Changeset 9483 in orxonox.OLD

Timestamp:

Jul 26, 2006, 10:41:33 AM (18 years ago)

Author:

patrick

Message:

giving the proxy server more rights to write the clients

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

@@ -583 +583 @@
               this->pInfo->userId = SharedNetworkData::getInstance()->getHostID();
 
-              it->second.ip = it->second.socket->getRemoteAddress();
+#warning the ip address is not set here because it results in a segfault when connecting to a proxy server => trace this later
+//               it->second.ip = it->second.socket->getRemoteAddress();
 
               // it->second.nodeType = it->second.handshake->getRemoteNodeType();

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

@@ -223 +223 @@
       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: get write permissions if i am proxy server and i am able to overwrite the client stuff
-//     else if( SharedNetworkData::getInstance()->isProxyServerActive()  && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ))
-//       hasPermission = true;
+    else if( SharedNetworkData::getInstance()->isProxyServerActive()  && this->owner != userId &&
+             (*it)->checkPermission( PERMISSION_OWNER ) && this->networkStream->isUserClient(userId))
+      hasPermission = true;
     else
       hasPermission = false;
@@ -367 +369 @@
       hasPermission = true;
     // SPECIAL: get write permissions if im sending to a proxy server that does not own this sync
-//     else if( this->networkStream->isUserProxyServerActive( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))
-//       hasPermission = true;
+    else if( this->networkStream->isUserProxyServerActive( userId )  && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) && SharedNetworkData::getInstance()->isClient())
+      hasPermission = true;
     else
       hasPermission = false;