mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-06 16:15:23 -04:00
switched rsstatusitem to new serializer
This commit is contained in:
parent
07a93be1b2
commit
87018edeb2
2 changed files with 26 additions and 26 deletions
|
@ -23,6 +23,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef TO_REMOVE
|
||||||
#include "serialiser/rsstatusitems.h"
|
#include "serialiser/rsstatusitems.h"
|
||||||
#include "serialiser/rsbaseserial.h"
|
#include "serialiser/rsbaseserial.h"
|
||||||
|
|
||||||
|
@ -173,3 +174,5 @@ RsItem *RsStatusSerialiser::deserialise(void *data, uint32_t *pktsize)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -30,49 +30,46 @@
|
||||||
#include "rsitems/itempriorities.h"
|
#include "rsitems/itempriorities.h"
|
||||||
#include "rsitems/rsitem.h"
|
#include "rsitems/rsitem.h"
|
||||||
|
|
||||||
|
#include "serialization/rstypeserializer.h"
|
||||||
|
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
|
|
||||||
class RsStatusItem: public RsItem
|
class RsStatusItem: public RsItem
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
RsStatusItem()
|
RsStatusItem() :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_STATUS, RS_PKT_SUBTYPE_DEFAULT)
|
||||||
:RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_STATUS,
|
|
||||||
RS_PKT_SUBTYPE_DEFAULT)
|
|
||||||
{
|
{
|
||||||
setPriorityLevel(QOS_PRIORITY_RS_STATUS_ITEM);
|
setPriorityLevel(QOS_PRIORITY_RS_STATUS_ITEM);
|
||||||
}
|
}
|
||||||
virtual ~RsStatusItem();
|
virtual ~RsStatusItem() {}
|
||||||
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)
|
||||||
|
{
|
||||||
|
RsTypeSerializer::serial_process<uint32_t>(j,ctx,sendTime,"sendTime") ;
|
||||||
|
RsTypeSerializer::serial_process<uint32_t>(j,ctx,status ,"status") ;
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t sendTime;
|
uint32_t sendTime;
|
||||||
|
|
||||||
uint32_t status;
|
uint32_t status;
|
||||||
|
|
||||||
/* not serialised */
|
/* not serialised */
|
||||||
uint32_t recvTime;
|
uint32_t recvTime;
|
||||||
};
|
};
|
||||||
|
|
||||||
class RsStatusSerialiser: public RsSerialType
|
class RsStatusSerialiser: public RsServiceSerializer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
RsStatusSerialiser()
|
RsStatusSerialiser() :RsServiceSerializer(RS_SERVICE_TYPE_STATUS) {}
|
||||||
:RsSerialType(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_STATUS)
|
virtual ~RsStatusSerialiser() {}
|
||||||
{ return; }
|
|
||||||
virtual ~RsStatusSerialiser()
|
|
||||||
{ 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 sizeItem(RsStatusItem *);
|
|
||||||
virtual bool serialiseItem (RsStatusItem *item, void *data, uint32_t *size);
|
|
||||||
virtual RsStatusItem *deserialiseItem(void *data, uint32_t *size);
|
|
||||||
|
|
||||||
|
|
||||||
|
virtual RsItem *create_item(uint16_t service,uint8_t item_subtype) const
|
||||||
|
{
|
||||||
|
if(service == RS_SERVICE_TYPE_STATUS && item_subtype == RS_PKT_SUBTYPE_DEFAULT)
|
||||||
|
return new RsStatusItem();
|
||||||
|
else
|
||||||
|
return NULL ;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue