mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-16 18:39:46 -04:00
Changes to Integrate DHT... first tests appear successful.
* Added testing stuff to libretroshare.pro, enabled UDP again, * fixed NO_TCP #define in p3connmgr.cc * Added PeerStatus() call to p3bitdht.cc to start connect to DHT address. * HACK change to p3peers.cc to display DHT results. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0ca009c4fa
commit
05e908df12
4 changed files with 74 additions and 10 deletions
|
@ -2332,7 +2332,12 @@ bool p3ConnectMgr::retryConnect(std::string id)
|
|||
std::cerr << "p3ConnectMgr::retryConnect() id: " << id << std::endl;
|
||||
#endif
|
||||
|
||||
#ifndef P3CONNMGR_NO_TCP_CONNECTIONS
|
||||
|
||||
retryConnectTCP(id);
|
||||
|
||||
#endif // P3CONNMGR_NO_TCP_CONNECTIONS
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -2514,7 +2519,7 @@ bool p3ConnectMgr::retryConnectTCP(std::string id)
|
|||
if (it->second.inConnAttempt) {
|
||||
/* -> it'll automatically use the addresses we added */
|
||||
#ifdef CONN_DEBUG
|
||||
std::cerr << "p3ConnectMgr::retryConnectTcp() Already in CONNECT ATTEMPT";
|
||||
std::cerr << "p3ConnectMgr::retryConnectTCP() Already in CONNECT ATTEMPT";
|
||||
std::cerr << std::endl;
|
||||
std::cerr << "p3ConnectMgr::retryConnectTCP() Remaining ConnAddr Count: " << it->second.connAddrs.size();
|
||||
std::cerr << std::endl;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue