Changeset 9523 in orxonox.OLD

Timestamp:

Jul 27, 2006, 8:37:24 PM (18 years ago)

Author:

patrick

Message:

of course clients shouldn't forward any messages. forgot one message handling case

File:

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

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

@@ -228 +228 @@
     {
 
-//       RT_ALL_BUT_ME = 1,   //!< message is sent to all users but myself
-//       RT_ALL_ME,           //!< message is sent to all users
-//       RT_USER,             //!< message is only sent to reciever
-//       RT_NOT_USER,         //!< message is sent to all but reciever
-//       RT_SERVER
-
       // find out if this message is addressed for this client too
       if( messageType == RT_ALL_BUT_ME ||
           messageType == RT_ALL_ME ||
+          messageType == RT_NOT_USER && SharedNetworkData::getInstance()->getHostID() != destinationId ||
           messageType == RT_USER  && SharedNetworkData::getInstance()->getHostID() == destinationId ||
           messageType == RT_SERVER && SharedNetworkData::getInstance()->isMasterServer())
@@ -265 +260 @@
       else
       {
-        PRINTF(0)("===========>> Forwarding Message\n");
-        NetworkMessage msg;
-
-        msg.data = new byte[messageLength];
-        memcpy( msg.data, data + i, messageLength );
-        msg.length = messageLength;
-        msg.messageType = (MessageType)messageType;
-        msg.number = userId;
-        msg.senderId = senderId;
-        msg.destinationId = destinationId;
-
-        incomingMessageQueue.push_back( msg );
+        // forwarding the messages but only if its not a client
+        if( !SharedNetworkData::getInstance()->isClient())
+        {
+          PRINTF(0)("===========>> Forwarding Message\n");
+          NetworkMessage msg;
+
+          msg.data = new byte[messageLength];
+          memcpy( msg.data, data + i, messageLength );
+          msg.length = messageLength;
+          msg.messageType = (MessageType)messageType;
+          msg.number = userId;
+          msg.senderId = senderId;
+          msg.destinationId = destinationId;
+
+          incomingMessageQueue.push_back( msg );
+        }
       }
     }