Changeset 6341 in orxonox.OLD for trunk/src/lib/network/network_protocol.cc

Timestamp:

Dec 30, 2005, 1:57:12 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back to the trunk, so we do not get away from each other to fast

File:

• trunk/src/lib/network/network_protocol.cc (modified) (6 diffs)

trunk/src/lib/network/network_protocol.cc

@@ -30 +30 @@
 #include "debug.h"
 
+#include "converter.h"
+
 /* using namespace std is default, this needs to be here */
 using namespace std;
@@ -41 +43 @@
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_PROTOCOL, "NetworkProtocol");
-  this->headerLength = sizeof(Header);
+  this->headerLength = INTSIZE+FLOATSIZE;
 }
 
@@ -64 +66 @@
   PRINTF(5)("create header length = %i, bufferLength = %i\n", length, bufferLength);
   //If there isn't enough space for the header return -1
-  if (length + this->headerLength > bufferLength)
+  if (length + 2*INTSIZE > bufferLength)
     return -1;
 
@@ -70 +72 @@
   // FIXME: without move Create space for the header
   for( int i = length - 1; i >= 0; i--)
-    data[i + this->headerLength] = data[i];
+    data[i + INTSIZE+INTSIZE] = data[i];
 
   //Now create the header
   /* sender ID: FIXME: there will be a better ID (for example unique:D)*/
-  data[0] = (byte)(source.getUniqueID());
+  //data[0] = (byte)(source.getUniqueID());
+  int res = Converter::intToByteArray( source.getUniqueID(), data, bufferLength );
+
   /* data length*/
-  data[1] = length;
+  //data[1] = length;
+  res += Converter::intToByteArray( length, data+res, bufferLength-res );
 
 
-  return length + this->headerLength;
+  return length + res;
 }
 
@@ -92 +97 @@
   PRINTF(5)("extract Header\n");
   //Test if received data can contain a header
-  if (length < headerLength)
+  if (length < 2*INTSIZE)
   {
     PRINTF(1)("Received data is to short; it can't contain a header!\n");
@@ -105 +110 @@
 
   /* unique ID */
-  h.synchronizeableID = data[0];
+  //h.synchronizeableID = data[0];
+  int res = Converter::byteArrayToInt( data, &(h.synchronizeableID) );
   /* data length*/
-  h.length = data[1];
+  //h.length = data[1];
+  Converter::byteArrayToInt( data+res, &(h.length) );