Changeset 9522 in orxonox.OLD for branches

Timestamp:

Jul 27, 2006, 8:29:32 PM (18 years ago)

Author:

patrick

Message:

new the message handler is checking, if this message is also for the local host. if not the system tries to relay the message

Location:

branches/proxy/src

Files:

• lib/network/message_manager.cc (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (3 diffs)
• lib/network/player_stats.cc (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (7 diffs)
• world_entities/spawning_point.cc (modified) (1 diff)

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

@@ -227 +227 @@
          outgoingMessageQueue[userId].recievedMessages.end() )
     {
+
+//       RT_ALL_BUT_ME = 1,   //!< message is sent to all users but myself
+//       RT_ALL_ME,           //!< message is sent to all users
+//       RT_USER,             //!< message is only sent to reciever
+//       RT_NOT_USER,         //!< message is sent to all but reciever
+//       RT_SERVER
+
+      // find out if this message is addressed for this client too
+      if( messageType == RT_ALL_BUT_ME ||
+          messageType == RT_ALL_ME ||
+          messageType == RT_USER  && SharedNetworkData::getInstance()->getHostID() == destinationId ||
+          messageType == RT_SERVER && SharedNetworkData::getInstance()->isMasterServer())
+      {
+
       // call the handler function and handle errors
-      if ( !(*(messageHandlerMap[(MessageType)messageType].cb))( (MessageType)messageType, data + i, messageLength,
-                                                                 messageHandlerMap[(MessageType)messageType].someData, senderId, destinationId ) )
+        if ( !(*(messageHandlerMap[(MessageType)messageType].cb))( (MessageType)messageType, data + i, messageLength,
+                 messageHandlerMap[(MessageType)messageType].someData, senderId, destinationId ) )
+        {
+        // if the message is not handled correctly, bush it back to the incoming packets
+          NetworkMessage msg;
+
+          msg.data = new byte[messageLength];
+          memcpy( msg.data, data + i, messageLength );
+          msg.length = messageLength;
+          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, from sender %i, to rec: %i\n", messageType, senderId, destinationId);
+      }
+      // or else forward the message to the other servers
+      else
       {
-        // if the message is not handled correctly, bush it back to the incoming packets
+        PRINTF(0)("===========>> Forwarding Message\n");
         NetworkMessage msg;
 
@@ -244 +278 @@
         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);
-    }
+    }
+
     i += messageLength;
   }

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

@@ -217 +217 @@
   assert( Converter::intToByteArray( uniqueId, buf, INTSIZE ) == INTSIZE );
 
-  MessageManager::getInstance()->sendMessage( MSGID_DELETESYNCHRONIZEABLE, buf, INTSIZE, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
+  MessageManager::getInstance()->sendMessage( MSGID_DELETESYNCHRONIZEABLE, buf, INTSIZE, RT_ALL_BUT_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
 }
 
@@ -319 +319 @@
   if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/) && senderId !=  SharedNetworkData::getInstance()->getHostID() )
   {
-    MessageManager::getInstance()->sendMessage( messageType, data, dataLength, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( messageType, data, dataLength, RT_ALL_BUT_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
   }
 
@@ -360 +360 @@
 
   if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
-    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
   else
-    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_BUT_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
 
 

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

@@ -207 +207 @@
     assert( Converter::stringToByteArray( nick, data, nick.length()+INTSIZE) == nick.length()+INTSIZE );
 
-    MessageManager::getInstance()->sendMessage( MSGID_CHANGENICKNAME, data, nick.length()+INTSIZE, RT_SERVER, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( MSGID_CHANGENICKNAME, data, nick.length()+INTSIZE, RT_SERVER, NET_MASTER_SERVER, MP_HIGHBANDWIDTH );
     return;
   }

branches/proxy/src/subprojects/network/network_unit_test.cc

@@ -52 +52 @@
     server1 = server.getNewSocket();
   }
-  
+
   assert( server1->isOk() );
 
@@ -86 +86 @@
   printf("%d bytes send from server2\n", n);
   SDL_Delay(10);
-  
+
   server.update();
 
@@ -120 +120 @@
 
   printf("data: '%s'\n", buf);
-  
-  
+
+
   //22222222222222222222222222222222222222222
   n = client1->writePacket((byte*)str1, strlen(str1)+1);
@@ -132 +132 @@
   printf("%d bytes send from server2\n", n);
   SDL_Delay(10);
-  
+
   server.update();
 
@@ -181 +181 @@
   delete client2;
   delete server1;
-  delete server2; 
-  
+  delete server2;
+
   return 0;
 }
@@ -259 +259 @@
 
   NetworkManager* netMan = NetworkManager::getInstance();
-  
+
   netMan->initialize();
-  
+
   netMan->createMasterServer(/**ss, */ 9999);
-  
+
   SimpleSync* ss = new SimpleSync("Server");
   ss->setSynchronized( true );
-  
+
   NetworkLog::getInstance()->listen( 8888 );
 
   //MessageManager::getInstance()->initUser( 1 );
   MessageManager::getInstance()->registerMessageHandler( TESTMESSAGEID, testCB, NULL );
-  
+
   SDL_Delay(20);
 
   for(;;)
   {
-    MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"server to client", 18, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"server to client", 18, RT_ALL_BUT_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
     netMan->synchronize( 100 );
     SDL_Delay(100);
@@ -296 +296 @@
   State::setOnline(true);
   NetworkManager* netMan = NetworkManager::getInstance();
-  
+
 
   netMan->initialize();
-  
+
   std::string host;
-  
+
   if ( argc > 2 )
     host = argv[2];
   else
     host = "localhost";
-  
+
   netMan->createClient(host, 9999);
-  
+
 //  SimpleSync* ss = new SimpleSync("SimpleSync");
 //  ss->setSynchronized( true );
 //  netMan->connectSynchronizeable( *ss );
-  
+
   NetworkLog::getInstance()->listen( 7777 );
 
   SimpleSync * ss = NULL;
-  
+
   //MessageManager::getInstance()->initUser( 0 );
   MessageManager::getInstance()->registerMessageHandler( TESTMESSAGEID, testCB, NULL );
-  
+
   for(;;)
   {
     netMan->synchronize( 100 );
-    MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"client to server", 18, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
+    MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"client to server", 18, RT_ALL_BUT_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
     ss = dynamic_cast<SimpleSync*>(ClassList::getObject( "Server", CL_SIMPLE_SYNC ) );
     SDL_Delay(100);

branches/proxy/src/world_entities/spawning_point.cc

@@ -213 +213 @@
   assert( Converter::intToByteArray( uniqueId, buf + INTSIZE, INTSIZE ) == INTSIZE );
 
-  MessageManager::getInstance()->sendMessage( MSGID_RESPAWN, buf, 2*INTSIZE, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
+  MessageManager::getInstance()->sendMessage( MSGID_RESPAWN, buf, 2*INTSIZE, RT_ALL_BUT_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
 }