Changeset 9514 in orxonox.OLD for branches/proxy

Timestamp:

Jul 27, 2006, 6:07:18 PM (18 years ago)

Author:

patrick

Message:

messag reciving debug

Location:

branches/proxy/src/lib/network

Files:

• README.NETWORK (modified) (2 diffs)
• message_manager.cc (modified) (3 diffs)
• message_manager.h (modified) (1 diff)

branches/proxy/src/lib/network/README.NETWORK

@@ -13 +13 @@
  - actualy the whole message sending system won't work in this network topic. proxys have to relay messages to clients
  - the clients cant get its ip in the handleHandshakes without throuwing sigseg
+ - MessageManager: proxy/server forward the messages always. Perhaps there is a case, where messages get forwarded forever if there is a loop in the network. think about it again.
 
 
@@ -72 +73 @@
 
 
+MessageManager:
+===============
+The message manager has special handling if its a master/proxy: the messages will simply be forwarded to the other server

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

@@ -170 +170 @@
   int messageLength, messageType;
 
-  // now go through all messages
+  // now go through all newly received messages
   for ( int j = 0; j < nMessages; j++ )
   {
@@ -199 +199 @@
          outgoingMessageQueue[userId].recievedMessages.end() )
     {
-      if ( !(*(messageHandlerMap[(MessageType)messageType].cb))( (MessageType)messageType, data + i, messageLength, messageHandlerMap[(MessageType)messageType].someData, userId ) )
+      if ( !(*(messageHandlerMap[(MessageType)messageType].cb))( (MessageType)messageType, data + i, messageLength,
+                                                                 messageHandlerMap[(MessageType)messageType].someData, userId ) )
       {
         NetworkMessage msg;
@@ -216 +217 @@
   }
 
-
+  // now call the message handlers with the new message
   //TODO maybe handle incomingMessage in tick function. else local messages will not be handled if no clients are connected
   for ( std::list<NetworkMessage>::iterator it = incomingMessageQueue.begin(); it != incomingMessageQueue.end();  )
   {
+    PRINTF(0)(" MessageManager: got msg with type: %i\n", it->messageType);
+
     if ( (*(messageHandlerMap[it->messageType].cb))( it->messageType, it->data, it->length, messageHandlerMap[it->messageType].someData, it->number ) )
     {

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

@@ -81 +81 @@
 struct MessageHandler
 {
-  MessageCallback cb;
+  MessageCallback   cb;
   MessageType       messageType;
-  void *          someData;
+  void *            someData;
 };