Changeset 9295 in orxonox.OLD

Timestamp:

Jul 14, 2006, 2:26:33 PM (18 years ago)

Author:

patrick

Message:

extended the handshake structure to support synchronization of proxy server addresses

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (1 diff)
• handshake.h (modified) (3 diffs)
• monitor/network_monitor.h (modified) (1 diff)
• synchronizeable.h (modified) (1 diff)

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

@@ -46 +46 @@
 
   registerVar( new SynchronizeableString( &localState.preferedNickName, &remoteState.preferedNickName, "preferedNickName", PERMISSION_ALL ) );
+  registerVar( new SynchronizeableIP( &localState.proxy1, &remoteState.proxy1, "proxy server 1", PERMISSION_ALL ) );
 
   // init the local state

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

@@ -11 +11 @@
 
 
-struct HandshakeState {
-  int orxId;                         //!< orxonox id
-  int version;                       //!< network protocol version
+struct HandshakeState
+{
+  int           orxId;                         //!< orxonox id
+  int           version;                       //!< network protocol version
 
-  int networkManagerId;              //!< unique id of the network manager
-  int messageManagerId;              //!< unique id of the message manager
-  int hostId;                        //!< host id
-  int nodeType;                      //!< type of the network node
+  int           networkManagerId;              //!< unique id of the network manager
+  int           messageManagerId;              //!< unique id of the message manager
+  int           hostId;                        //!< host id
+  int           nodeType;                      //!< type of the network node
 
-  int completed;                     //!< true if completed
-  int canDel;                        //!< true if marked for deletion
+  int           completed;                     //!< true if completed
+  int           canDel;                        //!< true if marked for deletion
 
-  int error;                         //!< error number
+  int           error;                         //!< error number
 
-  std::string errorString;           //!< error string
+  std::string   errorString;                   //!< error string
 
   //additional data
-  std::string preferedNickName;      //!< prefered nick name
+  std::string   preferedNickName;              //!< prefered nick name
+
+  int           freeSlots;                     //!< true if there are still free slots on this server
+  IPaddress     proxy1;                        //!< ip address of the first proxy (0.0.0.0 of not available)
+  IPaddress     proxy2;                        //!< ip address of the second proxy (0.0.0.0 of not available)
 };
 
@@ -52 +57 @@
     inline void del(){ localState.canDel = 1; }
 
+
     /* the actual informations exchanged in the handshake */
     /** @returns the host id of the remote host */
@@ -66 +72 @@
     /** @returns the prefered nick name */
     inline std::string getPreferedNickName(){ return remoteState.preferedNickName; }
+
+    /** @param address: the address of the proxy server 1 if any */
+    inline void setProxy1Address(IPaddress address) { this->localState.proxy1 = address; }
+    /** @returns the address of the proxy server 1 if any */
+    inline IPaddress getProxy1Address() { return this->localState.proxy1; }
+    /** @param address: the address of the proxy server 2 if any */
+    inline void setProxy2Address(IPaddress address) { this->localState.proxy2 = address; }
+    /** @returns the address of the proxy server 2 if any */
+    inline IPaddress getProxy2Address() { return this->localState.proxy2; }
+
 
     /* variable handler function */

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -49 +49 @@
     inline void removeMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->removeMasterServer(pInfo); }
 
+    /* slots admin and info interface */
     /** @returns the total number of players in this game (including all proxy servers etc)*/
     inline int getPlayerNumber() { return this->playerNumber; }

branches/proxy/src/lib/network/synchronizeable.h

@@ -20 +20 @@
 #include "synchronizeable_var/synchronizeable_bool.h"
 #include "synchronizeable_var/synchronizeable_uint.h"
+#include "synchronizeable_var/synchronizeable_ip.h"