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

fixed bug causing to not request identities correctly to friends

Browse source
This commit is contained in:
csoler 2020-07-17 00:27:09 +02:00
parent 016e6445a3
commit e4d9194073
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/gxs/rsgxsnetservice.cc
View file

@ -3223,7 +3223,7 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr)
RsNxsSyncGrpItem*& grpSyncItem = *llit; RsNxsSyncGrpItem*& grpSyncItem = *llit;
const RsGxsGroupId& grpId = grpSyncItem->grpId; const RsGxsGroupId& grpId = grpSyncItem->grpId;
std::map<RsGxsGroupId, RsGxsGrpMetaData*>::const_iterator metaIter = grpMetaMap.find(grpId); std::map<RsGxsGroupId, RsGxsGrpMetaData*>::const_iterator metaIter = grpMetaMap.find(grpId);
bool haveItem = false; bool haveItem = false;
bool latestVersion = false; bool latestVersion = false;
@ -3245,7 +3245,7 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr)
if( (mGrpAutoSync && !haveItem) || latestVersion) if( (mGrpAutoSync && !haveItem) || latestVersion)
{ {
#ifdef NXS_NET_DEBUG_0 #ifdef NXS_NET_DEBUG_0
GXSNETDEBUG_PG(tr->mTransaction->PeerId(),grpId) << " Identity " << grpId << " will be sync-ed using GXS. mGrpAutoSync:" << mGrpAutoSync << " haveItem:" << haveItem << " latest_version: " << std::endl; GXSNETDEBUG_PG(tr->mTransaction->PeerId(),grpId) << " Identity " << grpId << " will be sync-ed using GXS. mGrpAutoSync:" << mGrpAutoSync << " haveItem:" << haveItem << " latest_version: " << latestVersion << std::endl;
#endif #endif
addGroupItemToList(tr, grpId, transN, reqList); addGroupItemToList(tr, grpId, transN, reqList);
} }

2
libretroshare/src/services/p3idservice.cc
View file

@ -2960,7 +2960,7 @@ void p3IdService::requestIdsFromNet()
#endif #endif
RsGxsIdCache data; RsGxsIdCache data;
if(!mKeyCache.fetch(cit->first,data)) if(mKeyCache.fetch(cit->first,data))
{ {
std::cerr << __PRETTY_FUNCTION__ << ". Dropping request for ID " << cit->first << " at last minute, because it was found in cache"<< std::endl; std::cerr << __PRETTY_FUNCTION__ << ". Dropping request for ID " << cit->first << " at last minute, because it was found in cache"<< std::endl;
auto tmp(cit); auto tmp(cit);