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

Timestamp:

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

Author:

rennerc

Message:

handshake works now

File:

• branches/network/src/lib/network/handshake.h (modified) (3 diffs)

branches/network/src/lib/network/handshake.h

@@ -17 +17 @@
 
 typedef enum HandshakeState {
-  HS_SEND_INIT = 0,
-  HS_RECV_INIT,
-  HS_SEND_VERSION,
-  HS_RECV_VERSION,
-  HS_SEND_ID,
-  HS_RECV_ID,
-  HS_COMPLETED,
+  HS_SENT_INIT  = 0x00000001,
+  HS_RECVD_INIT = 0x00000002,
+  HS_SENT_VER   = 0x00000004,
+  HS_RECVD_VER  = 0x00000008,
+  HS_SENT_HID   = 0x00000010,
+  HS_RECVD_HID  = 0x00000020,
+  HS_COMPLETED  = 0X00000040,
 
   NUM_STATES
@@ -32 +32 @@
   public:
     Handshake(bool server, int clientId = 0);
-    inline bool       completed(){ return state == HS_COMPLETED; }
+    inline bool       completed(){ return hasState( HS_COMPLETED ); }
     inline bool       ok(){ return isOk; }
     inline int        getHostId(){ return newHostId; }
 
     virtual void      writeBytes(const byte* data, int length);
-    virtual int       readBytes(byte* data, int maxLength, int& reciever);
+    virtual int       readBytes(byte* data, int maxLength, int * reciever);
     virtual void      writeDebug() const;
     virtual void      readDebug() const;
@@ -43 +43 @@
   private:
     int               state;
-    int               server;
     int               clientId;
     int               newHostId;
     bool              isOk;
+
+    inline bool       hasState( int a ){ return (state & a) == a; }
+    inline void       setState( int a ){ state = state | a; }
+    inline void       unsetState( int a ){ state = state & (~a); }
 
 };