Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9349 in orxonox.OLD for branches/proxy/src/lib


Ignore:
Timestamp:
Jul 20, 2006, 11:58:16 AM (18 years ago)
Author:
patrick
Message:

another ip sync bug discovered. but still not the one im looking for

Location:
branches/proxy/src/lib/network
Files:
3 edited

Legend:

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

    r9347 r9349  
    4949  // now synchronize only two of the available proxy server addresses
    5050  registerVar( new SynchronizeableIP( &localState.proxy1, &remoteState.proxy1, "proxy server 1", PERMISSION_ALL ) );
    51   registerVar( new SynchronizeableIP( &localState.proxy2, &remoteState.proxy1, "proxy server 2", PERMISSION_ALL ) );
     51  registerVar( new SynchronizeableIP( &localState.proxy2, &remoteState.proxy2, "proxy server 2", PERMISSION_ALL ) );
    5252
    5353  // init the local state
  • branches/proxy/src/lib/network/network_stream.cc

    r9347 r9349  
    351351      peers[clientId].handshake->setProxy1Address( pi->ip);
    352352      PRINTF(0)("proxy1 ip set to: %s\n", pi->ip.ipString().c_str());
     353      PRINTF(0)(" proxy1 ip : %i, port: %i\n", pi->ip.host(), pi->ip.port());
    353354    }
    354355
     
    501502              this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
    502503              PRINTF(0)("proxy1 ip read to: %s\n", it->second.handshake->getProxy1Address().ipString().c_str());
     504              PRINTF(0)(" proxy1 ip : %i, port: %i\n", it->second.handshake->getProxy1Address().host(), it->second.handshake->getProxy1Address().port());
    503505              // get proxy 2 address and add it
    504506              this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);
  • branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc

    r9347 r9349  
    8888  *this->vPtrOut = IP(host, port);
    8989
    90   printf(" vtrp out old: %i, %i -- new: %i, %i\n", oldVal.host(), oldVal.port(), this->vPtrOut->host(), this->vPtrOut->port());
     90  printf(" %s old: %i, %i -- new: %i, %i\n", name.c_str(), oldVal.host(), oldVal.port(), this->vPtrOut->host(), this->vPtrOut->port());
    9191  setHasChanged( *this->vPtrOut != oldVal);
    9292
Note: See TracChangeset for help on using the changeset viewer.