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

Merge branch 'master' of github.com:RetroShare/RetroShare

Browse source
This commit is contained in:
Gioacchino Mazzurco 2020-01-07 01:50:44 +01:00
commit 8718a442d1
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
5 changed files with 186 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc
View file

@ -32,7 +32,6 @@
/****
* #define P3DISC_DEBUG 1
****/
#define P3DISC_DEBUG 1
/*extern*/ std::shared_ptr<RsGossipDiscovery> rsGossipDiscovery(nullptr);
@ -951,11 +950,9 @@ void p3discovery2::processContactInfo(const RsPeerId &fromId, const RsDiscContac
return ; // fresh information here.
bool should_notify_discovery = false;
auto sit= it->second.mSslIds.find(item->sslId);
DiscSslInfo& sslInfo(it->second.mSslIds[item->sslId]); // This line inserts the entry while not removing already existing data
// do not remove it!
if (!mPeerMgr->isFriend(item->sslId))
{
should_notify_discovery = true;