Changeset 5742 in orxonox.OLD for branches

Timestamp:

Nov 23, 2005, 4:19:54 PM (19 years ago)

Author:

bottac

Message:

 

File:

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

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

@@ -103 +103 @@
   this->connectionMonitor->processPacket((byte*)downBuffer, PACKAGE_SIZE);
 
-        this->networkProtocol->createHeader((byte*) downBuffer , PACKAGE_SIZE, 1024,*(this->synchronizeables),12);
+        this->networkProtocol->createHeader((byte*) downBuffer , PACKAGE_SIZE , 1024,*(this->synchronizeables),12);
         
   /* pass the data to the network socket */
-  ret = this->networkSocket->writeBytes((byte*)downBuffer, PACKAGE_SIZE);
+  ret = this->networkSocket->writeBytes((byte*)downBuffer, PACKAGE_SIZE + sizeof(Header));
   /* check if there was an error */
   if( ret == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");}
@@ -116 +116 @@
   ret = 0; 
 
-  while(ret == 0)  ret = this->networkSocket->readBlock((byte*)upBuffer,PACKAGE_SIZE);
+  /* first of all read  data from networkSocket*/
+  while(ret == 0)
+  ret = this->networkSocket->readBlock((byte*)upBuffer,PACKAGE_SIZE + sizeof(Header));
   /* error checking: data read? */
   if( ret != PACKAGE_SIZE) { PRINTF(0)("Error while reading data from the NetworkSocket\n");}
 
   /* send the received data to connectionMonitor */
-  this->connectionMonitor->processPacket((byte*)upBuffer, PACKAGE_SIZE);
+  this->connectionMonitor->processPacket((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header));
 
   /* extract Header */
-  this->networkProtocol->extractHeader((byte*) upBuffer , PACKAGE_SIZE);
+  this->networkProtocol->extractHeader((byte*) upBuffer , PACKAGE_SIZE + sizeof(Header));
     
   /* now pass the data to the sync object */