Changeset 5735 in orxonox.OLD

Timestamp:

Nov 23, 2005, 3:13:01 PM (18 years ago)

Author:

bwuest

Message:

network_protocol.cc and network_protocol.h changed

Location:

branches/network/src/lib/network

Files:

• network_protocol.cc (modified) (2 diffs)
• network_protocol.h (modified) (2 diffs)

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

@@ -27 +27 @@
 #include "netdefs.h"
 
+/* include this file for debugging */
+#include "debug.h"
+
 /* using namespace std is default, this needs to be here */
 using namespace std;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
@@ -66 +50 @@
 
 /**
+    * creates a new packet header from the function arguments
+    *
+    * @arg data: the binary data without header -> return the data in this binary array
+    * @arg length: the data length without header
+    * @arg bufferLength: the length of the internal buffer
+    * @arg source: reference to the source Synchronizeable object
+    * @arg remoteID: id number of the remote Synchronizeable object
+    * @return: the new data length with header (the header data is included into byte* data)
+    *          -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)
+{
+  //If there isn't enough space for the header return -1
+  if (length + headerLength > bufferLength)
+    return -1;
+  
+  //Create space for the header
+  for (unsigned int i = length - 1; i >= 0; i--)
+    data[i + headerLength] = data[i];
+  
+  //Include header
+  data[0] = 255;
+}
 
+/**
+    * extracts the header from the binary data stream
+    * @arg data: the binary data with the header
+    * @arg length: the length of the binary data (including header)
+    * @return: a Header struct with the header information and the binary data
 */
-void NetworkProtocol::writeDataField( /* Attribute: Any*/ )
+Header NetworkProtocol::ExtractHeader(byte* data, int length)
 {
+  //Test if received data can contain a header
+  if (length < headerLength)
+  {
+    PRINTF(0)("Received data is to short; it can't contain a header!");
+    Header h;
+    h.protocol = -1;
+    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_protocol.h

@@ -8 +8 @@
 #include "base_object.h"
 
+
+typedef struct Header
+{
+  byte protocol;
+  byte version;
+  byte senderID;
+  byte receiverID;
+  byte length;
+  byte* data;
+};
+
 /*!
 
@@ -16 +27 @@
     NetworkProtocol();
     ~NetworkProtocol();
-    void writeDataField( /* Attribute: Any*/ );
+
+    int createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source, unsigned int remoteID);
+    Header ExtractHeader(byte* data, int length);
 
   private:
-   
+    const unsigned int headerLength = 1; //The Length of the Header in bytes
+    dataFields dFields;
 
 };