Changeset 6341 in orxonox.OLD for trunk/src/lib/network/handshake.cc

Timestamp:

Dec 30, 2005, 1:57:12 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back to the trunk, so we do not get away from each other to fast

File:

• trunk/src/lib/network/handshake.cc (modified) (11 diffs)

trunk/src/lib/network/handshake.cc

@@ -37 +37 @@
 }
 
-void Handshake::writeBytes( const byte * data, int length )
+int Handshake::writeBytes( const byte * data, int length, int sender)
 {
   PRINTF(5)("Handshake::writeBytes states = %d %d %d %d (%d)\n", hasState( HS_RECVD_INIT ), hasState( HS_RECVD_VER ), hasState( HS_RECVD_HID ), hasState( HS_COMPLETED ), state);
 
+  SYNCHELP_READ_BEGIN();
+
   if ( hasState( HS_COMPLETED ) )
-       return;
+       return 0;
 
   if ( !hasState( HS_RECVD_INIT ) )
@@ -50 +52 @@
       PRINTF(0)("initial packet has wrong size %d instead of %d\n", length, _INITIAL_DATA_LENGTH);
       setState( HS_COMPLETED );
-      return;
+      return 0;
     }
 
@@ -57 +59 @@
       PRINTF(0)("initial packed does not match\n");
       setState( HS_COMPLETED );
-      return;
+      return length;
     }
 
     setState( HS_RECVD_INIT );
     PRINTF(0)("got valid initial packet from client %d\n", clientId);
-    return;
+    return length;
   }
 
@@ -71 +73 @@
       PRINTF(0)("version number packet has wrong size %d instead of %d\n", length, _ORXONOX_VERSION_LENGTH);
       setState( HS_COMPLETED );
-      return;
+      return 0;
     }
 
@@ -78 +80 @@
       PRINTF(0)("versions do not match\n");
       setState( HS_COMPLETED );
-      return;
+      return length;
     }
 
@@ -84 +86 @@
 
     PRINTF(0)("client %d's version does match\n", clientId);
-    return;
+    return length;
   }
 
   if ( !isServer() && hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) )
   {
-    if ( length != 2 )
+    if ( length != INTSIZE+INTSIZE )
     {
       PRINTF(0)("hostID packet has wrong size %d instead of %d\n", length, 1);
       setState( HS_COMPLETED );
-      return;
+      return 0;
     }
 
@@ -99 +101 @@
     setState( HS_RECVD_HID );
     this->isOk = true;
-    this->newHostId = data[0];
-    this->newNetworkGameManagerId = data[1];
+    SYNCHELP_READ_INT( this->newHostId );
+    SYNCHELP_READ_INT( this->newNetworkGameManagerId );
 
     if ( newHostId == 0 )
@@ -112 +114 @@
       PRINTF(0)("got my hostID: %d and networkGameManagerId: %d\n", newHostId, newNetworkGameManagerId);
     }
-    return;
+    return SYNCHELP_READ_N;
   }
 
@@ -120 +122 @@
 {
   PRINTF(5)("Handshake::readBytes states = %d %d %d %d (%d)\n", hasState( HS_SENT_INIT ), hasState( HS_SENT_VER ), hasState( HS_SENT_HID ), hasState( HS_COMPLETED ), state);
+
+  SYNCHELP_WRITE_BEGIN();
 
   if ( hasState( HS_COMPLETED ) )
@@ -172 +176 @@
       isOk = false;
       //memcpy(data, (byte*)0, 4);
-      data[0] = 0;
+      SYNCHELP_WRITE_INT( 0 );
+      SYNCHELP_WRITE_INT( 0 );
     }
     else
@@ -178 +183 @@
       isOk = true;
       //memcpy(data, &clientId, 4);
-      data[0] = (byte)clientId;
-      data[1] = (byte)networkGameManagerId;
+      SYNCHELP_WRITE_INT( clientId );
+      SYNCHELP_WRITE_INT( networkGameManagerId );
     }
     *reciever = clientId;
-    return 2;
+    return SYNCHELP_WRITE_N;
   }