Changeset 9509 in orxonox.OLD

Timestamp:

Jul 27, 2006, 3:55:22 PM (18 years ago)

Author:

patrick

Message:

starting special implementation for message forwarding (pipeing)

File:

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

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

@@ -324 +324 @@
 void MessageManager::sendMessage( MessageType messageType, byte * data, int dataLength, RecieverType recieverType, int reciever, MessagePriority messagePriority )
 {
-
+  // go through all outgoing message queues and add the message if its appropriate
   for ( MessageQueue::iterator it = this->outgoingMessageQueue.begin(); it != this->outgoingMessageQueue.end(); it++ )
   {
+    // check for every node if the message is for it also
     if (
          recieverType == RT_ALL_ME ||
@@ -332 +333 @@
          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_SERVER && getNetworkStream()->isUserMasterServer( it->first )
        )
     {
@@ -342 +342 @@
       msg.length = dataLength;
       msg.messageType = messageType;
-      msg.number = newNumber++;
+      msg.number = this->newNumber++;
       msg.priority = messagePriority;
 
       it->second.messages.push_back( msg );
     }
-  }
-
+
+    // relay server special handling
+    if( SharedNetworkData::getInstance()->isMasterServer() && SharedNetworkData::getInstance()->isUserProxyServerActive(it->first))
+    {
+      NetworkMessage msg;
+
+      msg.data = new byte[dataLength];
+      memcpy( msg.data, data, dataLength );
+      msg.length = dataLength;
+      msg.messageType = messageType;
+      msg.number = this->newNumber++;
+      msg.priority = messagePriority;
+
+      it->second.messages.push_back( msg );
+    }
+  }
+
+
+  // if the message is also for myself, handle it here
   if ( recieverType == RT_ALL_ME )
   {