Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug in distant chat: tunnel monitoring wasnt stopped when quitting if no vitual peer present

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7725 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-12-03 19:26:12 +00:00
parent a5bf3b6f3f
commit 512a938cfb
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libretroshare/src/chat/distantchat.cc
View File

@ -854,6 +854,11 @@ bool DistantChatService::closeDistantChatConnexion(const RsGxsId& gxs_id)
if(it == _distant_chat_contacts.end()) if(it == _distant_chat_contacts.end())
{ {
std::cerr << "(EE) Cannot close distant chat connection. No connection openned for gxs id " << gxs_id << std::endl; std::cerr << "(EE) Cannot close distant chat connection. No connection openned for gxs id " << gxs_id << std::endl;
// We don't know if we are server or client side, but mTurtle will not complain if the hash doesn't exist.
mTurtle->stopMonitoringTunnels( hashFromGxsId(gxs_id) );
return false ; return false ;
} }
if(it->second.direction != RsTurtleGenericTunnelItem::DIRECTION_SERVER) // nothing more to do for server side. if(it->second.direction != RsTurtleGenericTunnelItem::DIRECTION_SERVER) // nothing more to do for server side.
@ -861,6 +866,9 @@ bool DistantChatService::closeDistantChatConnexion(const RsGxsId& gxs_id)
} }
// send a status item saying that we're closing the connection // send a status item saying that we're closing the connection
#ifdef DEBUG_DISTANT_CHAT
std::cerr << " Sending a ACK to close the tunnel since we're managing it." << hash << std::endl;
#endif
RsChatStatusItem *cs = new RsChatStatusItem ; RsChatStatusItem *cs = new RsChatStatusItem ;
@ -870,6 +878,10 @@ bool DistantChatService::closeDistantChatConnexion(const RsGxsId& gxs_id)
sendTurtleData(cs) ; // that needs to be done off-mutex and before we close the tunnel. sendTurtleData(cs) ; // that needs to be done off-mutex and before we close the tunnel.
#ifdef DEBUG_DISTANT_CHAT
std::cerr << " This is client side. Stopping tunnel manageement for hash " << hash << std::endl;
#endif
mTurtle->stopMonitoringTunnels( hashFromGxsId(gxs_id) );
{ {
RsStackMutex stack(mDistantChatMtx); /********** STACK LOCKED MTX ******/ RsStackMutex stack(mDistantChatMtx); /********** STACK LOCKED MTX ******/
std::map<RsGxsId,DistantChatPeerInfo>::iterator it = _distant_chat_contacts.find(gxs_id) ; std::map<RsGxsId,DistantChatPeerInfo>::iterator it = _distant_chat_contacts.find(gxs_id) ;
@ -885,21 +897,11 @@ bool DistantChatService::closeDistantChatConnexion(const RsGxsId& gxs_id)
if(it2 == _distant_chat_virtual_peer_ids.end()) if(it2 == _distant_chat_virtual_peer_ids.end())
{ {
std::cerr << "(WW) Cannot remove virtual peer id " << it->second.virtual_peer_id << ": unknown! Weird situation." << std::endl; std::cerr << "(WW) Cannot remove virtual peer id " << it->second.virtual_peer_id << ": unknown! Weird situation." << std::endl;
return true ; return true ;
} }
DH_free(it2->second.dh) ; DH_free(it2->second.dh) ;
// Client side: Stop tunnels
//
if(it2->second.direction == RsTurtleGenericTunnelItem::DIRECTION_SERVER)
{
TurtleFileHash hash = hashFromGxsId(gxs_id) ;
mTurtle->stopMonitoringTunnels(hash) ;
#ifdef DEBUG_DISTANT_CHAT
std::cerr << " This is client side. Stopping tunnel manageement for hash " << hash << std::endl;
#endif
}
_distant_chat_virtual_peer_ids.erase(it2) ; _distant_chat_virtual_peer_ids.erase(it2) ;
} }