Changeset 9656 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/subprojects/network/network_unit_test.cc (modified) (8 diffs)

trunk/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;
 }
@@ -238 +238 @@
 }
 
-bool testCB( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+bool testCB( MessageType messageType, byte * data, int dataLength, void * someData, int userId )
 {
   printf("GOT MESSAGE: %s\n", data);
@@ -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);