Changeset 9566 in orxonox.OLD

Timestamp:

Jul 28, 2006, 2:41:07 PM (18 years ago)

Author:

patrick

Message:

major server message forwarding alg fix

File:

• branches/proxy/src/lib/network/message_manager.cc (modified) (3 diffs)

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

@@ -249 +249 @@
 
       // find out if this message is addressed for this client too
-      if( recieverType == RT_ALL_BUT_ME  && SharedNetworkData::getInstance()->getHostID() != destinationId ||
+      if( recieverType == RT_ALL_BUT_ME  && SharedNetworkData::getInstance()->getHostID() != senderId ||
           recieverType == RT_ALL_ME ||
           recieverType == RT_NOT_USER && SharedNetworkData::getInstance()->getHostID() != destinationId ||
@@ -277 +277 @@
         }
       }
-      // or else forward the message to the other servers
-      else
+
+
+      // check if the message needs to be forwarded
+      if( recieverType == RT_ALL_BUT_ME ||
+          recieverType == RT_ALL_ME ||
+          recieverType == RT_NOT_USER ||
+          recieverType == RT_USER  && SharedNetworkData::getInstance()->getHostID() != destinationId ||
+          recieverType == RT_SERVER && SharedNetworkData::getInstance()->isProxyServerActive())
       {
         // forwarding the messages but only if its a proxy
@@ -444 +450 @@
 
     if (
-         recieverType == RT_ALL_ME ||
-         recieverType == RT_ALL_BUT_ME ||
-         recieverType == RT_USER && it->first == reciever ||
-         recieverType == RT_NOT_USER && it->first != reciever ||
-         recieverType == RT_SERVER && getNetworkStream()->isUserMasterServer( it->first ) ||
-         recieverType == RT_SERVER && getNetworkStream()->isUserProxyServerActive( it->first )
+         recieverType == RT_ALL_ME      ||
+         recieverType == RT_ALL_BUT_ME  ||
+         recieverType == RT_USER        && it->first == reciever ||
+         recieverType == RT_NOT_USER    && it->first != reciever ||
+         recieverType == RT_SERVER      && getNetworkStream()->isUserMasterServer( it->first ) ||
+         recieverType == RT_SERVER      && getNetworkStream()->isUserProxyServerActive( it->first )
        )
     {