Changeset 5804 in orxonox.OLD for branches/network/src/subprojects

Timestamp:

Nov 28, 2005, 5:49:48 PM (19 years ago)

Author:

patrick

Message:

network: changed the synchronizeable interface, since the data synchronizeables, more debug output

Location:

branches/network/src/subprojects/network

Files:

• network_unit_test.cc (modified) (3 diffs)
• simple_sync.cc (modified) (1 diff)
• simple_sync.h (modified) (1 diff)

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

@@ -36 +36 @@
   SDL_Delay(20);
 
-  NetworkSocket client(ip, 9999);
+  NetworkSocket client(ip);
 
   char buf[1024];
@@ -123 +123 @@
   printf("=================\n");
 
-  IPaddress ip;
-  //SDLNet_ResolveHost(&ip, "127.0.0.1", 9999);
-  SDLNet_ResolveHost(&ip, "localhost", 9999);
-  Synchronizeable* clientSync = new SimpleSync();
-  Synchronizeable* serverSync = new SimpleSync();
+  Synchronizeable* clientSync = new SimpleSync("Client\0");
+  Synchronizeable* serverSync = new SimpleSync("Server\0");
 
-
+  unsigned int port = 9999;
 
   /* create the network manager */
@@ -138 +135 @@
 
   /* create a server stream */
-  nm->createServer(*serverSync, 9999);
+  nm->createServer(*serverSync, port);
 
   /* esatblish a connection */
+  IPaddress ip;
+  int error = SDLNet_ResolveHost(&ip, "127.0.0.1", port);
+  //SDLNet_ResolveHost(&ip, "localhost", port);
+  if(error == -1) printf("\n\nerror on address resolution, program inconsistancy\n\n");
   nm->establishConnection(ip, *clientSync);
 

branches/network/src/subprojects/network/simple_sync.cc

@@ -28 +28 @@
  *  default constructor
  */
-SimpleSync::SimpleSync()
-  : Synchronizeable()
+SimpleSync::SimpleSync(const char* name)
+  : Synchronizeable(name)
 {
   this->outLength = 10;

branches/network/src/subprojects/network/simple_sync.h

@@ -13 +13 @@
 {
   public:
-    SimpleSync();
+    SimpleSync(const char* name);
     ~SimpleSync();
 
     virtual void writeBytes(byte* data, int length);
     virtual int readBytes(byte* data);
+
 
   private: