Changeset 6139 in orxonox.OLD for trunk/src/lib/network/network_protocol.cc

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

• trunk/src/lib/network/network_protocol.cc (modified) (3 diffs)

trunk/src/lib/network/network_protocol.cc

@@ -57 +57 @@
     * @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
 */
-int 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)
 {
-  printf("NetworkProtocol: create header length = %i, bufferLength = %i\n", length, bufferLength);
+  PRINTF(5)("create header length = %i, bufferLength = %i\n", length, bufferLength);
   //If there isn't enough space for the header return -1
   if (length + this->headerLength > bufferLength)
     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.getClassID();
-  /* receiver ID */
-  data[3] = remoteID;
+  data[0] = (byte)(source.getUniqueID());
   /* data length*/
-  data[4] = length;
+  data[1] = length;
 
 
@@ -100 +90 @@
 Header NetworkProtocol::extractHeader(byte* data, int length)
 {
-  PRINTF(0)("extract Header\n");
+  PRINTF(5)("extract Header\n");
   //Test if received data can contain a header
   if (length < headerLength)
   {
-    PRINTF(0)("Received data is to short; it can't contain a header!");
+    PRINTF(1)("Received data is to short; it can't contain a header!\n");
     Header h;
-    h.protocol = 0;
+    h.length = 0;
     return h;
   }
@@ -114 +104 @@
   //&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];
+  /* unique ID */
+  h.synchronizeableID = data[0];
   /* data length*/
-  h.length = data[4];
+  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;