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

added back changes from revision 4542

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2011-09-10 18:42:47 +00:00
parent 7e8d8aea9c
commit d30c03b183
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libretroshare/src/distrib/p3distrib.cc
View file

@ -1261,7 +1261,6 @@ void p3GroupDistrib::publishDistribGroups()
store->SendItem(grp); /* no delete */ store->SendItem(grp); /* no delete */
grp->PeerId(tempPeerId); grp->PeerId(tempPeerId);
grp->grpFlags &= (~RS_DISTRIB_UPDATE); // if this is an update, ensure flag is removed after publication
} }
/* if they have public keys, publish these too */ /* if they have public keys, publish these too */
@ -1642,7 +1641,7 @@ bool p3GroupDistrib::attemptPublishKeysRecvd()
for(; sit != toDelete.end(); sit++) for(; sit != toDelete.end(); sit++)
mRecvdPubKeys.erase(*sit); mRecvdPubKeys.erase(*sit);
if(!toDelete.empty()) IndicateConfigChanged();
return true; return true;
@ -2663,8 +2662,7 @@ bool p3GroupDistrib::locked_checkGroupInfo(GroupInfo &info, RsDistribGrp *newGr
return false; return false;
} }
if ((info.distribGroup) && if ((info.distribGroup) && (newGrp->timestamp <= info.distribGroup->timestamp))
((info.distribGroup->timestamp <= newGrp->timestamp) && !(newGrp->grpFlags & RS_DISTRIB_UPDATE)))
{ {
#ifdef DISTRIB_DEBUG #ifdef DISTRIB_DEBUG
std::cerr << "p3GroupDistrib::locked_checkGroupInfo() Group Data Old/Same"; std::cerr << "p3GroupDistrib::locked_checkGroupInfo() Group Data Old/Same";
@ -2806,10 +2804,11 @@ bool p3GroupDistrib::locked_editGroup(std::string grpId, GroupInfo& gi){
gi_curr->grpChanged = true; gi_curr->grpChanged = true;
mGroupsRepublish = true; mGroupsRepublish = true;
// this is removed afterwards
gi_curr->distribGroup->grpFlags |= RS_DISTRIB_UPDATE;
delete[] data; delete[] data;
delete serialType;
EVP_MD_CTX_destroy(mdctx);
return true; return true;
} }
@ -3286,7 +3285,7 @@ void p3GroupDistrib::getGrpListPubKeyAvailable(std::list<std::string>& grpList)
} }
bool p3GroupDistrib::locked_checkDistribMsg( bool p3GroupDistrib::locked_checkDistribMsg(
GroupInfo &gi, RsDistribMsg *msg) GroupInfo &/*gi*/, RsDistribMsg *msg)
{ {
/* check timestamp */ /* check timestamp */
@ -3421,7 +3420,7 @@ std::ostream &operator<<(std::ostream &out, const GroupInfo &info)
return out; return out;
} }
void p3GroupDistrib::locked_notifyGroupChanged(GroupInfo &info, uint32_t flags, bool historical) void p3GroupDistrib::locked_notifyGroupChanged(GroupInfo &info, uint32_t /*flags*/, bool /*historical*/)
{ {
mGroupsChanged = true; mGroupsChanged = true;
info.grpChanged = true; info.grpChanged = true;
@ -3493,7 +3492,7 @@ std::ostream &operator<<(std::ostream &out, const RsDistribDummyMsg &msg)
bool p3GroupDistrib::locked_CheckNewMsgDummies(GroupInfo &grp, RsDistribMsg *msg, std::string id, bool historical) bool p3GroupDistrib::locked_CheckNewMsgDummies(GroupInfo &grp, RsDistribMsg *msg, std::string /*id*/, bool /*historical*/)
{ {
std::string threadId = msg->threadId; std::string threadId = msg->threadId;
std::string parentId = msg->parentId; std::string parentId = msg->parentId;