Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-14 17:15:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ID cleaning. Saving progress

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7110 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-02-12 21:53:18 +00:00
parent 4b7a2160b9
commit 096678ec6b
11 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/gxs/rsdataservice.cc
View file

@ -308,7 +308,9 @@ RsGxsGrpMetaData* RsDataService::locked_getGrpMeta(RetroCursor &c)
c.getString(COL_GRP_CIRCLE_ID, grpMeta->mCircleId); c.getString(COL_GRP_CIRCLE_ID, grpMeta->mCircleId);
grpMeta->mCircleType = c.getInt32(COL_GRP_CIRCL_TYPE); grpMeta->mCircleType = c.getInt32(COL_GRP_CIRCL_TYPE);
c.getString(COL_GRP_INTERN_CIRCLE, grpMeta->mInternalCircle); c.getString(COL_GRP_INTERN_CIRCLE, grpMeta->mInternalCircle);
c.getString(COL_GRP_ORIGINATOR, grpMeta->mOriginator);
std::string s ; c.getString(COL_GRP_ORIGINATOR, s) ;
grpMeta->mOriginator = RsPeerId(s);
grpMeta->mAuthenFlags = c.getInt32(COL_GRP_AUTHEN_FLAGS); grpMeta->mAuthenFlags = c.getInt32(COL_GRP_AUTHEN_FLAGS);
grpMeta->mRecvTS = c.getInt32(COL_GRP_RECV_TS); grpMeta->mRecvTS = c.getInt32(COL_GRP_RECV_TS);
@ -617,7 +619,7 @@ int RsDataService::storeGroup(std::map<RsNxsGrp *, RsGxsGrpMetaData *> &grp)
cv.put(KEY_GRP_CIRCLE_ID, grpMetaPtr->mCircleId); cv.put(KEY_GRP_CIRCLE_ID, grpMetaPtr->mCircleId);
cv.put(KEY_GRP_CIRCLE_TYPE, (int32_t)grpMetaPtr->mCircleType); cv.put(KEY_GRP_CIRCLE_TYPE, (int32_t)grpMetaPtr->mCircleType);
cv.put(KEY_GRP_INTERNAL_CIRCLE, grpMetaPtr->mInternalCircle); cv.put(KEY_GRP_INTERNAL_CIRCLE, grpMetaPtr->mInternalCircle);
cv.put(KEY_GRP_ORIGINATOR, grpMetaPtr->mOriginator); cv.put(KEY_GRP_ORIGINATOR, grpMetaPtr->mOriginator.toStdString());
cv.put(KEY_GRP_AUTHEN_FLAGS, (int32_t)grpMetaPtr->mAuthenFlags); cv.put(KEY_GRP_AUTHEN_FLAGS, (int32_t)grpMetaPtr->mAuthenFlags);
cv.put(KEY_PARENT_GRP_ID, grpMetaPtr->mParentGrpId); cv.put(KEY_PARENT_GRP_ID, grpMetaPtr->mParentGrpId);
cv.put(KEY_NXS_HASH, grpMetaPtr->mHash); cv.put(KEY_NXS_HASH, grpMetaPtr->mHash);
@ -710,7 +712,7 @@ int RsDataService::updateGroup(std::map<RsNxsGrp *, RsGxsGrpMetaData *> &grp)
cv.put(KEY_GRP_CIRCLE_ID, grpMetaPtr->mCircleId); cv.put(KEY_GRP_CIRCLE_ID, grpMetaPtr->mCircleId);
cv.put(KEY_GRP_CIRCLE_TYPE, (int32_t)grpMetaPtr->mCircleType); cv.put(KEY_GRP_CIRCLE_TYPE, (int32_t)grpMetaPtr->mCircleType);
cv.put(KEY_GRP_INTERNAL_CIRCLE, grpMetaPtr->mInternalCircle); cv.put(KEY_GRP_INTERNAL_CIRCLE, grpMetaPtr->mInternalCircle);
cv.put(KEY_GRP_ORIGINATOR, grpMetaPtr->mOriginator); cv.put(KEY_GRP_ORIGINATOR, grpMetaPtr->mOriginator.toStdString());
cv.put(KEY_GRP_AUTHEN_FLAGS, (int32_t)grpMetaPtr->mAuthenFlags); cv.put(KEY_GRP_AUTHEN_FLAGS, (int32_t)grpMetaPtr->mAuthenFlags);
cv.put(KEY_NXS_HASH, grpMetaPtr->mHash); cv.put(KEY_NXS_HASH, grpMetaPtr->mHash);

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

@ -814,7 +814,7 @@ int RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, RsTlvSecu
}else }else
{ {
std::list<std::string> peers; std::list<RsPeerId> peers;
peers.push_back(msg->PeerId()); peers.push_back(msg->PeerId());
mGixs->requestKey(metaData.mAuthorId, peers); mGixs->requestKey(metaData.mAuthorId, peers);
return VALIDATE_FAIL_TRY_LATER; return VALIDATE_FAIL_TRY_LATER;
@ -888,7 +888,7 @@ int RsGenExchange::validateGrp(RsNxsGrp* grp, RsTlvSecurityKeySet& grpKeySet)
}else }else
{ {
std::list<std::string> peers; std::list<RsPeerId> peers;
peers.push_back(grp->PeerId()); peers.push_back(grp->PeerId());
mGixs->requestKey(metaData.mAuthorId, peers); mGixs->requestKey(metaData.mAuthorId, peers);
return VALIDATE_FAIL_TRY_LATER; return VALIDATE_FAIL_TRY_LATER;

6
libretroshare/src/gxs/rsgixs.h
View file

@ -96,8 +96,8 @@
* as these will be used very frequently. * as these will be used very frequently.
*****/ *****/
typedef std::string PeerId; // SHOULD BE REMOVED => RsPeerId (SSLID) typedef RsPeerId PeerId; // SHOULD BE REMOVED => RsPeerId (SSLID)
typedef std::string RsPgpId; typedef PGPIdType RsPgpId;
typedef std::string RsGxsId; typedef std::string RsGxsId;
// //
@ -176,7 +176,7 @@ class RsGixsReputation
public: public:
// get Reputation. // get Reputation.
virtual bool haveReputation(const RsGxsId &id) = 0; virtual bool haveReputation(const RsGxsId &id) = 0;
virtual bool loadReputation(const RsGxsId &id, const std::list<std::string>& peers) = 0; virtual bool loadReputation(const RsGxsId &id, const std::list<RsPeerId>& peers) = 0;
virtual bool getReputation(const RsGxsId &id, GixsReputation &rep) = 0; virtual bool getReputation(const RsGxsId &id, GixsReputation &rep) = 0;
}; };

2
libretroshare/src/gxs/rsgxsdata.h
View file

@ -75,7 +75,7 @@ public:
uint32_t mGroupStatus; uint32_t mGroupStatus;
uint32_t mRecvTS; uint32_t mRecvTS;
std::string mOriginator; RsPeerId mOriginator;
std::string mInternalCircle; std::string mInternalCircle;
std::string mHash; std::string mHash;
}; };

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

@ -154,7 +154,7 @@ void RsGxsNetService::syncWithPeers()
uint32_t updateTS = 0; uint32_t updateTS = 0;
if(mui) if(mui)
{ {
std::map<RsPeerId, uint32_t>::const_iterator cit2 = mui->msgUpdateTS.find(*vit); std::map<RsGxsGroupId, uint32_t>::const_iterator cit2 = mui->msgUpdateTS.find(*vit);
if(cit2 != mui->msgUpdateTS.end()) if(cit2 != mui->msgUpdateTS.end())
{ {
@ -1627,8 +1627,8 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr)
} }
} }
std::map<RsPeerId, RsGxsGrpMetaData*> grpMetaMap; std::map<RsGxsGroupId, RsGxsGrpMetaData*> grpMetaMap;
std::map<RsPeerId, RsGxsGrpMetaData*>::const_iterator metaIter; std::map<RsGxsGroupId, RsGxsGrpMetaData*>::const_iterator metaIter;
mDataStore->retrieveGxsGrpMetaData(grpMetaMap); mDataStore->retrieveGxsGrpMetaData(grpMetaMap);
// now do compare and add loop // now do compare and add loop
@ -1705,7 +1705,7 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr)
} }
// clean up meta data // clean up meta data
std::map<RsPeerId, RsGxsGrpMetaData*>::iterator mit = grpMetaMap.begin(); std::map<RsGxsGroupId, RsGxsGrpMetaData*>::iterator mit = grpMetaMap.begin();
for(; mit != grpMetaMap.end(); mit++) for(; mit != grpMetaMap.end(); mit++)
delete mit->second; delete mit->second;

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

@ -441,9 +441,9 @@ private:
public: public:
typedef std::map<std::string, RsGxsMsgUpdateItem*> ClientMsgMap; typedef std::map<RsPeerId, RsGxsMsgUpdateItem*> ClientMsgMap;
typedef std::map<std::string, RsGxsServerMsgUpdateItem*> ServerMsgMap; typedef std::map<std::string, RsGxsServerMsgUpdateItem*> ServerMsgMap;
typedef std::map<std::string, RsGxsGrpUpdateItem*> ClientGrpMap; typedef std::map<RsPeerId, RsGxsGrpUpdateItem*> ClientGrpMap;
private: private:

2
libretroshare/src/retroshare/rsgxscircles.h
View file

@ -44,7 +44,7 @@ extern RsGxsCircles *rsGxsCircles;
typedef std::string RsGxsCircleId; typedef std::string RsGxsCircleId;
typedef std::string RsPgpId; typedef PGPIdType RsPgpId;
typedef std::string RsCircleInternalId; typedef std::string RsCircleInternalId;
#define GXS_CIRCLE_TYPE_PUBLIC 0x0001 #define GXS_CIRCLE_TYPE_PUBLIC 0x0001

3
libretroshare/src/retroshare/rsgxsifacetypes.h
View file

@ -12,6 +12,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <inttypes.h> #include <inttypes.h>
#include <retroshare/rstypes.h>
typedef std::string RsGxsGroupId; typedef std::string RsGxsGroupId;
@ -77,7 +78,7 @@ public:
uint32_t mGroupStatus; uint32_t mGroupStatus;
std::string mServiceString; // Service Specific Free-Form extra storage. std::string mServiceString; // Service Specific Free-Form extra storage.
std::string mOriginator; RsPeerId mOriginator;
std::string mInternalCircle; std::string mInternalCircle;
}; };

30
libretroshare/src/serialiser/rsgxsupdateitems.cc
View file

@ -177,7 +177,7 @@ RsItem* RsGxsUpdateSerialiser::deserialise(void* data, uint32_t* size)
uint32_t RsGxsUpdateSerialiser::sizeGxsGrpUpdate(RsGxsGrpUpdateItem* item) uint32_t RsGxsUpdateSerialiser::sizeGxsGrpUpdate(RsGxsGrpUpdateItem* item)
{ {
uint32_t s = 8; // header size uint32_t s = 8; // header size
s += GetTlvStringSize(item->peerId); s += item->peerId.serial_size();
s += 4; s += 4;
return s; return s;
} }
@ -218,7 +218,7 @@ bool RsGxsUpdateSerialiser::serialiseGxsGrpUpdate(RsGxsGrpUpdateItem* item,
/* RsGxsGrpUpdateItem */ /* RsGxsGrpUpdateItem */
ok &= SetTlvString(data, *size, &offset, TLV_TYPE_STR_PEERID, item->peerId); ok &= item->peerId.serialise(data, *size, offset) ;
ok &= setRawUInt32(data, *size, &offset, item->grpUpdateTS); ok &= setRawUInt32(data, *size, &offset, item->grpUpdateTS);
if(offset != tlvsize){ if(offset != tlvsize){
@ -326,7 +326,7 @@ RsGxsGrpUpdateItem* RsGxsUpdateSerialiser::deserialGxsGrpUpddate(void* data,
/* skip the header */ /* skip the header */
offset += 8; offset += 8;
ok &= GetTlvString(data, *size, &offset, TLV_TYPE_STR_PEERID, item->peerId); ok &= item->peerId.deserialise(data, *size, offset) ;
ok &= getRawUInt32(data, *size, &offset, &(item->grpUpdateTS)); ok &= getRawUInt32(data, *size, &offset, &(item->grpUpdateTS));
if (offset != rssize) if (offset != rssize)
@ -419,14 +419,14 @@ RsGxsServerGrpUpdateItem* RsGxsUpdateSerialiser::deserialGxsServerGrpUpddate(voi
uint32_t RsGxsUpdateSerialiser::sizeGxsMsgUpdate(RsGxsMsgUpdateItem* item) uint32_t RsGxsUpdateSerialiser::sizeGxsMsgUpdate(RsGxsMsgUpdateItem* item)
{ {
uint32_t s = 8; // header size uint32_t s = 8; // header size
s += GetTlvStringSize(item->peerId); s += item->peerId.serial_size() ;//GetTlvStringSize(item->peerId);
const std::map<std::string, uint32_t>& msgUpdateTS = item->msgUpdateTS; const std::map<RsGxsGroupId, uint32_t>& msgUpdateTS = item->msgUpdateTS;
std::map<std::string, uint32_t>::const_iterator cit = msgUpdateTS.begin(); std::map<RsGxsGroupId, uint32_t>::const_iterator cit = msgUpdateTS.begin();
for(; cit != msgUpdateTS.end(); cit++) for(; cit != msgUpdateTS.end(); cit++)
{ {
s += GetTlvStringSize(cit->first); s += s += GetTlvStringSize(cit->first);
s += 4; s += 4;
} }
@ -473,10 +473,10 @@ bool RsGxsUpdateSerialiser::serialiseGxsMsgUpdate(RsGxsMsgUpdateItem* item,
/* RsGxsMsgUpdateItem */ /* RsGxsMsgUpdateItem */
ok &= SetTlvString(data, *size, &offset, TLV_TYPE_STR_PEERID, item->peerId); ok &= item->peerId.serialise(data, *size, offset) ;
const std::map<std::string, uint32_t>& msgUpdateTS = item->msgUpdateTS; const std::map<RsGxsGroupId, uint32_t>& msgUpdateTS = item->msgUpdateTS;
std::map<std::string, uint32_t>::const_iterator cit = msgUpdateTS.begin(); std::map<RsGxsGroupId, uint32_t>::const_iterator cit = msgUpdateTS.begin();
uint32_t numItems = msgUpdateTS.size(); uint32_t numItems = msgUpdateTS.size();
ok &= setRawUInt32(data, *size, &offset, numItems); ok &= setRawUInt32(data, *size, &offset, numItems);
@ -594,15 +594,15 @@ RsGxsMsgUpdateItem* RsGxsUpdateSerialiser::deserialGxsMsgUpdate(void* data,
/* skip the header */ /* skip the header */
offset += 8; offset += 8;
ok &= GetTlvString(data, *size, &offset, TLV_TYPE_STR_PEERID, item->peerId); ok &= item->peerId.deserialise(data, *size, offset) ;
uint32_t numUpdateItems; uint32_t numUpdateItems;
ok &= getRawUInt32(data, *size, &offset, &(numUpdateItems)); ok &= getRawUInt32(data, *size, &offset, &(numUpdateItems));
std::map<std::string, uint32_t>& msgUpdateItem = item->msgUpdateTS; std::map<RsGxsGroupId, uint32_t>& msgUpdateItem = item->msgUpdateTS;
std::string grpId; RsGxsGroupId pId;
uint32_t updateTS; uint32_t updateTS;
for(uint32_t i = 0; i < numUpdateItems; i++) for(uint32_t i = 0; i < numUpdateItems; i++)
{ {
ok &= GetTlvString(data, *size, &offset, TLV_TYPE_STR_GROUPID, grpId); ok &= GetTlvString(data, *size, &offset,TLV_TYPE_STR_GROUPID,pId) ;
if(!ok) if(!ok)
break; break;
@ -612,7 +612,7 @@ RsGxsMsgUpdateItem* RsGxsUpdateSerialiser::deserialGxsMsgUpdate(void* data,
if(!ok) if(!ok)
break; break;
msgUpdateItem.insert(std::make_pair(grpId, updateTS)); msgUpdateItem.insert(std::make_pair(pId, updateTS));
} }
if (offset != rssize) if (offset != rssize)

6
libretroshare/src/serialiser/rsgxsupdateitems.h
View file

@ -52,7 +52,7 @@ public:
virtual void clear(); virtual void clear();
virtual std::ostream &print(std::ostream &out, uint16_t indent); virtual std::ostream &print(std::ostream &out, uint16_t indent);
std::string peerId; RsPeerId peerId;
uint32_t grpUpdateTS; uint32_t grpUpdateTS;
}; };
@ -79,8 +79,8 @@ public:
virtual void clear(); virtual void clear();
virtual std::ostream &print(std::ostream &out, uint16_t indent); virtual std::ostream &print(std::ostream &out, uint16_t indent);
std::string peerId; RsPeerId peerId;
std::map<std::string, uint32_t> msgUpdateTS; std::map<RsGxsGroupId, uint32_t> msgUpdateTS;
}; };
class RsGxsServerMsgUpdateItem : public RsItem class RsGxsServerMsgUpdateItem : public RsItem

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

@ -264,7 +264,7 @@ virtual int getPrivateKey(const RsGxsId &id, RsTlvSecurityKey &key);
// get Reputation. // get Reputation.
virtual bool haveReputation(const RsGxsId &id); virtual bool haveReputation(const RsGxsId &id);
virtual bool loadReputation(const RsGxsId &id, const std::list<std::string>& peers); virtual bool loadReputation(const RsGxsId &id, const std::list<RsPeerId>& peers);
virtual bool getReputation(const RsGxsId &id, GixsReputation &rep); virtual bool getReputation(const RsGxsId &id, GixsReputation &rep);