Changeset 9636 in orxonox.OLD

Timestamp:

Jul 31, 2006, 2:22:22 AM (18 years ago)

Author:

patrick

Message:

connection redirection now works also as it should

Location:

branches/proxy/src/lib/network

Files:

• message_manager.cc (modified) (1 diff)
• network_manager.cc (modified) (1 diff)
• synchronizeable.cc (modified) (3 diffs)

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

@@ -453 +453 @@
          recieverType == RT_ALL_BUT_ME  ||
          recieverType == RT_USER        && it->first == reciever ||
+        recieverType == RT_USER        && reciever == NET_ID_MASTER_SERVER && !getNetworkStream()->isUserMasterServer( it->first ) ||  // special case: forward
          recieverType == RT_NOT_USER    && it->first != reciever ||
          recieverType == RT_SERVER      && getNetworkStream()->isUserMasterServer( it->first ) ||

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

@@ -170 +170 @@
   this->networkStream->connectToMasterServer( name, port);
 
+
   // and start the handshake
   this->networkStream->startHandshake();

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

@@ -412 +412 @@
         hasPermission = true; b3 = true; }
 
+
+
     // Permission   MASTER_SERVER accept if:
     // sender == MASTER_SERVER
@@ -426 +428 @@
                SharedNetworkData::getInstance()->isClient()*/) {
       hasPermission = true; b6 = true; }
-    // sender == SERVER && i am SERVER && user is not local
-//     else if(  (*it)->checkPermission( PERMISSION_SERVER ) &&
-//                 !SharedNetworkData::getInstance()->isUserClient( userId) &&
-//                 !SharedNetworkData::getInstance()->isClient() &&
-//                 !(SharedNetworkData::getInstance()->isUserLocal( this->owner) &&
-//                 this->owner !=  SharedNetworkData::getInstance()->getHostID())) {
-//       hasPermission = true; b7 = true; }
+
 
 
@@ -438 +434 @@
     else if(  (*it)->checkPermission( PERMISSION_ALL )) {
       hasPermission = true; b8 = true; }
+
 
    // no rights to over-write local data