Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9338 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 20, 2006, 12:03:24 AM (18 years ago)
Author:
patrick
Message:

proxy servers are synced in a better form

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

Legend:

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

    r9334 r9338  
    6969      NetworkNode* node = new NetworkNode(peer);
    7070      this->addNode( node);
    71       this->addPassiveProxyServer( this->localNode, peer);
     71      this->addActiveProxyServer( this->localNode, peer);
    7272    }
    7373  }
  • branches/proxy/src/lib/network/monitor/network_node.cc

    r9334 r9338  
    240240  {
    241241    IP* ip = &(*it)->ip;
    242     PRINT(0)("     - ms, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
     242    PRINT(0)("     - ms, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
    243243  }
    244244
     
    248248  {
    249249    IP* ip = &(*it)->ip;
    250     PRINT(0)("     - ps-a, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
     250    PRINT(0)("     - ps-a, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
    251251  }
    252252
     
    256256  {
    257257    IP* ip = &(*it)->ip;
    258     PRINT(0)("     - ps-p, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
     258    PRINT(0)("     - ps-p, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
    259259  }
    260260
     
    264264  {
    265265    IP* ip = &(*it)->ip;
    266     PRINT(0)("     - client, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
    267   }
    268 }
    269 
     266    PRINT(0)("     - client, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
     267  }
     268}
     269
  • branches/proxy/src/lib/network/network_stream.cc

    r9334 r9338  
    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);
    355356    if( pi != NULL)
    356357      peers[clientId].handshake->setProxy1Address( pi->ip);
  • branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc

    r9334 r9338  
    8888  *this->vPtrOut = IP(host, port);
    8989
     90  printf(" vtrp out old: %i, %i -- new: %i, %i\n", oldIP.ip(), oldIP.port(), this->vPtrOut->ip(), this->vPtrOut->port());
    9091  setHasChanged( *this->vPtrOut != oldIP);
    9192
Note: See TracChangeset for help on using the changeset viewer.