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

Timestamp:

Jul 20, 2006, 3:49:57 PM (18 years ago)

Author:

patrick

Message:

network ip synchronization work

File:

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

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

@@ -14 +14 @@
 #include "ip.h"
 #include "synchronizeable.h"
+#include "shared_network_data.h"
 
 //!< a struct to save the handshakes to
@@ -35 +36 @@
   //additional data
   std::string   preferedNickName;              //!< prefered nick name
-
-  int           redirectProxy;                 //!< true if the client should reconnect to a proxy server (either 1 or 2 )
-  IP            proxy1;                        //!< ip address of the first proxy (0.0.0.0 of not available)
-  IP            proxy2;                        //!< ip address of the second proxy (0.0.0.0 of not available)
 };
 
@@ -81 +78 @@
 
     /** @returns if true the local client should reconnect to a proxy server from the proxy server list */
-    inline bool redirect() { return this->remoteState.redirectProxy;}
+    inline bool redirect() { return this->redirectProxy;}
     /** @param flag: indicating if the client should be redirected */
-    inline void setRedirect(bool flag) { this->localState.redirectProxy = flag; }
+    inline void setRedirect(bool flag) { this->redirectProxy = flag; }
 
     /** @param address: the address of the proxy server 1 if any */
-    inline void setProxy1Address(IP address) { this->localState.proxy1 = address; }
+    inline void setProxy1Address(IP address) { if( !SharedNetworkData::getInstance()->isMasterServer()) return; this->proxy1 = address; }
     /** @returns the address of the proxy server 1 if any */
-    inline IP getProxy1Address() { return this->remoteState.proxy1; }
+    inline IP getProxy1Address() { return this->proxy1; }
     /** @param address: the address of the proxy server 2 if any */
-    inline void setProxy2Address(IP address) { this->localState.proxy2 = address; }
+    inline void setProxy2Address(IP address) { this->proxy2 = address; }
     /** @returns the address of the proxy server 2 if any */
-    inline IP getProxy2Address() { return this->remoteState.proxy2; }
+    inline IP getProxy2Address() { return this->proxy2; }
 
 
@@ -119 +116 @@
 
     int                proxyAddressesSynched;                 //!< number of addresses synched
-
+    int                redirectProxy;                         //!< true if the client should reconnect to a proxy server
+    IP                 proxy1;                               //!< ip address of the first proxy (0.0.0.0 of not available)
+    IP                 proxy2;                               //!< ip address of the second proxy (0.0.0.0 of not available)
 };