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

fixed compilation in new serialization test code

Browse source
This commit is contained in:
csoler 2017-04-02 15:04:03 +02:00
parent ddbe2ef9a1
commit 75a3cf0f3b
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/serialization/rsserializer.cc
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "util/rsprint.h"
#include "serialization/rsserializer.h" #include "serialization/rsserializer.h"
RsItem *RsSerializer::deserialise(const uint8_t *data,uint32_t size) RsItem *RsSerializer::deserialise(const uint8_t *data,uint32_t size)
@ -11,6 +12,7 @@ RsItem *RsSerializer::deserialise(const uint8_t *data,uint32_t size)
if(!item) if(!item)
{ {
std::cerr << "(EE) cannot deserialise: unknown item type " << std::hex << rstype << std::dec << std::endl; std::cerr << "(EE) cannot deserialise: unknown item type " << std::hex << rstype << std::dec << std::endl;
std::cerr << "(EE) Data is: " << RsUtil::BinToHex(data,std::min(50u,size)) << ((size>50)?"...":"") << std::endl;
return NULL ; return NULL ;
} }

4
libretroshare/src/serialization/rstypeserializer.h
View file

@ -4,6 +4,10 @@
class RsTypeSerializer class RsTypeSerializer
{ {
public: public:
// This type should be used to pass a parameter to drive the serialisation if needed.
typedef std::pair<std::string&,uint16_t> TlvString;
template<typename T> template<typename T>
static void serial_process(RsItem::SerializeJob j,SerializeContext& ctx,T& member) static void serial_process(RsItem::SerializeJob j,SerializeContext& ctx,T& member)
{ {

7
libretroshare/src/serialization/serial_test.cc
View file

@ -92,7 +92,7 @@ class RsTestItem: public RsItem
// //
virtual void serial_process(RsItem::SerializeJob j, SerializeContext& ctx) virtual void serial_process(RsItem::SerializeJob j, SerializeContext& ctx)
{ {
TlvString tt(str,TLV_TYPE_STR_DESCR) ; RsTypeSerializer::TlvString tt(str,TLV_TYPE_STR_DESCR) ;
RsTypeSerializer::serial_process(j,ctx,ts ) ; RsTypeSerializer::serial_process(j,ctx,ts ) ;
RsTypeSerializer::serial_process(j,ctx,tt ) ; RsTypeSerializer::serial_process(j,ctx,tt ) ;
@ -121,8 +121,11 @@ class RsTestSerializer: public RsSerializer
public: public:
RsTestSerializer() : RsSerializer(RS_SERVICE_TYPE_TEST) {} RsTestSerializer() : RsSerializer(RS_SERVICE_TYPE_TEST) {}
virtual RsItem *create_item(uint8_t subtype) virtual RsItem *create_item(uint16_t service_id,uint8_t subtype)
{ {
if(service_id != RS_SERVICE_TYPE_TEST)
return NULL ;
switch(subtype) switch(subtype)
{ {
case RS_ITEM_SUBTYPE_TEST1: return new RsTestItem(); case RS_ITEM_SUBTYPE_TEST1: return new RsTestItem();