Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9341 in orxonox.OLD for branches/proxy


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

seems like the ip sync doesn't work properly. investigate

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

Legend:

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

    r9338 r9341  
    247247  // check if a proxy server has to activated
    248248
    249   this->debug();
     249//   this->debug();
    250250}
    251251
  • branches/proxy/src/lib/network/network_stream.cc

    r9340 r9341  
    335335
    336336    peers[clientId].socket = tempNetworkSocket;
    337       // create new handshake and init its variables
     337    // create new handshake and init its variables
    338338    peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
    339339    peers[clientId].handshake->setUniqueID(clientId);
     
    345345
    346346    // get the proxy server informations and write them to the handshake, if any (proxy)
     347    assert( this->networkMonitor != NULL);
    347348    PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
    348349    if( pi != NULL)
     350    {
    349351      peers[clientId].handshake->setProxy1Address( pi->ip);
     352      PRINTF(0)("proxy1 ip set to: %s\n", pi->ip.ipString().c_str());
     353    }
    350354
    351355    pi = this->networkMonitor->getSecondChoiceProxy();
     
    356360    peers[clientId].handshake->setRedirect(this->networkMonitor->isReconnectNextClient());
    357361
    358 
     362    // the connecting node of course is a client
    359363    peers[clientId].nodeType = NET_CLIENT;
    360364    peers[clientId].ip = peers[clientId].socket->getRemoteAddress();
     
    496500              // get proxy 1 address and add it
    497501              this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
     502              PRINTF(0)("proxy1 ip read to: %s\n", it->second.handshake->getProxy1Address().ipString().c_str());
    498503              // get proxy 2 address and add it
    499504              this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);
Note: See TracChangeset for help on using the changeset viewer.