Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9339 in orxonox.OLD


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/handshake.h

    r9334 r9339  
    8383
    8484    /** @param address: the address of the proxy server 1 if any */
    85     inline void setProxy1Address(IP address) { this->localState.proxy1 = address; }
     85    inline void setProxy1Address(IP address) { this->remoteState.proxy1 = address; }
    8686    /** @returns the address of the proxy server 1 if any */
    8787    inline IP getProxy1Address() { return this->localState.proxy1; }
    8888    /** @param address: the address of the proxy server 2 if any */
    89     inline void setProxy2Address(IP address) { this->localState.proxy2 = address; }
     89    inline void setProxy2Address(IP address) { this->remoteState.proxy2 = address; }
    9090    /** @returns the address of the proxy server 2 if any */
    9191    inline IP getProxy2Address() { return this->localState.proxy2; }
  • branches/proxy/src/lib/network/network_stream.cc

    r9338 r9339  
    353353    // get the proxy server informations and write them to the handshake, if any (proxy)
    354354    PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
    355     assert (pi != NULL);
    356355    if( pi != NULL)
    357356      peers[clientId].handshake->setProxy1Address( pi->ip);
Note: See TracChangeset for help on using the changeset viewer.