Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9479 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 25, 2006, 11:52:37 PM (18 years ago)
Author:
patrick
Message:

proxy server not able to load the world file, some more safty in the handshake handling

Location:
branches/proxy/src
Files:
2 edited

Legend:

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

    r9476 r9479  
    555555          // write the first informations into the node so they can be read from there for case differentiation
    556556          it->second.nodeType = it->second.handshake->getRemoteNodeType();
    557           it->second.ip = it->second.socket->getRemoteAddress();
    558557
    559558          // the counter part didn't mark it free for deletion yet
     
    568567              this->pInfo->userId = SharedNetworkData::getInstance()->getHostID();
    569568
     569              it->second.ip = it->second.socket->getRemoteAddress();
     570
    570571//               it->second.nodeType = it->second.handshake->getRemoteNodeType();
    571572//               it->second.ip = it->second.socket->getRemoteAddress();
     
    602603              if (  SharedNetworkData::getInstance()->isMasterServer() )
    603604              {
     605                it->second.ip = it->second.socket->getRemoteAddress();
     606
    604607                this->networkMonitor->addNode(&it->second);
    605608
     
    613616              else if ( SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isClient() )
    614617              {
    615                 it->second.nodeType = it->second.handshake->getRemoteNodeType();
    616618                it->second.ip = it->second.socket->getRemoteAddress();
    617619
  • branches/proxy/src/story_entities/multi_player_world_data.cc

    r9476 r9479  
    112112  const TiXmlElement* element = NULL;
    113113
    114   if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     114  if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
    115115  {
    116116    /* load the spawning points */
     
    148148    element = element->FirstChildElement();
    149149
    150     if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     150    if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
    151151    {
    152152      while( element != NULL)
     
    206206
    207207
    208     if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     208    if( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
    209209    {
    210210      this->localPlayer = new Player();
     
    284284
    285285  // create server playable
    286   if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     286  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
    287287  {
    288288    NetworkGameManager::getInstance()->signalNewPlayer( 0 );
Note: See TracChangeset for help on using the changeset viewer.