Changeset 5809 in orxonox.OLD for branches/network/src/lib/network/network_protocol.cc

Timestamp:

Nov 28, 2005, 10:14:48 PM (18 years ago)

Author:

patrick

Message:

The NetworkSocket now uses a real network protocol: packet size is read out dynamicaly: therefore the NetworkStream now has an internal state that
checks if its reading header or body data

File:

• branches/network/src/lib/network/network_protocol.cc (modified) (5 diffs)

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

@@ -41 +41 @@
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_PROTOCOL, "NetworkProtocol");
-  this->headerLength = HEADER_LENGTH;
+  this->headerLength = sizeof(Header);
 }
 
@@ -65 +65 @@
   printf("NetworkProtocol: create header length = %i, bufferLength = %i\n", length, bufferLength);
   //If there isn't enough space for the header return -1
-  if (length + headerLength > bufferLength)
+  if (length + this->headerLength > bufferLength)
     return -1;
 
@@ -71 +71 @@
 //     printf("send byte[%i]=%u\n", i, data[i]);
 
+
   //Create space for the header
   for( int i = length - 1; i >= 0; i--)
-    data[i + headerLength] = data[i];
+    data[i + this->headerLength] = data[i];
 
-  //Include header
+  //Now create the header
+  /* protocol identifier */
   data[0] = 255;
-  return length + headerLength;
+  /* version number */
+  data[1] = 0;
+  /* sender ID: FIXME: there will be a better ID (for example unique:D)*/
+  data[2] = (byte)source.getClassID();
+  /* receiver ID */
+  data[3] = remoteID;
+  /* data length*/
+  data[4] = length;
+
+
+  return length + this->headerLength;
 }
 
@@ -100 +112 @@
   //Extract header
   Header h;
+  //&h = data;
+
   h.protocol = data[0];
+  /* version number */
+  h.version = data[1];
+  /* sender ID: FIXME: there will be a better ID (for example unique:D)*/
+  h.senderID = data[2];
+  /* receiver ID */
+  h.receiverID = data[3];
+  /* data length*/
+  h.length = data[4];
 
-  h.length = length - headerLength;
-  h.data = data;
 
 //   for(int i = 0; i < length; i++)
@@ -109 +129 @@
 
   //Remove header
-  for (int i = headerLength; i < length; i++)
-    data[i - headerLength] = data[i];
+//   for (int i = headerLength; i < length; i++)
+//     data[i - headerLength] = data[i];
 
   return h;