Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 19:04:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added pending recvd publish keys to savelist config

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-06-19 18:00:28 +00:00
parent 76c6989164
commit 0d8b848851
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libretroshare/src/services/p3distrib.cc
View File

@ -67,7 +67,7 @@ p3GroupDistrib::p3GroupDistrib(uint16_t subtype,
mPubPeriod(pubPeriod), mPubPeriod(pubPeriod),
mLastPublishTime(0), mLastPublishTime(0),
mMaxCacheSubId(1), mMaxCacheSubId(1),
mKeyBackUpDir(keyBackUpDir), BACKUP_KEY_FILE("key.log"), mLastKeyPublishTime(0) mKeyBackUpDir(keyBackUpDir), BACKUP_KEY_FILE("key.log"), mLastKeyPublishTime(0), mLastRecvdKeyTime(0)
{ {
/* force publication of groups (cleared if local cache file found) */ /* force publication of groups (cleared if local cache file found) */
mGroupsRepublish = true; mGroupsRepublish = true;
@ -121,7 +121,7 @@ int p3GroupDistrib::tick()
{ {
RsStackMutex stack(distribMtx); RsStackMutex stack(distribMtx);
toPublish = (mPendingPubKeyRecipients.size() > 0) && (now > 5 + mLastKeyPublishTime); toPublish = (mPendingPubKeyRecipients.size() > 0) && (now > (time_t) (mPubPeriod + mLastKeyPublishTime));
} }
if(toPublish){ if(toPublish){
@ -140,9 +140,11 @@ int p3GroupDistrib::tick()
{ {
RsStackMutex stack(distribMtx); RsStackMutex stack(distribMtx);
if(mPubKeysRecvd){ toReceive = (mRecvdPubKeys.size() > 0) && (now > (time_t) (mPubPeriod + mLastRecvdKeyTime));
if(toReceive)
locked_loadRecvdPubKeys(); locked_loadRecvdPubKeys();
}
} }
return 0; return 0;
@ -514,7 +516,13 @@ void p3GroupDistrib::loadGroupKey(RsDistribGrpKey *newKey)
std::cerr << "p3GroupDistrib::loadGroupKey() Group Not Found - discarding Key"; std::cerr << "p3GroupDistrib::loadGroupKey() Group Not Found - discarding Key";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
// if this is an in-date publish key then keep to see if group arrives later
if(((time_t)(newKey->key.startTS + mStorePeriod) > time(NULL)) && !(newKey->key.keyFlags & RSTLV_KEY_DISTRIB_ADMIN))
mRecvdPubKeys.insert(std::pair<std::string, RsDistribGrpKey*>(gid, newKey));
else
delete newKey; delete newKey;
return; return;
} }
@ -1378,6 +1386,32 @@ std::list<RsItem *> p3GroupDistrib::saveList(bool &cleanup)
} }
} }
// also save pending private publish keys you may have
std::map<std::string, RsDistribGrpKey* >::iterator pendKeyIt;
for(pendKeyIt = mRecvdPubKeys.begin(); pendKeyIt != mRecvdPubKeys.end(); pendKeyIt++)
{
RsDistribGrpKey *pubKey = new RsDistribGrpKey();
pubKey->grpId = pendKeyIt->first;
const unsigned char *keyptr = (const unsigned char *)
pendKeyIt->second->key.keyData.bin_data;
long keylen = pendKeyIt->second->key.keyData.bin_len;
RSA *rsa_priv = d2i_RSAPrivateKey(NULL, &(keyptr), keylen);
setRSAPrivateKey(pubKey->key, rsa_priv);
RSA_free(rsa_priv);
pubKey->key.keyFlags = pendKeyIt->second->key.keyFlags;
pubKey->key.startTS = pendKeyIt->second->key.startTS;
pubKey->key.endTS = pendKeyIt->second->key.endTS;
saveData.push_back(pubKey);
saveCleanupList.push_back(pubKey);
}
return saveData; return saveData;
} }
@ -1985,9 +2019,8 @@ void p3GroupDistrib::locked_receivePubKeys(){
} }
} }
if(mRecvdPubKeys.size() != 0){ if(!mRecvdPubKeys.empty())
mPubKeysRecvd = true; IndicateConfigChanged();
}
return; return;
} }
@ -2027,8 +2060,8 @@ void p3GroupDistrib::locked_loadRecvdPubKeys(){
} }
if(mRecvdPubKeys.size() == 0)
mPubKeysRecvd = false; mLastRecvdKeyTime = time(NULL);
if(ok) if(ok)

3
libretroshare/src/services/p3distrib.h
View File

@ -495,7 +495,6 @@ bool groupsChanged(std::list<std::string> &groupIds);
bool mGroupsChanged; bool mGroupsChanged;
bool mGroupsRepublish; bool mGroupsRepublish;
bool mPubKeysRecvd;
std::list<RsItem *> saveCleanupList; /* TEMPORARY LIST WHEN SAVING */ std::list<RsItem *> saveCleanupList; /* TEMPORARY LIST WHEN SAVING */
std::string mKeyBackUpDir; std::string mKeyBackUpDir;
@ -503,7 +502,7 @@ bool groupsChanged(std::list<std::string> &groupIds);
std::map<std::string, RsDistribGrpKey* > mRecvdPubKeys; /// full publishing keys received from users std::map<std::string, RsDistribGrpKey* > mRecvdPubKeys; /// full publishing keys received from users
std::map<std::string, std::list<std::string> > mPendingPubKeyRecipients; /// peers to receive publics key for a given grp std::map<std::string, std::list<std::string> > mPendingPubKeyRecipients; /// peers to receive publics key for a given grp
time_t mLastKeyPublishTime; time_t mLastKeyPublishTime, mLastRecvdKeyTime;
}; };