Changeset 7550 in orxonox.OLD

Timestamp:

May 6, 2006, 11:09:03 AM (18 years ago)

Author:

rennerc

Message:

subprojects/network uses should test net network sockets now

File:

• branches/network/src/subprojects/network/network_unit_test.cc (modified) (7 diffs)

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

@@ -9 +9 @@
 #include "network_socket.h"
 #include "server_socket.h"
+#include "udp_server_socket.h"
+#include "udp_socket.h"
 #include "network_stream.h"
 #include "synchronizeable.h"
@@ -36 +38 @@
 int testSocket(int argc, char** argv)
 {
-  IPaddress ip;
-  SDLNet_ResolveHost(&ip, "127.0.0.1", 9999);
-  ServerSocket server;
-  server.listen(9999);
-
-  NetworkSocket* client1 = new NetworkSocket(ip);
+  UdpServerSocket server(9999);
+
+  NetworkSocket* client1 = new UdpSocket("localhost", 9999);
 
   NetworkSocket* server1 = server.getNewSocket();
 
-  NetworkSocket* client2 = new NetworkSocket(ip);
+  NetworkSocket* client2 = new UdpSocket("localhost", 9999);
 
   NetworkSocket* server2 = server.getNewSocket();
@@ -144 +143 @@
   if(error == -1)
     printf("\n\nerror on address resolution, program inconsistancy\n\n");
-  nm->establishConnection(ip, *clientSync);
+  nm->establishConnection("localhost", port);
+  nm->connectSynchronizeable( *clientSync );
   /* adding some break for connection setup */
   SDL_Delay(20);
@@ -269 +269 @@
   Synchronizeable* ss = new ReadSync("WriteSync\0");
 
-  netMan->establishConnection(ip, *ss);
+  netMan->establishConnection( name, port );
+  netMan->connectSynchronizeable( *ss );
 
   for(;;)
@@ -286 +287 @@
 void testFloatConverter(float f)
 {
+#if 0
   char* s = Converter::floatToBinString(f);
   printf("%f = ", f);
@@ -293 +295 @@
   printf("Byte Array: ");
   for (int i = 0; i < 4; i++)
-    printf("%i  ", res[i]);
+//    printf("%i  ", res[i]);
   printf("\n");
 
   float b = Converter::byteArrayToFloat(res);
   printf("ReConvert: %f \n", b);
+#endif
 }
 
 void testFloatConverter2(float f)
 {
+#if 0
   char* s = Converter::floatToBinString(f);
   printf("### %f = ", f);
@@ -314 +318 @@
   float b = Converter::_byteArrayToFloat(res);
   printf("ReConvert: %f \n", b);
+#endif
 }
 int converter(int argc, char** argv)