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

attempt to fix thread race between rsEvents and TokenQueue

Browse source
This commit is contained in:
csoler 2019-12-08 21:34:52 +01:00
parent b6ca07aaa3
commit e402630095
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/gxstunnel/p3gxstunnel.cc
View file

@ -1296,7 +1296,9 @@ bool p3GxsTunnelService::locked_sendEncryptedTunnelData(RsGxsTunnelItem *item)
}
if(it->second.status != RS_GXS_TUNNEL_STATUS_CAN_TALK)
{
#ifdef DEBUG_GXS_TUNNEL
std::cerr << "(EE) Cannot talk to tunnel id " << tunnel_id << ". Tunnel status is: " << it->second.status << std::endl;
#endif
return false;
}

7
libretroshare/src/services/p3msgservice.cc
View file

@ -404,11 +404,10 @@ int p3MsgService::checkOutgoingMessages()
mit->second->msgFlags |= RS_MSG_FLAGS_ROUTED;
}
}
#ifdef DEBUG_DISTANT_MSG
else
{
Dbg3() << __PRETTY_FUNCTION__ << " Delaying until available..."
<< std::endl;
}
Dbg3() << __PRETTY_FUNCTION__ << " Delaying until available..." << std::endl;
#endif
}
/* clean up */