Changeset 5736 in orxonox.OLD for branches

Timestamp:

Nov 23, 2005, 3:19:45 PM (19 years ago)

Author:

bwuest

Message:

network_protocol.cc and network_protocol.h changed

Location:

branches/network/src/lib/network

Files:

• network_protocol.cc (modified) (4 diffs)
• network_protocol.h (modified) (3 diffs)

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

@@ -24 +24 @@
 #include "network_protocol.h"
 
-/* include this file, it contains some default definitions */
-#include "netdefs.h"
+/* include the synchronizeable object */
+#include "synchronizeable.h"
 
 /* include this file for debugging */
@@ -41 +41 @@
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_PROTOCOL, "NetworkProtocol");
+  this->headerLength = HEADER_LENGTH;
 }
 
@@ -60 +61 @@
     *          -1 if there isn't enough space in the buffer for the header
 */
-NetworkProtocol::createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source, unsigned int remoteID)
+int NetworkProtocol::createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source, unsigned int remoteID)
 {
   //If there isn't enough space for the header return -1
@@ -87 +88 @@
     PRINTF(0)("Received data is to short; it can't contain a header!");
     Header h;
-    h.protocol = -1;
+    h.protocol = 0;
     return h;
   }

branches/network/src/lib/network/network_protocol.h

@@ -8 +8 @@
 #include "base_object.h"
 
+/* include this file, it contains some default definitions */
+#include "netdefs.h"
+
+#define HEADER_LENGTH 1
 
 typedef struct Header
@@ -18 +22 @@
   byte* data;
 };
+
+class Synchronizeable;
 
 /*!
@@ -32 +38 @@
 
   private:
-    const unsigned int headerLength = 1; //The Length of the Header in bytes
-    dataFields dFields;
-
+    unsigned int headerLength; //The Length of the Header in bytes
 };