Changeset 5802 in orxonox.OLD

Timestamp:

Nov 27, 2005, 7:17:56 PM (18 years ago)

Author:

patrick

Message:

network: some more fixes on the network branche: for testing purpuses, the length of the binary data packet will be hard set to 11bytes.

Location:

branches/network/src

Files:

• lib/network/network_protocol.cc (modified) (3 diffs)
• lib/network/network_stream.cc (modified) (2 diffs)
• subprojects/network/simple_sync.cc (modified) (2 diffs)

branches/network/src/lib/network/network_protocol.cc

@@ -8 +8 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-   
+
    ### File Specific:
    main-programmer: Benjamin Wuest
@@ -63 +63 @@
 int NetworkProtocol::createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source, unsigned int remoteID)
 {
-  PRINTF(0)("create header\n");
-  printf("length = %i, bufferLength = %i\n", length, bufferLength);
+  printf("NetworkProtocol: create header length = %i, bufferLength = %i\n", length, bufferLength);
   //If there isn't enough space for the header return -1
   if (length + headerLength > bufferLength)
     return -1;
-  
+
   //Create space for the header
   for( int i = length - 1; i >= 0; i--)
     data[i + headerLength] = data[i];
-  
+
   //Include header
   data[0] = 255;
+  return length + headerLength;
 }
 
@@ -94 +94 @@
     return h;
   }
-  
+
   //Extract header
   Header h;
   h.protocol = data[0];
-  
+
   h.length = length - headerLength;
   h.data = data;
-  
+
   //Remove header
   for (int i = headerLength; i < length; i++)
     data[i - headerLength] = data[i];
-  
+
   return h;
 }

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

@@ -106 +106 @@
 
   /* send the received data to connectionMonitor */
-  this->connectionMonitor->processPacket((byte*)downBuffer, ret + sizeof(Header));
+  this->connectionMonitor->processPacket((byte*)downBuffer, ret);
 
-  this->networkProtocol->createHeader((byte*)downBuffer, ret, DATA_STREAM_BUFFER_SIZE,
-                                       *(this->synchronizeables), 12);
+  ret = this->networkProtocol->createHeader((byte*)downBuffer, ret, DATA_STREAM_BUFFER_SIZE,
+                                            *(this->synchronizeables), 12);
 
+  printf("created header: data packet wights: %i bytes\n", ret);
   /* pass the data to the network socket */
-  ret = this->networkSocket->writeBytes((byte*)downBuffer, PACKAGE_SIZE + sizeof(Header));
+  ret = this->networkSocket->writeBytes((byte*)downBuffer, ret);
   /* check if there was an error */
+  printf("NetworkSocket: sent %i bytes\n", ret);
   if( ret == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");}
 
@@ -123 +125 @@
   PRINT(0)("============== UPSTREAM:================\n");
   /* first of all read  data from networkSocket*/
-  ret = this->networkSocket->readBlock((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header));
+  ret = this->networkSocket->readBlock((byte*)upBuffer, 11/* this is very bad: hard coded packet sizes! */);
   /* error checking: data read? */
-  if( ret != PACKAGE_SIZE + sizeof(Header)) { PRINTF(0)("Error while reading data from the NetworkSocket\n");}
+  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");}
+  else
+  {
+    /* send the received data to connectionMonitor */
+    this->connectionMonitor->processPacket((byte*)upBuffer, ret);
 
-  /* send the received data to connectionMonitor */
-  this->connectionMonitor->processPacket((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header));
+    /* extract Header */
+    this->networkProtocol->extractHeader((byte*) upBuffer , ret);
 
-  /* extract Header */
-  this->networkProtocol->extractHeader((byte*) upBuffer , PACKAGE_SIZE + sizeof(Header));
-
-  /* now pass the data to the sync object */
-  this->synchronizeables->writeBytes((byte*)upBuffer, ret);
+    /* now pass the data to the sync object */
+    this->synchronizeables->writeBytes((byte*)upBuffer, ret);
+  }
 
 }

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

@@ -96 +96 @@
   for(int i = 0; i < this->recLength; i++)
   {
-    PRINT(0)(" %i ",this->inData[i]);
+    PRINT(0)(" [%u] ",this->inData[i]);
   }
   PRINT(0)("|\n");
@@ -104 +104 @@
 void SimpleSync::readDebug()
 {
-  PRINTF(0)("Read out: |");
+  PRINTF(0)("Read out bytes: |");
   for(int i = 0; i < this->outLength; i++)
   {
-    PRINT(0)(" %c ",this->outData[i]);
+    PRINT(0)(" [%u] ",this->outData[i]);
   }
   PRINT(0)("|\n");