Changeset 7954 in orxonox.OLD for trunk/src/lib/network/handshake.h

Timestamp:

May 29, 2006, 3:28:41 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

File:

• trunk/src/lib/network/handshake.h (modified) (2 diffs)

trunk/src/lib/network/handshake.h

@@ -10 +10 @@
 #include "synchronizeable.h"
 
-#define _INITIAL_DATA "orxonox"
-#define _INITIAL_DATA_LENGTH 7
+#define _ORXONOX_ID 0xF91337A0
 
-#define _ORXONOX_VERSION "\x00\x00\x00\x01"
-#define _ORXONOX_VERSION_LENGTH 4
+#define _ORXONOX_VERSION 1
 
-typedef enum HandshakeState {
-  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,
-
-  HS_DO_REJECT  = 0x00010000,
-  HS_WAS_REJECT = 0x00020000,
-
-  NUM_STATES
+struct HandshakeState {
+  int orxId;
+  int version;
+  
+  int networkManagerId;
+  int messageManagerId;
+  int hostId;
+  
+  int completed;
+  int canDel;
+  
+  int error;
+  
+  std::string errorString;
 };
 
@@ -34 +33 @@
 {
   public:
-    Handshake(bool server, int clientId = 0, int networkGameManagerId = 0);
-    inline bool       completed(){ return hasState( HS_COMPLETED ); }
-    inline bool       ok(){ return isOk; }
-    inline int        getHostId(){ return newHostId; }
-    inline int        getNetworkGameManagerId(){ return newNetworkGameManagerId; }
-
-    inline void       doReject(){ setState(HS_DO_REJECT); }
-
-    virtual int       writeBytes(const byte* data, int length, int sender);
-    virtual int       readBytes(byte* data, int maxLength, int * reciever);
-    virtual void      writeDebug() const;
-    virtual void      readDebug() const;
+    Handshake( bool server, int clientId = 0, int networkGameManagerId = 0, int messageManagerId = 0 );
+    inline bool       completed(){ return localState.completed != 0 && remoteState.completed != 0; }
+    inline bool       ok(){ return localState.error == 0 && remoteState.error == 0; }
+    inline int        getHostId(){ return remoteState.hostId; }
+    inline int        getNetworkGameManagerId(){ return remoteState.networkManagerId; }
+    inline int        getMessageManagerId(){ return remoteState.messageManagerId; }
+    inline void       doReject( std::string reason ){ localState.error = 1; localState.errorString = "the server rejected your connection ["+ reason +"]"; }
+    inline bool       canDel(){ return localState.canDel == 1 && remoteState.canDel == 1; }
+    inline bool       allowDel(){ return localState.canDel == 1; }
+    inline void       del(){ localState.canDel = 1; }
+    
+    virtual void varChangeHandler( std::list<int> & id );
 
   private:
-    int               state;
-    int               clientId;
-    int               networkGameManagerId;
-    int               newHostId;
-    int               newNetworkGameManagerId;
-    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); }
+    HandshakeState localState;
+    HandshakeState remoteState;
+    
+    int netManId_handler;
+    int msgManId_handler;
+    int hostId_handler;
+    int completed_handler;
+    int error_handler;
+    int errorString_handler;
+    int orxId_handler;
+    int version_handler;
+    int candel_id;
 
 };