Changeset 9653 in orxonox.OLD for branches/proxy/src/lib/network/message_manager.cc

Timestamp:

Aug 1, 2006, 12:39:03 AM (18 years ago)

Author:

patrick

Message:

some more smaller works:

• fixed a bug preventing clients/proxies to connect to server
• started an implementation of a soft-reconnection
• fixed a bug preventing more than one proxy to connect to a ms

File:

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

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

@@ -239 +239 @@
       outgoingMessageQueue[userId].toAck.push_back( number );
 
+//     PRINTF(0)("got message with type: %i\n", messageType);
     assert( i + messageLength <= length );
     // make sure there is a message handler for this message type
-    assert( messageHandlerMap.find( (MessageType)messageType ) == messageHandlerMap.end());
+    assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end());
 
 
@@ -453 +454 @@
          recieverType == RT_ALL_BUT_ME  ||
          recieverType == RT_USER        && it->first == reciever ||
-        recieverType == RT_USER        && reciever == NET_ID_MASTER_SERVER && !getNetworkStream()->isUserMasterServer( it->first ) ||  // special case: forward
+         recieverType == RT_USER        && reciever == NET_ID_MASTER_SERVER && !getNetworkStream()->isUserMasterServer( it->first ) ||  //(*)
          recieverType == RT_NOT_USER    && it->first != reciever ||
          recieverType == RT_SERVER      && getNetworkStream()->isUserMasterServer( it->first ) ||
          recieverType == RT_SERVER      && getNetworkStream()->isUserProxyServerActive( it->first )
-       )
+       )// (*) special case: forward
     {
       NetworkMessage msg;