Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed saving bug in GrpConfigMap

Browse Source
This commit is contained in:
csoler 2016-12-06 23:02:25 +01:00
parent a4c14c2212
commit 68f7fff0d8
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/gxs/rsgenexchange.cc
View File

@ -1634,7 +1634,7 @@ uint32_t RsGenExchange::getSyncPeriod(const RsGxsGroupId& grpId)
void RsGenExchange::setSyncPeriod(const RsGxsGroupId& grpId,uint32_t age_in_secs)
{
if(mNetService != NULL)
return mNetService->setKeepAge(grpId,age_in_secs) ;
return mNetService->setSyncAge(grpId,age_in_secs) ;
else
std::cerr << "(EE) No network service available. Cannot set storage period. " << std::endl;
}

36
libretroshare/src/gxs/rsgxsnetservice.cc
View File

@ -1386,27 +1386,26 @@ bool RsGxsNetService::loadList(std::list<RsItem *> &load)
time_t now = time(NULL);
#warning Do we keep that?
for(GrpConfigMap::iterator it(mServerGrpConfigMap.begin());it!=mServerGrpConfigMap.end();++it)
{
// At each reload, we reset the count of visible messages. It will be rapidely restored to its real value from friends.
{
// At each reload, we reset the count of visible messages. It will be rapidely restored to its real value from friends.
it->second.max_visible_count = 0; // std::max(it2->second.message_count,gnsr.max_visible_count) ;
// the update time stamp is randomised so as not to ask all friends at once about group statistics.
it->second.update_TS = now - GROUP_STATS_UPDATE_DELAY + (RSRandom::random_u32()%(GROUP_STATS_UPDATE_DELAY/10)) ;
it->second.max_visible_count = 0; // std::max(it2->second.message_count,gnsr.max_visible_count) ;
// Similarly, we remove all suppliers.
// Actual suppliers will come back automatically.
// the update time stamp is randomised so as not to ask all friends at once about group statistics.
it->second.suppliers.ids.clear() ;
it->second.update_TS = now - GROUP_STATS_UPDATE_DELAY + (RSRandom::random_u32()%(GROUP_STATS_UPDATE_DELAY/10)) ;
// also make sure that values stored for keep and req delays correspond to the canonical values
// Similarly, we remove all suppliers.
// Actual suppliers will come back automatically.
locked_checkDelay(it->second.msg_req_delay);
locked_checkDelay(it->second.msg_keep_delay);
}
it->second.suppliers.ids.clear() ;
// also make sure that values stored for keep and req delays correspond to the canonical values
locked_checkDelay(it->second.msg_req_delay);
locked_checkDelay(it->second.msg_keep_delay);
}
return true;
}
@ -1441,6 +1440,13 @@ bool RsGxsNetService::saveList(bool& cleanup, std::list<RsItem*>& save)
{
RS_STACK_MUTEX(mNxsMutex) ;
// First, make sure that all IDs (which are needed twice) are consistent
for(GrpConfigMap::iterator it(mServerGrpConfigMap.begin());it!=mServerGrpConfigMap.end();++it) it->second.grpId = it->first ;
for(ServerMsgMap::iterator it(mServerMsgUpdateMap.begin());it!=mServerMsgUpdateMap.end();++it) it->second.grpId = it->first ;
std::cerr << "RsGxsNetService::saveList()..." << std::endl;
// hardcore templates
std::transform(mClientGrpUpdateMap.begin(), mClientGrpUpdateMap.end(), std::back_inserter(save), get_second<ClientGrpMap,RsGxsGrpUpdateItem>(mServType));
std::transform(mClientMsgUpdateMap.begin(), mClientMsgUpdateMap.end(), std::back_inserter(save), get_second<ClientMsgMap,RsGxsMsgUpdateItem>(mServType));