Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-06 16:15:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

switched serviceinfo items to new serialization

Browse source
This commit is contained in:
csoler 2017-04-28 17:44:45 +02:00
parent c33c34b175
commit 2d19783296
3 changed files with 43 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

51
libretroshare/src/serialiser/rsserviceinfoitems.cc
View file

@ -25,6 +25,7 @@
#include "serialiser/rsbaseserial.h" #include "serialiser/rsbaseserial.h"
#include "serialiser/rsserviceinfoitems.h" #include "serialiser/rsserviceinfoitems.h"
#include "serialization/rstypeserializer.h"
/*** /***
#define RSSERIAL_DEBUG 1 #define RSSERIAL_DEBUG 1
@ -35,8 +36,7 @@
/*************************************************************************/ /*************************************************************************/
/***** RsServiceInfo ****/ /***** RsServiceInfo ****/
template<> template<> std::ostream& RsTlvParamRef<RsServiceInfo>::print(std::ostream &out, uint16_t /*indent*/) const
std::ostream &RsTlvParamRef<RsServiceInfo>::print(std::ostream &out, uint16_t /*indent*/) const
{ {
out << "RsServiceInfo: " << mParam.mServiceType << " name " << mParam.mServiceName; out << "RsServiceInfo: " << mParam.mServiceType << " name " << mParam.mServiceName;
out << std::endl; out << std::endl;
@ -138,38 +138,19 @@ template class RsTlvParamRef<RsServiceInfo>;
/*************************************************************************/ /*************************************************************************/
RsServiceInfoListItem::~RsServiceInfoListItem()
{
return;
}
void RsServiceInfoListItem::clear() void RsServiceInfoListItem::clear()
{ {
mServiceInfo.clear(); mServiceInfo.clear();
} }
std::ostream &RsServiceInfoListItem::print(std::ostream &out, uint16_t indent) void RsServiceInfoListItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
{ {
printRsItemBase(out, "RsServiceInfoListItem", indent);
uint16_t int_Indent = indent + 2;
RsTlvServiceInfoMapRef map(mServiceInfo); RsTlvServiceInfoMapRef map(mServiceInfo);
map.print(out, int_Indent);
out << std::endl;
printRsItemEnd(out, "RsServiceInfoListItem", indent); RsTypeSerializer::serial_process<RsTlvItem>(j,ctx,map,"map") ;
return out;
}
uint32_t RsServiceInfoSerialiser::sizeInfo(RsServiceInfoListItem *item)
{
uint32_t s = 8; /* header */
RsTlvServiceInfoMapRef map(item->mServiceInfo);
s += map.TlvSize();
return s;
} }
#ifdef TO_REMOVE
/* serialise the data to the buffer */ /* serialise the data to the buffer */
bool RsServiceInfoSerialiser::serialiseInfo(RsServiceInfoListItem *item, void *data, uint32_t *pktsize) bool RsServiceInfoSerialiser::serialiseInfo(RsServiceInfoListItem *item, void *data, uint32_t *pktsize)
{ {
@ -291,7 +272,14 @@ uint32_t RsServiceInfoSerialiser::sizePermissions(RsServiceInfoPermissionsIte
return s; return s;
} }
#endif
void RsServiceInfoPermissionsItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
{
RsTypeSerializer::serial_process<uint32_t>(j,ctx,allowedBw,"allowedBw") ;
}
#ifdef TO_REMOVE
/* serialise the data to the buffer */ /* serialise the data to the buffer */
bool RsServiceInfoSerialiser::serialisePermissions(RsServiceInfoPermissionsItem *item, void *data, uint32_t *pktsize) bool RsServiceInfoSerialiser::serialisePermissions(RsServiceInfoPermissionsItem *item, void *data, uint32_t *pktsize)
{ {
@ -440,6 +428,21 @@ RsItem *RsServiceInfoSerialiser::deserialise(void *data, uint32_t *pktsize)
} }
/*************************************************************************/ /*************************************************************************/
#endif
RsItem *RsServiceInfoSerialiser::create_item(uint16_t service, uint8_t item_sub_id) const
{
if(service != RS_SERVICE_TYPE_SERVICEINFO)
return NULL ;
switch(item_sub_id)
{
case RS_PKT_SUBTYPE_SERVICELIST_ITEM: return new RsServiceInfoListItem() ;
case RS_PKT_SUBTYPE_SERVICEPERMISSIONS_ITEM: return new RsServiceInfoPermissionsItem() ;
default:
return NULL ;
}
}

55
libretroshare/src/serialiser/rsserviceinfoitems.h
View file

@ -34,8 +34,6 @@
#include "rsitems/rsitem.h" #include "rsitems/rsitem.h"
#include "rsitems/itempriorities.h" #include "rsitems/itempriorities.h"
#include "serialiser/rsserial.h"
#include "serialiser/rstlvbase.h"
#include "serialiser/rstlvgenericmap.h" #include "serialiser/rstlvgenericmap.h"
#include "retroshare/rsservicecontrol.h" #include "retroshare/rsservicecontrol.h"
@ -63,72 +61,47 @@ public:
} }
}; };
class RsServiceInfoListItem: public RsItem class RsServiceInfoListItem: public RsItem
{ {
public: public:
RsServiceInfoListItem() RsServiceInfoListItem() :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_SERVICEINFO, RS_PKT_SUBTYPE_SERVICELIST_ITEM)
:RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_SERVICEINFO,
RS_PKT_SUBTYPE_SERVICELIST_ITEM)
{ {
setPriorityLevel(QOS_PRIORITY_RS_SERVICE_INFO_ITEM); setPriorityLevel(QOS_PRIORITY_RS_SERVICE_INFO_ITEM);
return; return;
} }
virtual ~RsServiceInfoListItem(); virtual ~RsServiceInfoListItem(){}
virtual void clear(); virtual void clear();
std::ostream &print(std::ostream &out, uint16_t indent = 0);
virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx);
std::map<uint32_t, RsServiceInfo> mServiceInfo; std::map<uint32_t, RsServiceInfo> mServiceInfo;
}; };
class RsServiceInfoPermissionsItem: public RsItem class RsServiceInfoPermissionsItem: public RsItem
{ {
public: public:
RsServiceInfoPermissionsItem() RsServiceInfoPermissionsItem() :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_SERVICEINFO, RS_PKT_SUBTYPE_SERVICEPERMISSIONS_ITEM)
:RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_SERVICEINFO,
RS_PKT_SUBTYPE_SERVICEPERMISSIONS_ITEM)
{ {
setPriorityLevel(QOS_PRIORITY_RS_SERVICE_INFO_ITEM); setPriorityLevel(QOS_PRIORITY_RS_SERVICE_INFO_ITEM);
return; return;
} }
virtual ~RsServiceInfoPermissionsItem(); virtual ~RsServiceInfoPermissionsItem(){}
virtual void clear(); virtual void clear(){}
std::ostream &print(std::ostream &out, uint16_t indent = 0);
virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx);
uint32_t allowedBw; // Units are bytes/sec => 4Gb/s; uint32_t allowedBw; // Units are bytes/sec => 4Gb/s;
}; };
class RsServiceInfoSerialiser: public RsServiceSerializer
class RsServiceInfoSerialiser: public RsSerialType
{ {
public: public:
RsServiceInfoSerialiser() RsServiceInfoSerialiser() :RsServiceSerializer(RS_SERVICE_TYPE_SERVICEINFO) {}
:RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_SERVICEINFO) virtual ~RsServiceInfoSerialiser() {}
{ return; }
virtual ~RsServiceInfoSerialiser()
{ return; }
virtual uint32_t size(RsItem *);
virtual bool serialise (RsItem *item, void *data, uint32_t *size);
virtual RsItem * deserialise(void *data, uint32_t *size);
private:
virtual uint32_t sizeInfo(RsServiceInfoListItem *);
virtual bool serialiseInfo(RsServiceInfoListItem *item, void *data, uint32_t *size);
virtual RsServiceInfoListItem *deserialiseInfo(void *data, uint32_t *size);
virtual uint32_t sizePermissions(RsServiceInfoPermissionsItem *);
virtual bool serialisePermissions(RsServiceInfoPermissionsItem *item, void *data, uint32_t *size);
virtual RsServiceInfoPermissionsItem *deserialisePermissions(void *data, uint32_t *size);
virtual RsItem *create_item(uint16_t /* service */, uint8_t /* item_sub_id */) const;
}; };
/**************************************************************************/ /**************************************************************************/

1
libretroshare/src/serialiser/rstlvgenericmap.inl
View file

@ -24,6 +24,7 @@
* *
*/ */
#include "serialiser/rstlvbase.h"
// Must be different - as this is inline in headers. // Must be different - as this is inline in headers.
//#define TLV_GENERICMAP_DEBUG 1 //#define TLV_GENERICMAP_DEBUG 1