Changeset 9367 in orxonox.OLD
- Timestamp:
- Jul 20, 2006, 6:38:25 PM (18 years ago)
- Location:
- branches/proxy/src/lib/network
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/handshake.cc
r9366 r9367 79 79 80 80 81 this->proxyAddressesSynched = 2;82 81 this->proxy1 = IP(0, 0); 83 82 this->proxy2 = IP(0, 0); -
branches/proxy/src/lib/network/handshake.h
r9360 r9367 80 80 inline bool redirect() { return this->redirectProxy;} 81 81 /** @param flag: indicating if the client should be redirected */ 82 inline void setRedirect(bool flag) { this->redirectProxy = flag; }82 inline void setRedirect(bool flag) { this->redirectProxy = (int)flag; } 83 83 84 84 /** @param address: the address of the proxy server 1 if any */ … … 115 115 int nodeType; //!, the type of the network node 116 116 117 int proxyAddressesSynched; //!< number of addresses synched118 117 int redirectProxy; //!< true if the client should reconnect to a proxy server 119 118 IP proxy1; //!< ip address of the first proxy (0.0.0.0 of not available) -
branches/proxy/src/lib/network/network_stream.cc
r9360 r9367 350 350 { 351 351 peers[clientId].handshake->setProxy1Address( pi->ip); 352 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()); 354 } 355 352 } 356 353 pi = this->networkMonitor->getSecondChoiceProxy(); 357 354 if( pi != NULL) … … 502 499 // get proxy 1 address and add it 503 500 this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE); 504 PRINTF(0)("proxy1 ip read to: %s\n", it->second.handshake->getProxy1Address().ipString().c_str());505 PRINTF(0)(" proxy1 ip : %i, port: %i\n", it->second.handshake->getProxy1Address().host(), it->second.handshake->getProxy1Address().port());506 501 // get proxy 2 address and add it 507 502 this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE); … … 869 864 int n = sync->setStateDiff( peer->second.userId, buf+offset, syncDataLength, state, fromState ); 870 865 offset += n; 871 //NETPRINTF(0)("SSSSSEEEEETTTTT: %s %d\n",sync->getClassName(), n);872 866 873 867 }
Note: See TracChangeset
for help on using the changeset viewer.