From 096678ec6b0192ab5637be2f36bf6d3df3872233 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 12 Feb 2014 21:53:18 +0000 Subject: [PATCH] ID cleaning. Saving progress git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7110 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/gxs/rsdataservice.cc | 8 +++-- libretroshare/src/gxs/rsgenexchange.cc | 4 +-- libretroshare/src/gxs/rsgixs.h | 6 ++-- libretroshare/src/gxs/rsgxsdata.h | 2 +- libretroshare/src/gxs/rsgxsnetservice.cc | 8 ++--- libretroshare/src/gxs/rsgxsnetservice.h | 4 +-- libretroshare/src/retroshare/rsgxscircles.h | 2 +- .../src/retroshare/rsgxsifacetypes.h | 3 +- .../src/serialiser/rsgxsupdateitems.cc | 34 +++++++++---------- .../src/serialiser/rsgxsupdateitems.h | 6 ++-- libretroshare/src/services/p3idservice.h | 2 +- 11 files changed, 41 insertions(+), 38 deletions(-) diff --git a/libretroshare/src/gxs/rsdataservice.cc b/libretroshare/src/gxs/rsdataservice.cc index 8a1626323..4c2021bbb 100644 --- a/libretroshare/src/gxs/rsdataservice.cc +++ b/libretroshare/src/gxs/rsdataservice.cc @@ -308,7 +308,9 @@ RsGxsGrpMetaData* RsDataService::locked_getGrpMeta(RetroCursor &c) c.getString(COL_GRP_CIRCLE_ID, grpMeta->mCircleId); grpMeta->mCircleType = c.getInt32(COL_GRP_CIRCL_TYPE); 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->mRecvTS = c.getInt32(COL_GRP_RECV_TS); @@ -617,7 +619,7 @@ int RsDataService::storeGroup(std::map &grp) cv.put(KEY_GRP_CIRCLE_ID, grpMetaPtr->mCircleId); cv.put(KEY_GRP_CIRCLE_TYPE, (int32_t)grpMetaPtr->mCircleType); 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_PARENT_GRP_ID, grpMetaPtr->mParentGrpId); cv.put(KEY_NXS_HASH, grpMetaPtr->mHash); @@ -710,7 +712,7 @@ int RsDataService::updateGroup(std::map &grp) cv.put(KEY_GRP_CIRCLE_ID, grpMetaPtr->mCircleId); cv.put(KEY_GRP_CIRCLE_TYPE, (int32_t)grpMetaPtr->mCircleType); 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_NXS_HASH, grpMetaPtr->mHash); diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc index 48778064f..3047b8287 100644 --- a/libretroshare/src/gxs/rsgenexchange.cc +++ b/libretroshare/src/gxs/rsgenexchange.cc @@ -814,7 +814,7 @@ int RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, RsTlvSecu }else { - std::list peers; + std::list peers; peers.push_back(msg->PeerId()); mGixs->requestKey(metaData.mAuthorId, peers); return VALIDATE_FAIL_TRY_LATER; @@ -888,7 +888,7 @@ int RsGenExchange::validateGrp(RsNxsGrp* grp, RsTlvSecurityKeySet& grpKeySet) }else { - std::list peers; + std::list peers; peers.push_back(grp->PeerId()); mGixs->requestKey(metaData.mAuthorId, peers); return VALIDATE_FAIL_TRY_LATER; diff --git a/libretroshare/src/gxs/rsgixs.h b/libretroshare/src/gxs/rsgixs.h index cd3bddf9a..62fdc75e1 100644 --- a/libretroshare/src/gxs/rsgixs.h +++ b/libretroshare/src/gxs/rsgixs.h @@ -96,8 +96,8 @@ * as these will be used very frequently. *****/ -typedef std::string PeerId; // SHOULD BE REMOVED => RsPeerId (SSLID) -typedef std::string RsPgpId; +typedef RsPeerId PeerId; // SHOULD BE REMOVED => RsPeerId (SSLID) +typedef PGPIdType RsPgpId; typedef std::string RsGxsId; // @@ -176,7 +176,7 @@ class RsGixsReputation public: // get Reputation. virtual bool haveReputation(const RsGxsId &id) = 0; - virtual bool loadReputation(const RsGxsId &id, const std::list& peers) = 0; + virtual bool loadReputation(const RsGxsId &id, const std::list& peers) = 0; virtual bool getReputation(const RsGxsId &id, GixsReputation &rep) = 0; }; diff --git a/libretroshare/src/gxs/rsgxsdata.h b/libretroshare/src/gxs/rsgxsdata.h index 6fe905a9a..027631d07 100644 --- a/libretroshare/src/gxs/rsgxsdata.h +++ b/libretroshare/src/gxs/rsgxsdata.h @@ -75,7 +75,7 @@ public: uint32_t mGroupStatus; uint32_t mRecvTS; - std::string mOriginator; + RsPeerId mOriginator; std::string mInternalCircle; std::string mHash; }; diff --git a/libretroshare/src/gxs/rsgxsnetservice.cc b/libretroshare/src/gxs/rsgxsnetservice.cc index dddcf4f2b..291cc83e1 100644 --- a/libretroshare/src/gxs/rsgxsnetservice.cc +++ b/libretroshare/src/gxs/rsgxsnetservice.cc @@ -154,7 +154,7 @@ void RsGxsNetService::syncWithPeers() uint32_t updateTS = 0; if(mui) { - std::map::const_iterator cit2 = mui->msgUpdateTS.find(*vit); + std::map::const_iterator cit2 = mui->msgUpdateTS.find(*vit); if(cit2 != mui->msgUpdateTS.end()) { @@ -1627,8 +1627,8 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr) } } - std::map grpMetaMap; - std::map::const_iterator metaIter; + std::map grpMetaMap; + std::map::const_iterator metaIter; mDataStore->retrieveGxsGrpMetaData(grpMetaMap); // now do compare and add loop @@ -1705,7 +1705,7 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr) } // clean up meta data - std::map::iterator mit = grpMetaMap.begin(); + std::map::iterator mit = grpMetaMap.begin(); for(; mit != grpMetaMap.end(); mit++) delete mit->second; diff --git a/libretroshare/src/gxs/rsgxsnetservice.h b/libretroshare/src/gxs/rsgxsnetservice.h index 5ffd5d733..f97000bc7 100644 --- a/libretroshare/src/gxs/rsgxsnetservice.h +++ b/libretroshare/src/gxs/rsgxsnetservice.h @@ -441,9 +441,9 @@ private: public: - typedef std::map ClientMsgMap; + typedef std::map ClientMsgMap; typedef std::map ServerMsgMap; - typedef std::map ClientGrpMap; + typedef std::map ClientGrpMap; private: diff --git a/libretroshare/src/retroshare/rsgxscircles.h b/libretroshare/src/retroshare/rsgxscircles.h index 7d177ddd1..05b3690b0 100644 --- a/libretroshare/src/retroshare/rsgxscircles.h +++ b/libretroshare/src/retroshare/rsgxscircles.h @@ -44,7 +44,7 @@ extern RsGxsCircles *rsGxsCircles; typedef std::string RsGxsCircleId; -typedef std::string RsPgpId; +typedef PGPIdType RsPgpId; typedef std::string RsCircleInternalId; #define GXS_CIRCLE_TYPE_PUBLIC 0x0001 diff --git a/libretroshare/src/retroshare/rsgxsifacetypes.h b/libretroshare/src/retroshare/rsgxsifacetypes.h index 6f8bdda89..1fa3d2669 100644 --- a/libretroshare/src/retroshare/rsgxsifacetypes.h +++ b/libretroshare/src/retroshare/rsgxsifacetypes.h @@ -12,6 +12,7 @@ #include #include #include +#include typedef std::string RsGxsGroupId; @@ -77,7 +78,7 @@ public: uint32_t mGroupStatus; std::string mServiceString; // Service Specific Free-Form extra storage. - std::string mOriginator; + RsPeerId mOriginator; std::string mInternalCircle; }; diff --git a/libretroshare/src/serialiser/rsgxsupdateitems.cc b/libretroshare/src/serialiser/rsgxsupdateitems.cc index 032e28af7..a5dcb256d 100644 --- a/libretroshare/src/serialiser/rsgxsupdateitems.cc +++ b/libretroshare/src/serialiser/rsgxsupdateitems.cc @@ -177,7 +177,7 @@ RsItem* RsGxsUpdateSerialiser::deserialise(void* data, uint32_t* size) uint32_t RsGxsUpdateSerialiser::sizeGxsGrpUpdate(RsGxsGrpUpdateItem* item) { uint32_t s = 8; // header size - s += GetTlvStringSize(item->peerId); + s += item->peerId.serial_size(); s += 4; return s; } @@ -218,7 +218,7 @@ bool RsGxsUpdateSerialiser::serialiseGxsGrpUpdate(RsGxsGrpUpdateItem* item, /* 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); if(offset != tlvsize){ @@ -326,7 +326,7 @@ RsGxsGrpUpdateItem* RsGxsUpdateSerialiser::deserialGxsGrpUpddate(void* data, /* skip the header */ 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)); if (offset != rssize) @@ -419,15 +419,15 @@ RsGxsServerGrpUpdateItem* RsGxsUpdateSerialiser::deserialGxsServerGrpUpddate(voi uint32_t RsGxsUpdateSerialiser::sizeGxsMsgUpdate(RsGxsMsgUpdateItem* item) { uint32_t s = 8; // header size - s += GetTlvStringSize(item->peerId); + s += item->peerId.serial_size() ;//GetTlvStringSize(item->peerId); - const std::map& msgUpdateTS = item->msgUpdateTS; - std::map::const_iterator cit = msgUpdateTS.begin(); + const std::map& msgUpdateTS = item->msgUpdateTS; + std::map::const_iterator cit = msgUpdateTS.begin(); for(; cit != msgUpdateTS.end(); cit++) { - s += GetTlvStringSize(cit->first); - s += 4; + s += s += GetTlvStringSize(cit->first); + s += 4; } s += 4; // number of map items @@ -473,17 +473,17 @@ bool RsGxsUpdateSerialiser::serialiseGxsMsgUpdate(RsGxsMsgUpdateItem* item, /* RsGxsMsgUpdateItem */ - ok &= SetTlvString(data, *size, &offset, TLV_TYPE_STR_PEERID, item->peerId); + ok &= item->peerId.serialise(data, *size, offset) ; - const std::map& msgUpdateTS = item->msgUpdateTS; - std::map::const_iterator cit = msgUpdateTS.begin(); + const std::map& msgUpdateTS = item->msgUpdateTS; + std::map::const_iterator cit = msgUpdateTS.begin(); uint32_t numItems = msgUpdateTS.size(); ok &= setRawUInt32(data, *size, &offset, numItems); for(; cit != msgUpdateTS.end(); cit++) { - ok &= SetTlvString(data, *size, &offset, TLV_TYPE_STR_GROUPID, cit->first); + ok &= SetTlvString(data, *size, &offset,TLV_TYPE_STR_GROUPID,cit->first) ; ok &= setRawUInt32(data, *size, &offset, cit->second); } @@ -594,15 +594,15 @@ RsGxsMsgUpdateItem* RsGxsUpdateSerialiser::deserialGxsMsgUpdate(void* data, /* skip the header */ offset += 8; - ok &= GetTlvString(data, *size, &offset, TLV_TYPE_STR_PEERID, item->peerId); + ok &= item->peerId.deserialise(data, *size, offset) ; uint32_t numUpdateItems; ok &= getRawUInt32(data, *size, &offset, &(numUpdateItems)); - std::map& msgUpdateItem = item->msgUpdateTS; - std::string grpId; + std::map& msgUpdateItem = item->msgUpdateTS; + RsGxsGroupId pId; uint32_t updateTS; 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) break; @@ -612,7 +612,7 @@ RsGxsMsgUpdateItem* RsGxsUpdateSerialiser::deserialGxsMsgUpdate(void* data, if(!ok) break; - msgUpdateItem.insert(std::make_pair(grpId, updateTS)); + msgUpdateItem.insert(std::make_pair(pId, updateTS)); } if (offset != rssize) diff --git a/libretroshare/src/serialiser/rsgxsupdateitems.h b/libretroshare/src/serialiser/rsgxsupdateitems.h index 77e3b2476..cd839c39f 100644 --- a/libretroshare/src/serialiser/rsgxsupdateitems.h +++ b/libretroshare/src/serialiser/rsgxsupdateitems.h @@ -52,7 +52,7 @@ public: virtual void clear(); virtual std::ostream &print(std::ostream &out, uint16_t indent); - std::string peerId; + RsPeerId peerId; uint32_t grpUpdateTS; }; @@ -79,8 +79,8 @@ public: virtual void clear(); virtual std::ostream &print(std::ostream &out, uint16_t indent); - std::string peerId; - std::map msgUpdateTS; + RsPeerId peerId; + std::map msgUpdateTS; }; class RsGxsServerMsgUpdateItem : public RsItem diff --git a/libretroshare/src/services/p3idservice.h b/libretroshare/src/services/p3idservice.h index ff5dae197..0269c7f97 100644 --- a/libretroshare/src/services/p3idservice.h +++ b/libretroshare/src/services/p3idservice.h @@ -264,7 +264,7 @@ virtual int getPrivateKey(const RsGxsId &id, RsTlvSecurityKey &key); // get Reputation. virtual bool haveReputation(const RsGxsId &id); -virtual bool loadReputation(const RsGxsId &id, const std::list& peers); +virtual bool loadReputation(const RsGxsId &id, const std::list& peers); virtual bool getReputation(const RsGxsId &id, GixsReputation &rep);