Changeset 9511 in orxonox.OLD

Timestamp:

Jul 27, 2006, 4:05:39 PM (18 years ago)

Author:

patrick

Message:

produced segfault by double sending messages. fixed

File:

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

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

@@ -327 +327 @@
   for ( MessageQueue::iterator it = this->outgoingMessageQueue.begin(); it != this->outgoingMessageQueue.end(); it++ )
   {
+
+        // 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 );
+    }
     // check for every node if the message is for it also
-    if (
+    else if (
          recieverType == RT_ALL_ME ||
          recieverType == RT_ALL_BUT_ME ||
@@ -349 +364 @@
     }
 
-    // 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 );
-    }
+
   }