Changeset 9519 in orxonox.OLD

Timestamp:

Jul 27, 2006, 7:24:41 PM (18 years ago)

Author:

patrick

Message:

extending the message structure

Location:

branches/proxy/src/lib/network

Files:

• message_manager.cc (modified) (6 diffs)
• message_manager.h (modified) (1 diff)

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

@@ -199 +199 @@
          outgoingMessageQueue[userId].recievedMessages.end() )
     {
+      // call the handler function and handle errors
       if ( !(*(messageHandlerMap[(MessageType)messageType].cb))( (MessageType)messageType, data + i, messageLength,
                                                                  messageHandlerMap[(MessageType)messageType].someData, userId ) )
@@ -211 +212 @@
 
         incomingMessageQueue.push_back( msg );
-        PRINTF(0)("<<< MessageManager: got msg with type: %i\n", messageType);
       }
       outgoingMessageQueue[userId].recievedMessages.push_back( number );
+      PRINTF(0)("<<< MessageManager: got msg with type: %i\n", messageType);
     }
     i += messageLength;
@@ -342 +343 @@
       msg.messageType = messageType;
       msg.number = this->newNumber++;
+      msg.senderId = SharedNetworkData::getInstance()->getHostID();
+      msg.destinationId = reciever;
       msg.priority = messagePriority;
 
@@ -356 +359 @@
       msg.messageType = messageType;
       msg.number = this->newNumber++;
+      msg.senderId = SharedNetworkData::getInstance()->getHostID();
+      msg.destinationId = reciever;
       msg.priority = messagePriority;
 
@@ -377 +382 @@
       msg.messageType = messageType;
       msg.number = this->newNumber++;
+      msg.senderId = SharedNetworkData::getInstance()->getHostID();
+      msg.destinationId = reciever;
       msg.priority = messagePriority;
 
@@ -396 +403 @@
     msg.messageType = messageType;
     msg.number = SharedNetworkData::getInstance()->getHostID();
+    msg.senderId = SharedNetworkData::getInstance()->getHostID();
+    msg.destinationId = reciever;
     msg.priority = messagePriority;
 

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

@@ -61 +61 @@
 struct NetworkMessage
 {
-  MessageType        messageType;
-  byte *           data;
-  int              length;
-  int              number;
-  MessagePriority  priority;
+  MessageType      messageType;                         //!< type of the message
+  byte *           data;                                //!< data
+  int              length;                              //!< length of the data
+  int              number;                              //!< serial number
+  int              senderId;                            //!< userId of the sender
+  int              destinationId;                       //!< userId of the destination
+  MessagePriority  priority;                            //!< priority of the messages
 };