Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-22 15:51:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a reconnection bug

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-12-15 21:50:45 +00:00
parent 8628be3b35
commit 7ca2b01791
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/pqi/p3connmgr.cc
View file

@ -1620,15 +1620,18 @@ bool p3ConnectMgr::doNextAttempt(std::string id)
it = mFriendList.find(id); it = mFriendList.find(id);
if (it == mFriendList.end()) if (it == mFriendList.end())
{ {
#ifdef CONN_DEBUG rslog(RSL_WARNING, p3connectzone, "p3ConnectMgr::connectResult() Failed, missing Friend ");
std::cerr << "p3ConnectMgr::connectResult() Failed, missing Friend " << " id: " << id << std::endl;
#endif
return false; return false;
} }
it->second.inConnAttempt = false; it->second.inConnAttempt = false;
if ((it->second.state & RS_PEER_S_CONNECTED) && !(it->second.state & RS_NET_CONN_TUNNEL)) {
rslog(RSL_WARNING, p3connectzone, "p3ConnectMgr::doNextAttempt() peer is already connected and not in tunnel mode, don't do next attempt.");
return true;
}
if (it->second.connAddrs.size() < 1) if (it->second.connAddrs.size() < 1)
{ {
return true; return true;