Changeset 5804 in orxonox.OLD for branches/network/src/lib/network/network_stream.cc

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

File:

• branches/network/src/lib/network/network_stream.cc (modified) (6 diffs)

branches/network/src/lib/network/network_stream.cc

@@ -55 +55 @@
 {
   this->init();
-  this->networkSocket = new NetworkSocket( address, 9999 );
-   // this->networkSocket->connectToServer(address, 88);
+  this->networkSocket = new NetworkSocket(address);
   this->networkProtocol = new NetworkProtocol();
   this->synchronizeables = &sync;
@@ -63 +62 @@
 
 
-NetworkStream::NetworkStream(Synchronizeable& sync, int port, NodeType type)
+NetworkStream::NetworkStream(Synchronizeable& sync, unsigned int port, NodeType type)
   : DataStream()
 {
   this->init();
-  this->networkSocket = new NetworkSocket(/* address, type */);
-  this->networkSocket->listen(9999);
+  this->networkSocket = new NetworkSocket();
+  this->networkSocket->listen(port);
   this->networkProtocol = new NetworkProtocol();
   this->synchronizeables = &sync;
@@ -94 +93 @@
 void NetworkStream::processData()
 {
-
-
   int ret = 0;
 
   /* DOWNSTREAM */
-
-  PRINT(0)("\n\n");
+  printf("\nSynchronizeable: %s\n", this->synchronizeables->getName());
   PRINT(0)("============= DOWNSTREAM:===============\n");
   /* first of all read the synchronizeable's data: */
@@ -121 +117 @@
 
   /* UPSTREAM */
-
   ret = 0;
   PRINT(0)("============== UPSTREAM:================\n");
@@ -128 +123 @@
   /* error checking: data read? */
   printf("NetworkSocket: received %i bytes\n", ret);
-  if( ret != PACKAGE_SIZE + sizeof(Header)) { PRINTF(0)("Error while reading data from the NetworkSocket. Skipping further work\n");}
+  if( ret != 11 /*PACKAGE_SIZE + sizeof(Header)*/) { PRINTF(0)("Error while reading data from the NetworkSocket. Skipping further work\n");}
   else
   {
@@ -135 +130 @@
 
     /* extract Header */
-    this->networkProtocol->extractHeader((byte*) upBuffer , ret);
+    Header header = this->networkProtocol->extractHeader((byte*) upBuffer , ret);
 
     /* now pass the data to the sync object */
-    this->synchronizeables->writeBytes((byte*)upBuffer, ret);
+    this->synchronizeables->writeBytes((byte*)upBuffer, header.length);
   }