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

Timestamp:

Dec 11, 2005, 6:01:04 PM (18 years ago)

Author:

rennerc

Message:

handshake works now

File:

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

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

@@ -27 +27 @@
   this->setClassID(CL_HANDSHAKE, "Handshake");
 
-  this->server = server;
+  this->setIsServer(server);
   this->clientId = clientId;
-  this->state = HS_SEND_INIT;
+  this->state = 0;
   this->isOk = false;
+  this->setOwner(0);
+
+  PRINTF(0)("Handshake created clientId = %d\n", clientId);
 }
 
 void Handshake::writeBytes( const byte * data, int length )
 {
-  if ( state == HS_RECV_INIT )
+  PRINTF(0)("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);
+
+  if ( hasState( HS_COMPLETED ) )
+       return;
+
+  if ( !hasState( HS_RECVD_INIT ) )
   {
     if ( length != _INITIAL_DATA_LENGTH )
     {
-      PRINTF(1)("initial packet has wrong size %d instead of %d\n", length, _INITIAL_DATA_LENGTH);
-      state = HS_COMPLETED;
+      PRINTF(0)("initial packet has wrong size %d instead of %d\n", length, _INITIAL_DATA_LENGTH);
+      setState( HS_COMPLETED );
       return;
     }
@@ -46 +54 @@
     if ( strncmp((char*)data, _INITIAL_DATA, length) )
     {
-      PRINTF(1)("initial packed does not match\n");
-      state = HS_COMPLETED;
+      PRINTF(0)("initial packed does not match\n");
+      setState( HS_COMPLETED );
       return;
     }
 
-    state = HS_SEND_VERSION;
+    setState( HS_RECVD_INIT );
     PRINTF(0)("got valid initial packet from client %d\n", clientId);
     return;
   }
 
-  if ( state == HS_RECV_VERSION )
+  if ( hasState( HS_RECVD_INIT ) && !hasState( HS_RECVD_VER ) )
   {
     if ( length != _ORXONOX_VERSION_LENGTH )
     {
-      PRINTF(1)("version number packet has wrong size %d instead of %d\n", length, _ORXONOX_VERSION_LENGTH);
-      state = HS_COMPLETED;
+      PRINTF(0)("version number packet has wrong size %d instead of %d\n", length, _ORXONOX_VERSION_LENGTH);
+      setState( HS_COMPLETED );
       return;
     }
@@ -67 +75 @@
     if ( strncmp((char*)data, _ORXONOX_VERSION, length) )
     {
-      PRINTF(1)("versions do not match\n");
-      state = HS_COMPLETED;
+      PRINTF(0)("versions do not match\n");
+      setState( HS_COMPLETED );
       return;
     }
 
-    if ( this->isServer() )
-      state = HS_SEND_ID;
-    else
-      state = HS_RECV_ID;
+    setState( HS_RECVD_VER );
 
     PRINTF(0)("client %d's version does match\n", clientId);
@@ -81 +86 @@
   }
 
-  if ( state == HS_RECV_ID )
+  if ( hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) )
   {
-    if ( length != _ORXONOX_VERSION_LENGTH )
+    if ( length != 4 )
     {
-      PRINTF(1)("hostID packet has wrong size %d instead of %d\n", length, 4);
-      state = HS_COMPLETED;
+      PRINTF(0)("hostID packet has wrong size %d instead of %d\n", length, 4);
+      setState( HS_COMPLETED );
       return;
     }
 
-    this->state = HS_COMPLETED;
+    setState( HS_COMPLETED );
+    setState( HS_RECVD_HID );
     this->isOk = true;
     memcpy(&(this->newHostId), data, 4);
@@ -99 +105 @@
 }
 
-int Handshake::readBytes( byte * data, int maxLength, int & reciever )
+int Handshake::readBytes( byte * data, int maxLength, int * reciever )
 {
-  if ( state == HS_SEND_INIT )
+  PRINTF(0)("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);
+
+  if ( hasState( HS_COMPLETED ) )
+    return 0;
+
+  if ( !hasState( HS_SENT_INIT ) )
   {
     if ( maxLength < _INITIAL_DATA_LENGTH )
     {
-      PRINTF(1)("buffer too small for _INITIAL_DATA");
-      state = HS_COMPLETED;
+      PRINTF(0)("buffer too small for _INITIAL_DATA");
+      setState( HS_COMPLETED );
       return 0;
     }
 
-    state = HS_RECV_INIT;
+    setState( HS_SENT_INIT );
     memcpy(data, _INITIAL_DATA, _INITIAL_DATA_LENGTH);
     if ( this->isServer() )
-      reciever = clientId;
+      *reciever = clientId;
     return _INITIAL_DATA_LENGTH;
   }
 
-  if ( state == HS_SEND_VERSION )
+  if ( hasState( HS_RECVD_INIT ) && hasState( HS_SENT_INIT ) && !hasState( HS_SENT_VER ) )
   {
     if ( maxLength < _ORXONOX_VERSION_LENGTH )
     {
-      PRINTF(1)("buffer too small for version number");
-      state = HS_COMPLETED;
+      PRINTF(0)("buffer too small for version number");
+      setState( HS_COMPLETED );
       return 0;
     }
 
-    state = HS_RECV_VERSION;
+    setState( HS_SENT_VER );
     memcpy(data, _ORXONOX_VERSION, _ORXONOX_VERSION_LENGTH);
     if ( this->isServer() )
-      reciever = clientId;
+      *reciever = clientId;
     return _ORXONOX_VERSION_LENGTH;
   }
 
-  if ( state == HS_SEND_ID )
+  if ( isServer() && hasState( HS_RECVD_VER) && hasState( HS_SENT_VER ) && !hasState( HS_SENT_HID ) )
   {
     if ( maxLength < 4 )
     {
-      PRINTF(1)("buffer too small for ID");
-      state = HS_COMPLETED;
+      PRINTF(0)("buffer too small for ID");
+      setState( HS_COMPLETED );
       return 0;
     }
 
-    state = HS_COMPLETED;
+    setState( HS_SENT_HID );
+    setState( HS_COMPLETED );
+    isOk = true;
     memcpy(data, (byte*)&clientId, 4);
     if ( this->isServer() )
-      reciever = clientId;
+      *reciever = clientId;
     return 4;
   }