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

Timestamp:

Jul 19, 2006, 10:29:14 PM (18 years ago)

Author:

patrick

Message:

work of the day in one commit:D

• switched whole network framework to ip sturcture
• extended ip structrue a little bit
• reimplemented the disconnection/reconnection algorithm
• synchronizeable ip bug discovered and solved

File:

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

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

@@ -9 +9 @@
 
 #include "base_object.h"
+#include "ip.h"
 #include "synchronizeable.h"
 
@@ -33 +34 @@
 
   int           redirectProxy;                 //!< true if the client should reconnect to a proxy server (either 1 or 2 )
-  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)
+  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)
 };
 
@@ -82 +83 @@
 
     /** @param address: the address of the proxy server 1 if any */
-    inline void setProxy1Address(IPaddress address) { this->localState.proxy1 = address; }
+    inline void setProxy1Address(IP address) { this->localState.proxy1 = address; }
     /** @returns the address of the proxy server 1 if any */
-    inline IPaddress getProxy1Address() { return this->localState.proxy1; }
+    inline IP 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; }
+    inline void setProxy2Address(IP address) { this->localState.proxy2 = address; }
     /** @returns the address of the proxy server 2 if any */
-    inline IPaddress getProxy2Address() { return this->localState.proxy2; }
+    inline IP getProxy2Address() { return this->localState.proxy2; }