Changeset 6115 in orxonox.OLD for branches/network/src/lib/network/handshake.cc

Timestamp:

Dec 14, 2005, 10:50:33 PM (18 years ago)

Author:

rennerc

Message:

handshake now sends NetworkGameManagerId

File:

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

branches/network/src/lib/network/handshake.cc

@@ -22 +22 @@
 #include "handshake.h"
 
-Handshake::Handshake( bool server, int clientId )
+Handshake::Handshake( bool server, int clientId, int entityManagerId )
 {
   /* set the class id for the base object */
   this->setClassID(CL_HANDSHAKE, "Handshake");
 
+  if ( clientId > 255 )
+  {
+    PRINTF(1)("clientId is too big for type byte (%d)! connection to client %d will not work!", clientId, clientId);
+  }
+
+  if ( entityManagerId > 255 )
+  {
+    PRINTF(1)("entityManagerId is too big for type byte (%d)! connection to client %d will not work!", entityManagerId, clientId);
+  }
+
   this->setIsServer(server);
   this->clientId = clientId;
+  this->entityManagerId = entityManagerId;
   this->state = 0;
   this->isOk = false;
@@ -88 +99 @@
   if ( !isServer() && hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) )
   {
-    if ( length != 1 )
+    if ( length != 2 )
     {
       PRINTF(0)("hostID packet has wrong size %d instead of %d\n", length, 1);
@@ -99 +110 @@
     this->isOk = true;
     this->newHostId = data[0];
+    this->newEntityManagerId = data[1];
 
     if ( newHostId == 0 )
@@ -156 +168 @@
   if ( isServer() && hasState( HS_RECVD_VER) && hasState( HS_SENT_VER ) && !hasState( HS_SENT_HID ) )
   {
-    if ( maxLength < 4 )
+    if ( maxLength < 2 )
     {
       PRINTF(0)("buffer too small for ID");
@@ -177 +189 @@
       //memcpy(data, &clientId, 4);
       data[0] = (byte)clientId;
+      data[1] = (byte)entityManagerId;
     }
     *reciever = clientId;
-    return 1;
+    return 2;
   }