Changeset 9520 in orxonox.OLD

Timestamp:

Jul 27, 2006, 7:40:42 PM (18 years ago)

Author:

patrick

Message:

sender now also include the source and destination userId so they can be propageted correctly through the network

File:

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

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

@@ -102 +102 @@
   assert( n == INTSIZE );
 
+  // write the message down, a message has this structure:
+  //   | data_length | serial_number | message_type | source_id | dest_id | ...data... |
+  //      4byte        4byte            4byte         4byte      4byte     data_length
   for ( std::list<NetworkMessage>::iterator it = outgoingMessageQueue[userId].messages.begin(); it != outgoingMessageQueue[userId].messages.end(); it++ )
   {
@@ -113 +116 @@
 
     n = Converter::intToByteArray( it->messageType, data + i, maxLength );
+    i += n;
+    assert( n == INTSIZE );
+
+    n = Converter::intToByteArray( it->senderId, data + i, maxLength );
+    i += n;
+    assert( n == INTSIZE );
+
+    n = Converter::intToByteArray( it->destinationId, data + i, maxLength );
     i += n;
     assert( n == INTSIZE );
@@ -169 +180 @@
 
   int messageLength, messageType;
-
-  // now go through all newly received messages
+  int senderId, destinationId;
+
+  // now go through all newly received messages and assemble them
   for ( int j = 0; j < nMessages; j++ )
   {
+    // read the length
     assert( i + INTSIZE <= length );
     n = Converter::byteArrayToInt( data + i, &messageLength );
@@ -178 +191 @@
     i += n;
 
+    // read the serial number
     assert( i + INTSIZE <= length );
     n = Converter::byteArrayToInt( data + i, &number );
@@ -183 +197 @@
     i += n;
 
+    // read the message type
     assert( i + INTSIZE <= length );
     n = Converter::byteArrayToInt( data + i, &messageType );
     assert( n == INTSIZE );
     i += n;
+
+    // read the sender id
+    assert( i + INTSIZE <= length );
+    n = Converter::byteArrayToInt( data + i, &senderId );
+    assert( n == INTSIZE );
+    i += n;
+
+    //read the destination id
+    assert( i + INTSIZE <= length );
+    n = Converter::byteArrayToInt( data + i, &destinationId);
+    assert( n == INTSIZE );
+    i += n;
+
 
     if ( number > 0 )
@@ -203 +231 @@
                                                                  messageHandlerMap[(MessageType)messageType].someData, userId ) )
       {
+        // if the message is not handled correctly, bush it back to the incoming packets
         NetworkMessage msg;
 
@@ -210 +239 @@
         msg.messageType = (MessageType)messageType;
         msg.number = userId;
+        msg.senderId = senderId;
+        msg.destinationId = destinationId;
 
         incomingMessageQueue.push_back( msg );
       }
+      // save the serial number for ack signaling
       outgoingMessageQueue[userId].recievedMessages.push_back( number );
       PRINTF(0)("<<< MessageManager: got msg with type: %i\n", messageType);