Changeset 9339 in orxonox.OLD

Timestamp:

Jul 20, 2006, 12:06:10 AM (18 years ago)

Author:

patrick

Message:

proxy addresses set and read the correct order now

Location:

branches/proxy/src/lib/network

Files:

• handshake.h (modified) (1 diff)
• network_stream.cc (modified) (1 diff)

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

@@ -83 +83 @@
 
     /** @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) { this->remoteState.proxy1 = address; }
     /** @returns the address of the proxy server 1 if any */
     inline IP getProxy1Address() { return this->localState.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->remoteState.proxy2 = address; }
     /** @returns the address of the proxy server 2 if any */
     inline IP getProxy2Address() { return this->localState.proxy2; }

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

@@ -353 +353 @@
     // get the proxy server informations and write them to the handshake, if any (proxy)
     PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
-    assert (pi != NULL);
     if( pi != NULL)
       peers[clientId].handshake->setProxy1Address( pi->ip);