Changeset 6061 in orxonox.OLD

Timestamp:

Dec 12, 2005, 2:14:56 PM (18 years ago)

Author:

bwuest

Message:

Network protocol: Protocol changed

Location:

branches/network/src/lib/network

Files:

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

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

@@ -67 +67 @@
     return -1;
 
-//   for(int i = 0; i < length; i++)
-//     printf("send byte[%i]=%u\n", i, data[i]);
 
-
-  //Create space for the header
+  // FIXME: without move Create space for the header
   for( int i = length - 1; i >= 0; i--)
     data[i + this->headerLength] = data[i];
 
   //Now create the header
-  /* protocol identifier */
-  data[0] = 255;
-  /* version number */
-  data[1] = 0;
   /* sender ID: FIXME: there will be a better ID (for example unique:D)*/
-  data[2] = (byte)(source.getUniqueID());
+  data[0] = (byte)(source.getUniqueID());
   /* data length*/
-  data[3] = length;
+  data[1] = length;
 
 
@@ -103 +96 @@
     PRINTF(0)("Received data is to short; it can't contain a header!\n");
     Header h;
-    h.protocol = 0;
+    h.length = 0;
     return h;
   }
@@ -111 +104 @@
   //&h = data;
 
-  h.protocol = data[0];
-  /* version number */
-  h.version = data[1];
   /* unique ID */
-  h.synchronizeableID = data[2];
+  h.synchronizeableID = data[0];
   /* data length*/
-  h.length = data[3];
+  h.length = data[1];
 
-
-//   for(int i = 0; i < length; i++)
-//     printf("recS byte[%i]=%u\n", i, data[i]);
-
-  //Remove header
-//   for (int i = headerLength; i < length; i++)
-//     data[i - headerLength] = data[i];
 
   return h;

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

@@ -6 +6 @@
 #define _NETWORK_PROTOCOL_H
 
+/* include base_object.h since all classes are derived from this one */
 #include "base_object.h"
 
@@ -11 +12 @@
 #include "netdefs.h"
 
-#define HEADER_LENGTH 1
-
 typedef struct Header
 {
-  byte protocol;
-  byte version;
   byte synchronizeableID;
   byte length;