Changeset 6340 in orxonox.OLD for branches/network_merged/src/lib/network/network_socket.cc

Timestamp:

Dec 30, 2005, 1:52:26 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:

• branches/network_merged/src/lib/network/network_socket.cc (modified) (4 diffs)

branches/network_merged/src/lib/network/network_socket.cc

@@ -21 +21 @@
 #define DEBUG_MODULE_NETWORK
 
+#include "converter.h"
 
 /* include your own header */
@@ -398 +399 @@
 {
   PRINTF(5)("NetworkSocket::writePacket()\n");
-  if (length>255)
-  {
-    PRINTF(1)("Packet length > 255!\n");
-    return false;
-  }
-
-  byte blen = length;
-
-  writeBytes(&blen, 1);
+
+  byte blen[INTSIZE];
+
+  Converter::intToByteArray( length, blen, INTSIZE );
+
+  writeBytes(blen, INTSIZE);
   writeBytes(data, length);
 }
@@ -413 +411 @@
 {
   PRINTF(5)("NetworkSocket::readPacket()\n");
-  if (incomingBufferLength<1)
-  {
-    return 0;
-  }
-
-  byte blen = incomingBuffer[0];
+  if (incomingBufferLength<INTSIZE)
+  {
+    return 0;
+  }
+
+  int blen;
+  Converter::byteArrayToInt( incomingBuffer, &blen );
 
   if (blen>maxLength)
@@ -431 +430 @@
   }
 
-  readBytes(&blen, 1);
+  byte t[INTSIZE];
+  readBytes(t, INTSIZE);
   int res = readBytes(data, blen);