Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'json_experiments'

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-04-27 18:17:09 +02:00
commit f3ae61b462
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
38 changed files with 1480 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -19,6 +19,11 @@ before_install:
- if [ $TRAVIS_OS_NAME == osx ]; then brew install qt55 openssl miniupnpc libmicrohttpd sqlcipher; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt55 openssl miniupnpc libmicrohttpd sqlcipher; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt55 ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt55 ; fi
- wget https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
- tar -xf v1.1.0.tar.gz
- if [ $TRAVIS_OS_NAME == osx ]; then cp -r rapidjson-1.1.0/include/rapidjson/ /usr/local/include/rapidjson ; fi
- if [ $TRAVIS_OS_NAME == linux ]; then sudo cp -r rapidjson-1.1.0/include/rapidjson/ /usr/include/rapidjson ; fi
env: env:
global: global:
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created

9
android-prepare-toolchain.sh
View File

@ -313,6 +313,14 @@ build_libmicrohttpd()
cd .. cd ..
} }
build_rapidjson()
{
B_dir="rapidjson-1.1.0"
[ -f $B_dir.tar.gz ] || wget -O $B_dir.tar.gz https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
tar -xf $B_dir.tar.gz
cp -r rapidjson-1.1.0/include/rapidjson/ "${SYSROOT}/usr/include/rapidjson"
}
build_toolchain build_toolchain
[ "${INSTALL_QT_ANDROID}X" == "trueX" ] && install_qt_android [ "${INSTALL_QT_ANDROID}X" == "trueX" ] && install_qt_android
build_bzlib build_bzlib
@ -320,5 +328,6 @@ build_openssl
build_sqlite build_sqlite
build_sqlcipher build_sqlcipher
build_libupnp build_libupnp
build_rapidjson
echo NATIVE_LIBS_TOOLCHAIN_PATH=${NATIVE_LIBS_TOOLCHAIN_PATH} echo NATIVE_LIBS_TOOLCHAIN_PATH=${NATIVE_LIBS_TOOLCHAIN_PATH}

3
appveyor.yml
View File

@ -12,7 +12,7 @@
#---------------------------------# #---------------------------------#
# version format # version format
version: RetroShare 0.6.0.{build}-{branch} version: RetroShare-git-{branch}-{build}
# you can use {branch} name in version format too # you can use {branch} name in version format too
# version: 1.0.{build}-{branch} # version: 1.0.{build}-{branch}
@ -106,6 +106,7 @@ install:
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-ffmpeg mingw-w64-x86_64-ffmpeg" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-ffmpeg mingw-w64-x86_64-ffmpeg"
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-libmicrohttpd mingw-w64-x86_64-libmicrohttpd" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-libmicrohttpd mingw-w64-x86_64-libmicrohttpd"
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-libxslt mingw-w64-x86_64-libxslt" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-libxslt mingw-w64-x86_64-libxslt"
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-rapidjson mingw-w64-x86_64-rapidjson"
# Hack for new MSys2 # Hack for new MSys2
- copy C:\msys64\mingw32\i686-w64-mingw32\bin\ar.exe C:\msys64\mingw32\bin\i686-w64-mingw32-ar.exe - copy C:\msys64\mingw32\i686-w64-mingw32\bin\ar.exe C:\msys64\mingw32\bin\i686-w64-mingw32-ar.exe

2
libretroshare/src/chat/distributedchat.h
View File

@ -30,7 +30,7 @@
typedef RsPeerId ChatLobbyVirtualPeerId ; typedef RsPeerId ChatLobbyVirtualPeerId ;
class RsItem ; struct RsItem;
class p3HistoryMgr ; class p3HistoryMgr ;
class p3IdService ; class p3IdService ;
class p3ServiceControl; class p3ServiceControl;

5
libretroshare/src/chat/rschatitems.cc
View File

@ -205,11 +205,8 @@ void RsPrivateChatMsgConfigItem::get(RsChatMsgItem *ci)
ci->recvTime = recvTime; ci->recvTime = recvTime;
} }
/* Necessary to serialize `store` that is an STL container with RsChatMsgItem
* inside which is a subtype of RsItem */
RS_REGISTER_ITEM_TYPE(RsChatMsgItem)
void PrivateOugoingMapItem::serial_process( void PrivateOugoingMapItem::serial_process(
RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx ) RsGenericSerializer::SerializeContext& ctx )
{ RS_REGISTER_SERIAL_MEMBER(store); } { RS_SERIAL_PROCESS(store); }

2
libretroshare/src/grouter/grouterclientservice.h
View File

@ -34,7 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <grouter/grouteritems.h> #include <grouter/grouteritems.h>
class RsItem ; struct RsItem;
static const uint32_t GROUTER_CLIENT_SERVICE_DATA_STATUS_UNKNOWN = 0x0000 ; // unused. static const uint32_t GROUTER_CLIENT_SERVICE_DATA_STATUS_UNKNOWN = 0x0000 ; // unused.
static const uint32_t GROUTER_CLIENT_SERVICE_DATA_STATUS_RECEIVED = 0x0001 ; // sent when data has been received and a receipt is available. static const uint32_t GROUTER_CLIENT_SERVICE_DATA_STATUS_RECEIVED = 0x0001 ; // sent when data has been received and a receipt is available.

2
libretroshare/src/grouter/groutermatrix.h
View File

@ -31,7 +31,7 @@
#include "retroshare/rsgrouter.h" #include "retroshare/rsgrouter.h"
#include "groutertypes.h" #include "groutertypes.h"
class RsItem ; struct RsItem;
// The routing matrix records the event clues received from each friend // The routing matrix records the event clues received from each friend
// //

40
libretroshare/src/gxstrans/p3gxstransitems.cc
View File

@ -1,6 +1,6 @@
/* /*
* GXS Mailing Service * GXS Mailing Service
* Copyright (C) 2016-2017 Gioacchino Mazzurco <gio@eigenlab.org> * Copyright (C) 2016-2018 Gioacchino Mazzurco <gio@eigenlab.org>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as * it under the terms of the GNU Affero General Public License as
@ -38,30 +38,28 @@ OutgoingRecord::OutgoingRecord( RsGxsId rec, GxsTransSubServices cs,
memcpy(&mailData[0], data, size); memcpy(&mailData[0], data, size);
} }
void OutgoingRecord_deprecated::serial_process(
RS_REGISTER_ITEM_TYPE(RsGxsTransMailItem) // for mailItem RsGenericSerializer::SerializeJob j,
RS_REGISTER_ITEM_TYPE(RsNxsTransPresignedReceipt) // for presignedReceipt RsGenericSerializer::SerializeContext& ctx )
void OutgoingRecord_deprecated::serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext& ctx)
{ {
RS_REGISTER_SERIAL_MEMBER_TYPED(status, uint8_t); RS_SERIAL_PROCESS(status);
RS_REGISTER_SERIAL_MEMBER(recipient); RS_SERIAL_PROCESS(recipient);
RS_REGISTER_SERIAL_MEMBER(mailItem); RS_SERIAL_PROCESS(mailItem);
RS_REGISTER_SERIAL_MEMBER(mailData); RS_SERIAL_PROCESS(mailData);
RS_REGISTER_SERIAL_MEMBER_TYPED(clientService, uint16_t); RS_SERIAL_PROCESS(clientService);
RS_REGISTER_SERIAL_MEMBER(presignedReceipt); RS_SERIAL_PROCESS(presignedReceipt);
} }
void OutgoingRecord::serial_process(RsGenericSerializer::SerializeJob j, void OutgoingRecord::serial_process(RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx) RsGenericSerializer::SerializeContext& ctx)
{ {
RS_REGISTER_SERIAL_MEMBER_TYPED(status, uint8_t); RS_SERIAL_PROCESS(status);
RS_REGISTER_SERIAL_MEMBER(recipient); RS_SERIAL_PROCESS(recipient);
RS_REGISTER_SERIAL_MEMBER(author); RS_SERIAL_PROCESS(author);
RS_REGISTER_SERIAL_MEMBER(group_id); RS_SERIAL_PROCESS(group_id);
RS_REGISTER_SERIAL_MEMBER(sent_ts); RS_SERIAL_PROCESS(sent_ts);
RS_REGISTER_SERIAL_MEMBER(mailItem); RS_SERIAL_PROCESS(mailItem);
RS_REGISTER_SERIAL_MEMBER(mailData); RS_SERIAL_PROCESS(mailData);
RS_REGISTER_SERIAL_MEMBER_TYPED(clientService, uint16_t); RS_SERIAL_PROCESS(clientService);
RS_REGISTER_SERIAL_MEMBER(presignedReceipt); RS_SERIAL_PROCESS(presignedReceipt);
} }

8
libretroshare/src/gxstrans/p3gxstransitems.h
View File

@ -55,7 +55,7 @@ public:
void serial_process( RsGenericSerializer::SerializeJob j, void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx ) RsGenericSerializer::SerializeContext& ctx )
{ RS_REGISTER_SERIAL_MEMBER_TYPED(mailId, uint64_t); } { RS_SERIAL_PROCESS(mailId); }
}; };
class RsGxsTransPresignedReceipt : public RsGxsTransBaseMsgItem class RsGxsTransPresignedReceipt : public RsGxsTransBaseMsgItem
@ -140,9 +140,9 @@ public:
RsGenericSerializer::SerializeContext& ctx ) RsGenericSerializer::SerializeContext& ctx )
{ {
RsGxsTransBaseMsgItem::serial_process(j, ctx); RsGxsTransBaseMsgItem::serial_process(j, ctx);
RS_REGISTER_SERIAL_MEMBER_TYPED(cryptoType, uint8_t); RS_SERIAL_PROCESS(cryptoType);
RS_REGISTER_SERIAL_MEMBER(recipientHint); RS_SERIAL_PROCESS(recipientHint);
RS_REGISTER_SERIAL_MEMBER(payload); RS_SERIAL_PROCESS(payload);
} }
void clear() void clear()

3
libretroshare/src/gxstunnel/rsgxstunnelitems.cc
View File

@ -102,6 +102,9 @@ template<> void RsTypeSerializer::print_data(const std::string& name,BIGNUM
std::cerr << "[BIGNUM] : " << name << std::endl; std::cerr << "[BIGNUM] : " << name << std::endl;
} }
RS_TYPE_SERIALIZER_TO_JSON_NOT_IMPLEMENTED_DEF(BIGNUM*)
RS_TYPE_SERIALIZER_FROM_JSON_NOT_IMPLEMENTED_DEF(BIGNUM*)
void RsGxsTunnelStatusItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) void RsGxsTunnelStatusItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
{ {
RsTypeSerializer::serial_process<uint32_t>(j,ctx,status,"status") ; RsTypeSerializer::serial_process<uint32_t>(j,ctx,status,"status") ;

6
libretroshare/src/libretroshare.pro
View File

@ -529,7 +529,7 @@ SOURCES += ft/ftchunkmap.cc \
ft/ftfilesearch.cc \ ft/ftfilesearch.cc \
ft/ftserver.cc \ ft/ftserver.cc \
ft/fttransfermodule.cc \ ft/fttransfermodule.cc \
ft/ftturtlefiletransferitem.cc ft/ftturtlefiletransferitem.cc
SOURCES += crypto/chacha20.cpp \ SOURCES += crypto/chacha20.cpp \
crypto/hashstream.cc crypto/hashstream.cc
@ -623,6 +623,7 @@ SOURCES += serialiser/rsbaseserial.cc \
rsitems/rsgxsupdateitems.cc \ rsitems/rsgxsupdateitems.cc \
rsitems/rsserviceinfoitems.cc \ rsitems/rsserviceinfoitems.cc \
SOURCES += services/autoproxy/rsautoproxymonitor.cc \ SOURCES += services/autoproxy/rsautoproxymonitor.cc \
services/autoproxy/p3i2pbob.cc \ services/autoproxy/p3i2pbob.cc \
services/p3msgservice.cc \ services/p3msgservice.cc \
@ -764,7 +765,8 @@ SOURCES += gxstunnel/p3gxstunnel.cc \
gxstunnel/rsgxstunnelitems.cc gxstunnel/rsgxstunnelitems.cc
# new serialization code # new serialization code
HEADERS += serialiser/rsserializer.h \ HEADERS += serialiser/rsserializable.h \
serialiser/rsserializer.h \
serialiser/rstypeserializer.h serialiser/rstypeserializer.h
SOURCES += serialiser/rsserializer.cc \ SOURCES += serialiser/rsserializer.cc \

2
libretroshare/src/pqi/pqihandler.h
View File

@ -38,7 +38,7 @@
class PQInterface; class PQInterface;
class RSTrafficClue; class RSTrafficClue;
class RsBwRates; class RsBwRates;
class RsItem; struct RsItem;
class RsRawItem; class RsRawItem;
class SearchModule class SearchModule

2
libretroshare/src/pqi/pqiloopback.cc
View File

@ -27,7 +27,7 @@
#include <stddef.h> // for NULL #include <stddef.h> // for NULL
class RsItem; struct RsItem;
/*** /***
#define LOOPBACK_DEBUG 1 #define LOOPBACK_DEBUG 1

2
libretroshare/src/pqi/pqiloopback.h
View File

@ -31,7 +31,7 @@
#include "pqi/pqi_base.h" // for NetInterface (ptr only), PQInterface #include "pqi/pqi_base.h" // for NetInterface (ptr only), PQInterface
#include "retroshare/rstypes.h" // for RsPeerId #include "retroshare/rstypes.h" // for RsPeerId
class RsItem; struct RsItem;
class pqiloopback: public PQInterface class pqiloopback: public PQInterface
{ {

2
libretroshare/src/pqi/pqistreamer.h
View File

@ -38,7 +38,7 @@
#include "retroshare/rstypes.h" // for RsPeerId #include "retroshare/rstypes.h" // for RsPeerId
#include "util/rsthreads.h" // for RsMutex #include "util/rsthreads.h" // for RsMutex
class RsItem; struct RsItem;
class RsSerialiser; class RsSerialiser;
struct PartialPacketRecord struct PartialPacketRecord

52
libretroshare/src/retroshare/rsgxsifacetypes.h
View File

@ -1,3 +1,23 @@
/*
* rsgxsifacetypes.h
*
* Copyright (C) 2013 crispy
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* /*
* rsgxsifacetypes.h * rsgxsifacetypes.h
* *
@ -13,8 +33,10 @@
#include <string> #include <string>
#include <inttypes.h> #include <inttypes.h>
#include <retroshare/rstypes.h> #include "retroshare/rstypes.h"
#include <retroshare/rsids.h> #include "retroshare/rsids.h"
#include "serialiser/rsserializable.h"
#include "serialiser/rstypeserializer.h"
typedef GXSGroupId RsGxsGroupId; typedef GXSGroupId RsGxsGroupId;
typedef Sha1CheckSum RsGxsMessageId; typedef Sha1CheckSum RsGxsMessageId;
@ -34,7 +56,7 @@ typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > MsgMetaResult;
class RsGxsGrpMetaData; class RsGxsGrpMetaData;
class RsGxsMsgMetaData; class RsGxsMsgMetaData;
struct RsGroupMetaData struct RsGroupMetaData : RsSerializable
{ {
// (csoler) The correct default value to be used in mCircleType is GXS_CIRCLE_TYPE_PUBLIC, which is defined in rsgxscircles.h, // (csoler) The correct default value to be used in mCircleType is GXS_CIRCLE_TYPE_PUBLIC, which is defined in rsgxscircles.h,
// but because of a loop in the includes, I cannot include it here. So I replaced with its current value 0x0001. // but because of a loop in the includes, I cannot include it here. So I replaced with its current value 0x0001.
@ -73,6 +95,30 @@ struct RsGroupMetaData
std::string mServiceString; // Service Specific Free-Form extra storage. std::string mServiceString; // Service Specific Free-Form extra storage.
RsPeerId mOriginator; RsPeerId mOriginator;
RsGxsCircleId mInternalCircle; RsGxsCircleId mInternalCircle;
/// @see RsSerializable
void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
RS_SERIAL_PROCESS(mGroupId);
RS_SERIAL_PROCESS(mGroupName);
RS_SERIAL_PROCESS(mGroupFlags);
RS_SERIAL_PROCESS(mSignFlags);
RS_SERIAL_PROCESS(mPublishTs);
RS_SERIAL_PROCESS(mAuthorId);
RS_SERIAL_PROCESS(mCircleId);
RS_SERIAL_PROCESS(mCircleType);
RS_SERIAL_PROCESS(mAuthenFlags);
RS_SERIAL_PROCESS(mParentGrpId);
RS_SERIAL_PROCESS(mSubscribeFlags);
RS_SERIAL_PROCESS(mPop);
RS_SERIAL_PROCESS(mVisibleMsgCount);
RS_SERIAL_PROCESS(mLastPost);
RS_SERIAL_PROCESS(mGroupStatus);
RS_SERIAL_PROCESS(mServiceString);
RS_SERIAL_PROCESS(mOriginator);
RS_SERIAL_PROCESS(mInternalCircle);
}
}; };

257
libretroshare/src/retroshare/rsidentity.h
View File

@ -6,7 +6,8 @@
* *
* RetroShare C++ Interface. * RetroShare C++ Interface.
* *
* Copyright 2012-2012 by Robert Fernie. * Copyright (C) 2012 Robert Fernie.
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -36,9 +37,12 @@
#include "retroshare/rsids.h" #include "retroshare/rsids.h"
#include "serialiser/rstlvimage.h" #include "serialiser/rstlvimage.h"
#include "retroshare/rsgxscommon.h" #include "retroshare/rsgxscommon.h"
#include "serialiser/rsserializable.h"
#include "serialiser/rstypeserializer.h"
#include "util/rsdeprecate.h"
/* The Main Interface Class - for information about your Peers */ /* The Main Interface Class - for information about your Peers */
class RsIdentity; struct RsIdentity;
extern RsIdentity *rsIdentity; extern RsIdentity *rsIdentity;
@ -63,6 +67,7 @@ extern RsIdentity *rsIdentity;
#define RSID_RELATION_OTHER 0x0008 #define RSID_RELATION_OTHER 0x0008
#define RSID_RELATION_UNKNOWN 0x0010 #define RSID_RELATION_UNKNOWN 0x0010
/// @deprecated remove toghether with RsGxsIdGroup::mRecognTags
#define RSRECOGN_MAX_TAGINFO 5 #define RSRECOGN_MAX_TAGINFO 5
// Unicode symbols. NOT utf-8 bytes, because of multi byte characters // Unicode symbols. NOT utf-8 bytes, because of multi byte characters
@ -77,27 +82,36 @@ static const uint32_t RS_IDENTITY_FLAGS_PGP_KNOWN = 0x0004;
static const uint32_t RS_IDENTITY_FLAGS_IS_OWN_ID = 0x0008; static const uint32_t RS_IDENTITY_FLAGS_IS_OWN_ID = 0x0008;
static const uint32_t RS_IDENTITY_FLAGS_IS_DEPRECATED= 0x0010; // used to denote keys with deprecated fingerprint format. static const uint32_t RS_IDENTITY_FLAGS_IS_DEPRECATED= 0x0010; // used to denote keys with deprecated fingerprint format.
class GxsReputation struct GxsReputation : RsSerializable
{ {
public: GxsReputation();
GxsReputation();
bool updateIdScore(bool pgpLinked, bool pgpKnown); bool updateIdScore(bool pgpLinked, bool pgpKnown);
bool update(); // checks ranges and calculates overall score. bool update(); /// checks ranges and calculates overall score.
int mOverallScore;
int mIdScore; // PGP, Known, etc. int32_t mOverallScore;
int mOwnOpinion; int32_t mIdScore; /// PGP, Known, etc.
int mPeerOpinion; int32_t mOwnOpinion;
int32_t mPeerOpinion;
/// @see RsSerializable
void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
RS_SERIAL_PROCESS(mOverallScore);
RS_SERIAL_PROCESS(mIdScore);
RS_SERIAL_PROCESS(mOwnOpinion);
RS_SERIAL_PROCESS(mPeerOpinion);
}
}; };
struct RsGxsIdGroup struct RsGxsIdGroup : RsSerializable
{ {
RsGxsIdGroup() : RsGxsIdGroup() :
mLastUsageTS(0), mPgpKnown(false), mIsAContact(false) {} mLastUsageTS(0), mPgpKnown(false), mIsAContact(false) {}
~RsGxsIdGroup() {} ~RsGxsIdGroup() {}
RsGroupMetaData mMeta; RsGroupMetaData mMeta;
// In GroupMetaData. // In GroupMetaData.
@ -120,7 +134,7 @@ struct RsGxsIdGroup
std::string mPgpIdSign; std::string mPgpIdSign;
// Recognition Strings. MAX# defined above. // Recognition Strings. MAX# defined above.
std::list<std::string> mRecognTags; RS_DEPRECATED std::list<std::string> mRecognTags;
// Avatar // Avatar
RsGxsImage mImage ; RsGxsImage mImage ;
@ -131,8 +145,11 @@ struct RsGxsIdGroup
bool mIsAContact; // change that into flags one day bool mIsAContact; // change that into flags one day
RsPgpId mPgpId; RsPgpId mPgpId;
GxsReputation mReputation; GxsReputation mReputation;
};
/// @see RsSerializable
void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx );
};
std::ostream &operator<<(std::ostream &out, const RsGxsIdGroup &group); std::ostream &operator<<(std::ostream &out, const RsGxsIdGroup &group);
@ -149,12 +166,11 @@ class RsRecognTag
}; };
class RsRecognTagDetails struct RsRecognTagDetails
{ {
public: RsRecognTagDetails() :
RsRecognTagDetails() valid_from(0), valid_to(0), tag_class(0), tag_type(0), is_valid(false),
:valid_from(0), valid_to(0), tag_class(0), tag_type(0), is_pending(false) {}
is_valid(false), is_pending(false) { return; }
time_t valid_from; time_t valid_from;
time_t valid_to; time_t valid_to;
@ -167,105 +183,166 @@ class RsRecognTagDetails
bool is_pending; bool is_pending;
}; };
class RsIdOpinion
{
public:
RsGxsId id;
int rating;
};
class RsIdentityParameters struct RsIdentityParameters
{ {
public: RsIdentityParameters() :
RsIdentityParameters(): isPgpLinked(false) { return; } isPgpLinked(false) {}
bool isPgpLinked; bool isPgpLinked;
std::string nickname; std::string nickname;
RsGxsImage mImage ; RsGxsImage mImage;
}; };
class RsIdentityUsage struct RsIdentityUsage : RsSerializable
{ {
public: enum UsageCode : uint8_t
enum UsageCode { UNKNOWN_USAGE = 0x00, {
GROUP_ADMIN_SIGNATURE_CREATION = 0x01, // These 2 are normally not normal GXS identities, but nothing prevents it to happen either. UNKNOWN_USAGE = 0x00,
GROUP_ADMIN_SIGNATURE_VALIDATION = 0x02,
GROUP_AUTHOR_SIGNATURE_CREATION = 0x03, // not typically used, since most services do not require group author signatures
GROUP_AUTHOR_SIGNATURE_VALIDATION = 0x04,
MESSAGE_AUTHOR_SIGNATURE_CREATION = 0x05, // most common use case. Messages are signed by authors in e.g. forums.
MESSAGE_AUTHOR_SIGNATURE_VALIDATION = 0x06,
GROUP_AUTHOR_KEEP_ALIVE = 0x07, // Identities are stamped regularly by crawlign the set of messages for all groups. That helps keepign the useful identities in hand.
MESSAGE_AUTHOR_KEEP_ALIVE = 0x08, // Identities are stamped regularly by crawlign the set of messages for all groups. That helps keepign the useful identities in hand.
CHAT_LOBBY_MSG_VALIDATION = 0x09, // Chat lobby msgs are signed, so each time one comes, or a chat lobby event comes, a signature verificaiton happens.
GLOBAL_ROUTER_SIGNATURE_CHECK = 0x0a, // Global router message validation
GLOBAL_ROUTER_SIGNATURE_CREATION = 0x0b, // Global router message signature
GXS_TUNNEL_DH_SIGNATURE_CHECK = 0x0c, //
GXS_TUNNEL_DH_SIGNATURE_CREATION = 0x0d, //
IDENTITY_DATA_UPDATE = 0x0e, // Group update on that identity data. Can be avatar, name, etc.
IDENTITY_GENERIC_SIGNATURE_CHECK = 0x0f, // Any signature verified for that identity
IDENTITY_GENERIC_SIGNATURE_CREATION = 0x10, // Any signature made by that identity
IDENTITY_GENERIC_ENCRYPTION = 0x11,
IDENTITY_GENERIC_DECRYPTION = 0x12,
CIRCLE_MEMBERSHIP_CHECK = 0x13
} ;
explicit RsIdentityUsage(uint16_t service,const RsIdentityUsage::UsageCode& code,const RsGxsGroupId& gid=RsGxsGroupId(),const RsGxsMessageId& mid=RsGxsMessageId(),uint64_t additional_id=0,const std::string& comment = std::string()); /** These 2 are normally not normal GXS identities, but nothing prevents
* it to happen either. */
GROUP_ADMIN_SIGNATURE_CREATION = 0x01,
GROUP_ADMIN_SIGNATURE_VALIDATION = 0x02,
uint16_t mServiceId; // Id of the service using that identity, as understood by rsServiceControl /** Not typically used, since most services do not require group author
UsageCode mUsageCode; // Specific code to use. Will allow forming the correct translated message in the GUI if necessary. * signatures */
RsGxsGroupId mGrpId; // Group ID using the identity GROUP_AUTHOR_SIGNATURE_CREATION = 0x03,
GROUP_AUTHOR_SIGNATURE_VALIDATION = 0x04,
RsGxsMessageId mMsgId; // Message ID using the identity /// most common use case. Messages are signed by authors in e.g. forums.
uint64_t mAdditionalId; // Some additional ID. Can be used for e.g. chat lobbies. MESSAGE_AUTHOR_SIGNATURE_CREATION = 0x05,
std::string mComment ; // additional comment to be used mainly for debugging, but not GUI display MESSAGE_AUTHOR_SIGNATURE_VALIDATION = 0x06,
bool operator<(const RsIdentityUsage& u) const /** Identities are stamped regularly by crawlign the set of messages for
{ * all groups. That helps keepign the useful identities in hand. */
return mHash < u.mHash ; GROUP_AUTHOR_KEEP_ALIVE = 0x07,
} MESSAGE_AUTHOR_KEEP_ALIVE = 0x08,
RsFileHash mHash ;
/** Chat lobby msgs are signed, so each time one comes, or a chat lobby
* event comes, a signature verificaiton happens. */
CHAT_LOBBY_MSG_VALIDATION = 0x09,
/// Global router message validation
GLOBAL_ROUTER_SIGNATURE_CHECK = 0x0a,
/// Global router message signature
GLOBAL_ROUTER_SIGNATURE_CREATION = 0x0b,
GXS_TUNNEL_DH_SIGNATURE_CHECK = 0x0c,
GXS_TUNNEL_DH_SIGNATURE_CREATION = 0x0d,
/// Group update on that identity data. Can be avatar, name, etc.
IDENTITY_DATA_UPDATE = 0x0e,
/// Any signature verified for that identity
IDENTITY_GENERIC_SIGNATURE_CHECK = 0x0f,
/// Any signature made by that identity
IDENTITY_GENERIC_SIGNATURE_CREATION = 0x10,
IDENTITY_GENERIC_ENCRYPTION = 0x11,
IDENTITY_GENERIC_DECRYPTION = 0x12,
CIRCLE_MEMBERSHIP_CHECK = 0x13
} ;
RsIdentityUsage( uint16_t service, const RsIdentityUsage::UsageCode& code,
const RsGxsGroupId& gid = RsGxsGroupId(),
const RsGxsMessageId& mid = RsGxsMessageId(),
uint64_t additional_id=0,
const std::string& comment = std::string() );
/// Id of the service using that identity, as understood by rsServiceControl
uint16_t mServiceId;
/** Specific code to use. Will allow forming the correct translated message
* in the GUI if necessary. */
UsageCode mUsageCode;
/// Group ID using the identity
RsGxsGroupId mGrpId;
/// Message ID using the identity
RsGxsMessageId mMsgId;
/// Some additional ID. Can be used for e.g. chat lobbies.
uint64_t mAdditionalId;
/// additional comment to be used mainly for debugging, but not GUI display
std::string mComment;
bool operator<(const RsIdentityUsage& u) const { return mHash < u.mHash; }
RsFileHash mHash ;
/// @see RsSerializable
void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
RS_SERIAL_PROCESS(mServiceId);
RS_SERIAL_PROCESS(mUsageCode);
RS_SERIAL_PROCESS(mGrpId);
RS_SERIAL_PROCESS(mMsgId);
RS_SERIAL_PROCESS(mAdditionalId);
RS_SERIAL_PROCESS(mComment);
RS_SERIAL_PROCESS(mHash);
}
friend struct RsTypeSerializer;
private:
/** Accessible only to friend class RsTypeSerializer needed for
* deserialization */
RsIdentityUsage();
}; };
class RsIdentityDetails
struct RsIdentityDetails : RsSerializable
{ {
public: RsIdentityDetails() : mFlags(0), mLastUsageTS(0) {}
RsIdentityDetails()
: mFlags(0), mLastUsageTS(0) { return; }
RsGxsId mId; RsGxsId mId;
// identity details.
std::string mNickname; std::string mNickname;
uint32_t mFlags ; uint32_t mFlags;
// PGP Stuff. RsPgpId mPgpId;
RsPgpId mPgpId;
// Recogn details. /// @deprecated Recogn details.
std::list<RsRecognTag> mRecognTags; RS_DEPRECATED std::list<RsRecognTag> mRecognTags;
// Cyril: Reputation details. At some point we might want to merge information /** Cyril: Reputation details. At some point we might want to merge
// between the two into a single global score. Since the old reputation system * information between the two into a single global score. Since the old
// is not finished yet, I leave this in place. We should decide what to do with it. * reputation system is not finished yet, I leave this in place. We should
RsReputations::ReputationInfo mReputation; * decide what to do with it.
*/
RsReputations::ReputationInfo mReputation;
// avatar RsGxsImage mAvatar;
RsGxsImage mAvatar ;
// last usage time_t mLastUsageTS;
time_t mLastUsageTS ;
std::map<RsIdentityUsage,time_t> mUseCases ; std::map<RsIdentityUsage,time_t> mUseCases;
/// @see RsSerializable
virtual void serial_process(RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx)
{
RS_SERIAL_PROCESS(mId);
RS_SERIAL_PROCESS(mNickname);
RS_SERIAL_PROCESS(mFlags);
RS_SERIAL_PROCESS(mPgpId);
//RS_SERIAL_PROCESS(mReputation);
//RS_SERIAL_PROCESS(mAvatar);
RS_SERIAL_PROCESS(mLastUsageTS);
RS_SERIAL_PROCESS(mUseCases);
}
}; };
class RsIdentity: public RsGxsIfaceHelper struct RsIdentity : RsGxsIfaceHelper
{ {
public:
explicit RsIdentity(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) {} explicit RsIdentity(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) {}
virtual ~RsIdentity() {} virtual ~RsIdentity() {}

34
libretroshare/src/retroshare/rstypes.h
View File

@ -36,6 +36,8 @@
#include <retroshare/rsids.h> #include <retroshare/rsids.h>
#include <retroshare/rsflags.h> #include <retroshare/rsflags.h>
#include <serialiser/rsserializable.h>
#include <serialiser/rstypeserializer.h>
#define USE_NEW_CHUNK_CHECKING_CODE #define USE_NEW_CHUNK_CHECKING_CODE
@ -118,13 +120,21 @@ class Condition
std::string name; std::string name;
}; };
class PeerBandwidthLimits struct PeerBandwidthLimits : RsSerializable
{ {
public: PeerBandwidthLimits() : max_up_rate_kbs(0), max_dl_rate_kbs(0) {}
PeerBandwidthLimits() : max_up_rate_kbs(0), max_dl_rate_kbs(0) {}
uint32_t max_up_rate_kbs;
uint32_t max_up_rate_kbs ; uint32_t max_dl_rate_kbs;
uint32_t max_dl_rate_kbs ;
/// @see RsSerializable
void serial_process(RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx)
{
RS_SERIAL_PROCESS(max_up_rate_kbs);
RS_SERIAL_PROCESS(max_dl_rate_kbs);
}
}; };
//class SearchRequest // unused stuff. //class SearchRequest // unused stuff.
@ -295,7 +305,7 @@ class FileChunksInfo
std::map<uint32_t, std::vector<SliceInfo> > pending_slices ; std::map<uint32_t, std::vector<SliceInfo> > pending_slices ;
}; };
class CompressedChunkMap class CompressedChunkMap : public RsSerializable
{ {
public: public:
CompressedChunkMap() {} CompressedChunkMap() {}
@ -345,10 +355,16 @@ class CompressedChunkMap
inline void set(uint32_t j) { _map[j >> 5] |= (1 << (j & 31)) ; } inline void set(uint32_t j) { _map[j >> 5] |= (1 << (j & 31)) ; }
inline void reset(uint32_t j) { _map[j >> 5] &= ~(1 << (j & 31)) ; } inline void reset(uint32_t j) { _map[j >> 5] &= ~(1 << (j & 31)) ; }
/// compressed map, one bit per chunk /// compressed map, one bit per chunk
std::vector<uint32_t> _map ; std::vector<uint32_t> _map;
/// @see RsSerializable
void serial_process(RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx)
{ RS_SERIAL_PROCESS(_map); }
}; };
template<class CRCTYPE> class t_CRCMap template<class CRCTYPE> class t_CRCMap
{ {
public: public:

28
libretroshare/src/rsitems/rsconfigitems.cc
View File

@ -28,6 +28,7 @@
#include "rsitems/rsconfigitems.h" #include "rsitems/rsconfigitems.h"
#include "retroshare/rspeers.h" // Needed for RsGroupInfo. #include "retroshare/rspeers.h" // Needed for RsGroupInfo.
#include "serialiser/rsserializable.h"
#include "serialiser/rstypeserializer.h" #include "serialiser/rstypeserializer.h"
/*** /***
* #define RSSERIAL_DEBUG 1 * #define RSSERIAL_DEBUG 1
@ -89,7 +90,7 @@ void RsFileTransfer::serial_process(RsGenericSerializer::SerializeJob j,RsGeneri
RsTypeSerializer::serial_process<uint32_t> (j,ctx,flags,"flags") ; RsTypeSerializer::serial_process<uint32_t> (j,ctx,flags,"flags") ;
RsTypeSerializer::serial_process<uint32_t> (j,ctx,chunk_strategy,"chunk_strategy") ; RsTypeSerializer::serial_process<uint32_t> (j,ctx,chunk_strategy,"chunk_strategy") ;
RsTypeSerializer::serial_process (j,ctx,compressed_chunk_map,"compressed_chunk_map") ; RS_SERIAL_PROCESS(compressed_chunk_map);
} }
void RsFileConfigItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) void RsFileConfigItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
@ -192,31 +193,6 @@ void RsPeerStunItem::serial_process(RsGenericSerializer::SerializeJob j,RsGeneri
RsTypeSerializer::serial_process<RsTlvItem>(j,ctx,stunList,"stunList") ; RsTypeSerializer::serial_process<RsTlvItem>(j,ctx,stunList,"stunList") ;
} }
template<> uint32_t RsTypeSerializer::serial_size(const PeerBandwidthLimits& /*s*/)
{
return 4+4 ;
}
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset,const PeerBandwidthLimits& s)
{
bool ok = true ;
ok = ok && setRawUInt32(data,size,&offset,s.max_up_rate_kbs);
ok = ok && setRawUInt32(data,size,&offset,s.max_dl_rate_kbs);
return ok;
}
template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size,uint32_t& offset,PeerBandwidthLimits& s)
{
bool ok = true ;
ok = ok && getRawUInt32(data,size,&offset,&s.max_up_rate_kbs);
ok = ok && getRawUInt32(data,size,&offset,&s.max_dl_rate_kbs);
return ok;
}
template<> void RsTypeSerializer::print_data(const std::string& /*n*/, const PeerBandwidthLimits& s)
{
std::cerr << " [Peer BW limit] " << s.max_up_rate_kbs << " / " << s.max_dl_rate_kbs << std::endl;
}
RsNodeGroupItem::RsNodeGroupItem(const RsGroupInfo& g) RsNodeGroupItem::RsNodeGroupItem(const RsGroupInfo& g)
:RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_PEER_CONFIG, RS_PKT_SUBTYPE_NODE_GROUP) :RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_PEER_CONFIG, RS_PKT_SUBTYPE_NODE_GROUP)

42
libretroshare/src/rsitems/rsfiletransferitems.cc
View File

@ -91,48 +91,6 @@ void RsFileTransferSingleChunkCrcItem::serial_process(RsGenericSerializer::Seria
RsTypeSerializer::serial_process (j,ctx,check_sum, "check_sum") ; RsTypeSerializer::serial_process (j,ctx,check_sum, "check_sum") ;
} }
//===================================================================================================//
// CompressedChunkMap //
//===================================================================================================//
template<> uint32_t RsTypeSerializer::serial_size(const CompressedChunkMap& s)
{
return 4 + 4*s._map.size() ;
}
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset,const CompressedChunkMap& s)
{
bool ok = true ;
ok &= setRawUInt32(data, size, &offset, s._map.size());
for(uint32_t i=0;i<s._map.size() && ok;++i)
ok &= setRawUInt32(data, size, &offset, s._map[i]);
return ok;
}
template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size,uint32_t& offset,CompressedChunkMap& s)
{
uint32_t S =0;
bool ok = getRawUInt32(data, size, &offset, &S);
if(ok)
{
s._map.resize(S) ;
for(uint32_t i=0;i<S && ok;++i)
ok &= getRawUInt32(data, size, &offset, &(s._map[i]));
}
return ok;
}
template<> void RsTypeSerializer::print_data(const std::string& n, const CompressedChunkMap& s)
{
std::cerr << " [Compressed chunk map] " << n << " : length=" << s._map.size() << std::endl;
}
//===================================================================================================// //===================================================================================================//
// Serializer // // Serializer //
//===================================================================================================// //===================================================================================================//

27
libretroshare/src/rsitems/rsgxsupdateitems.cc
View File

@ -97,31 +97,6 @@ void RsGxsMsgUpdateItem::serial_process(RsGenericSerializer::SerializeJob j,RsGe
RsTypeSerializer::serial_process(j,ctx,msgUpdateInfos,"msgUpdateInfos"); RsTypeSerializer::serial_process(j,ctx,msgUpdateInfos,"msgUpdateInfos");
} }
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset, const RsGxsMsgUpdateItem::MsgUpdateInfo& info)
{
bool ok = true ;
ok = ok && setRawUInt32(data,size,&offset,info.time_stamp);
ok = ok && setRawUInt32(data,size,&offset,info.message_count);
return ok;
}
template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size, uint32_t &offset, RsGxsMsgUpdateItem::MsgUpdateInfo& info)
{
bool ok = true ;
ok = ok && getRawUInt32(data,size,&offset,&info.time_stamp);
ok = ok && getRawUInt32(data,size,&offset,&info.message_count);
return ok;
}
template<> uint32_t RsTypeSerializer::serial_size(const RsGxsMsgUpdateItem::MsgUpdateInfo& /* info */) { return 8; }
template<> void RsTypeSerializer::print_data(const std::string& name,const RsGxsMsgUpdateItem::MsgUpdateInfo& info)
{
std::cerr << "[MsgUpdateInfo]: " << name << ": " << info.time_stamp << ", " << info.message_count << std::endl;
}
void RsGxsServerMsgUpdateItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) void RsGxsServerMsgUpdateItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
{ {
RsTypeSerializer::serial_process (j,ctx,grpId,"grpId"); RsTypeSerializer::serial_process (j,ctx,grpId,"grpId");
@ -134,5 +109,3 @@ void RsGxsGrpConfigItem::serial_process(RsGenericSerializer::SerializeJob j,RsGe
RsTypeSerializer::serial_process<uint32_t>(j,ctx,msg_send_delay,"msg_send_delay") ; RsTypeSerializer::serial_process<uint32_t>(j,ctx,msg_send_delay,"msg_send_delay") ;
RsTypeSerializer::serial_process<uint32_t>(j,ctx,msg_req_delay,"msg_req_delay") ; RsTypeSerializer::serial_process<uint32_t>(j,ctx,msg_req_delay,"msg_req_delay") ;
} }

22
libretroshare/src/rsitems/rsgxsupdateitems.h
View File

@ -28,18 +28,11 @@
#if 0
#include <map>
#include "rsitems/rsserviceids.h"
#include "serialiser/rsserial.h"
#include "serialiser/rstlvbase.h"
#include "serialiser/rstlvtypes.h"
#include "serialiser/rstlvkeys.h"
#endif
#include "gxs/rsgxs.h" #include "gxs/rsgxs.h"
#include "gxs/rsgxsdata.h" #include "gxs/rsgxsdata.h"
#include "serialiser/rstlvidset.h" #include "serialiser/rstlvidset.h"
#include "serialiser/rstypeserializer.h"
#include "serialiser/rsserializable.h"
const uint8_t RS_PKT_SUBTYPE_GXS_GRP_UPDATE = 0x01; const uint8_t RS_PKT_SUBTYPE_GXS_GRP_UPDATE = 0x01;
@ -140,17 +133,26 @@ public:
class RsGxsMsgUpdate class RsGxsMsgUpdate
{ {
public: public:
struct MsgUpdateInfo struct MsgUpdateInfo : RsSerializable
{ {
MsgUpdateInfo(): time_stamp(0), message_count(0) {} MsgUpdateInfo(): time_stamp(0), message_count(0) {}
uint32_t time_stamp ; uint32_t time_stamp ;
uint32_t message_count ; uint32_t message_count ;
/// @see RsSerializable
void serial_process(RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx)
{
RS_SERIAL_PROCESS(time_stamp);
RS_SERIAL_PROCESS(message_count);
}
}; };
std::map<RsGxsGroupId, MsgUpdateInfo> msgUpdateInfos; std::map<RsGxsGroupId, MsgUpdateInfo> msgUpdateInfos;
}; };
class RsGxsMsgUpdateItem : public RsGxsNetServiceItem, public RsGxsMsgUpdate class RsGxsMsgUpdateItem : public RsGxsNetServiceItem, public RsGxsMsgUpdate
{ {
public: public:

116
libretroshare/src/rsitems/rsitem.h
View File

@ -1,76 +1,96 @@
#pragma once #pragma once
/*
* RetroShare Serialiser.
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <typeinfo> // for typeid #include <typeinfo> // for typeid
#include "util/smallobject.h" #include "util/smallobject.h"
#include "retroshare/rstypes.h" #include "retroshare/rstypes.h"
#include "serialiser/rsserializer.h" #include "serialiser/rsserializer.h"
#include "serialiser/rsserializable.h"
#include "util/stacktrace.h" #include "util/stacktrace.h"
#include <typeinfo> #include <typeinfo>
class RsItem: public RsMemoryManagement::SmallObject struct RsItem : RsMemoryManagement::SmallObject, RsSerializable
{ {
public: explicit RsItem(uint32_t t);
explicit RsItem(uint32_t t); RsItem(uint8_t ver, uint8_t cls, uint8_t t, uint8_t subtype);
RsItem(uint8_t ver, uint8_t cls, uint8_t t, uint8_t subtype);
#ifdef DO_STATISTICS #ifdef DO_STATISTICS
void *operator new(size_t s) ; void *operator new(size_t s) ;
void operator delete(void *,size_t s) ; void operator delete(void *,size_t s) ;
#endif #endif
virtual ~RsItem(); virtual ~RsItem();
/// TODO: Do this make sense with the new serialization system? /// TODO: Do this make sense with the new serialization system?
virtual void clear() = 0; virtual void clear() = 0;
virtual std::ostream &print(std::ostream &out, uint16_t /* indent */ = 0) virtual std::ostream &print(std::ostream &out, uint16_t /* indent */ = 0)
{ {
RsGenericSerializer::SerializeContext ctx(NULL,0,RsGenericSerializer::FORMAT_BINARY,RsGenericSerializer::SERIALIZATION_FLAG_NONE); RsGenericSerializer::SerializeContext ctx(
serial_process(RsGenericSerializer::PRINT,ctx) ; NULL, 0, RsGenericSerializer::FORMAT_BINARY,
return out; RsGenericSerializer::SERIALIZATION_FLAG_NONE );
} serial_process(RsGenericSerializer::PRINT,ctx);
return out;
}
void print_string(std::string &out, uint16_t indent = 0); void print_string(std::string &out, uint16_t indent = 0);
/* source / destination id */ /// source / destination id
const RsPeerId& PeerId() const { return peerId; } const RsPeerId& PeerId() const { return peerId; }
void PeerId(const RsPeerId& id) { peerId = id; } void PeerId(const RsPeerId& id) { peerId = id; }
/* complete id */ /// complete id
uint32_t PacketId() const; uint32_t PacketId() const;
/* id parts */ /// id parts
uint8_t PacketVersion(); uint8_t PacketVersion();
uint8_t PacketClass(); uint8_t PacketClass();
uint8_t PacketType(); uint8_t PacketType();
uint8_t PacketSubType() const; uint8_t PacketSubType() const;
/* For Service Packets */ /// For Service Packets
RsItem(uint8_t ver, uint16_t service, uint8_t subtype); RsItem(uint8_t ver, uint16_t service, uint8_t subtype);
uint16_t PacketService() const; /* combined Packet class/type (mid 16bits) */ uint16_t PacketService() const; /* combined Packet class/type (mid 16bits) */
void setPacketService(uint16_t service); void setPacketService(uint16_t service);
inline uint8_t priority_level() const { return _priority_level ;} inline uint8_t priority_level() const { return _priority_level ;}
inline void setPriorityLevel(uint8_t l) { _priority_level = l ;} inline void setPriorityLevel(uint8_t l) { _priority_level = l ;}
/** /**
* TODO: This should be made pure virtual as soon as all the codebase * TODO: This default implementation should be removed and childs structs
* is ported to the new serialization system * implement ::serial_process(...) as soon as all the codebase is ported to
*/ * the new serialization system
virtual void serial_process(RsGenericSerializer::SerializeJob, */
RsGenericSerializer::SerializeContext&)// = 0; virtual void serial_process(RsGenericSerializer::SerializeJob,
{ RsGenericSerializer::SerializeContext&)// = 0;
std::cerr << "(EE) RsItem::serial_process() called by an item using" {
<< "new serialization classes, but not derived! Class is " std::cerr << "(EE) RsItem::serial_process(...) called by an item using"
<< typeid(*this).name() << std::endl; << "new serialization classes, but not derived! Class is "
print_stacktrace(); << typeid(*this).name() << std::endl;
} print_stacktrace();
}
protected: protected:
uint32_t type; uint32_t type;
RsPeerId peerId; RsPeerId peerId;
uint8_t _priority_level ; uint8_t _priority_level;
}; };
/// TODO: Do this make sense with the new serialization system? /// TODO: Do this make sense with the new serialization system?

12
libretroshare/src/rsitems/rsnxsitems.cc
View File

@ -73,12 +73,12 @@ void RsNxsSyncMsgItem::serial_process(RsGenericSerializer::SerializeJob j,RsGene
void RsNxsMsg::serial_process( RsGenericSerializer::SerializeJob j, void RsNxsMsg::serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx ) RsGenericSerializer::SerializeContext& ctx )
{ {
RS_REGISTER_SERIAL_MEMBER_TYPED(transactionNumber, uint32_t); RS_SERIAL_PROCESS(transactionNumber);
RS_REGISTER_SERIAL_MEMBER_TYPED(pos, uint8_t); RS_SERIAL_PROCESS(pos);
RS_REGISTER_SERIAL_MEMBER(msgId); RS_SERIAL_PROCESS(msgId);
RS_REGISTER_SERIAL_MEMBER(grpId); RS_SERIAL_PROCESS(grpId);
RS_REGISTER_SERIAL_MEMBER_TYPED(msg, RsTlvItem); RS_SERIAL_PROCESS(msg);
RS_REGISTER_SERIAL_MEMBER_TYPED(meta, RsTlvItem); RS_SERIAL_PROCESS(meta);
} }
void RsNxsGrp::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) void RsNxsGrp::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)

2
libretroshare/src/rsserver/rstypes.cc
View File

@ -75,5 +75,3 @@ std::ostream &operator<<(std::ostream &out, const FileInfo &info)
out << "Hash: " << info.hash; out << "Hash: " << info.hash;
return out; return out;
} }

3
libretroshare/src/serialiser/rsbaseserial.cc
View File

@ -238,8 +238,7 @@ uint32_t getRawStringSize(const std::string &outStr)
bool getRawString(const void *data, uint32_t size, uint32_t *offset, std::string &outStr) bool getRawString(const void *data, uint32_t size, uint32_t *offset, std::string &outStr)
{ {
#warning Gio: "I had to change this. It seems like a bug to not clear the string. Should make sure it's not introducing any side effect." outStr.clear();
outStr.clear();
uint32_t len = 0; uint32_t len = 0;
if (!getRawUInt32(data, size, offset, &len)) if (!getRawUInt32(data, size, offset, &len))

2
libretroshare/src/serialiser/rsserial.h
View File

@ -64,7 +64,7 @@ const uint8_t RS_PKT_CLASS_CONFIG = 0x02;
const uint8_t RS_PKT_SUBTYPE_DEFAULT = 0x01; /* if only one subtype */ const uint8_t RS_PKT_SUBTYPE_DEFAULT = 0x01; /* if only one subtype */
class RsItem ; struct RsItem;
class RsSerialType ; class RsSerialType ;

48
libretroshare/src/serialiser/rsserializable.h Normal file
View File

@ -0,0 +1,48 @@
#pragma once
/*
* RetroShare Serialiser.
* Copyright (C) 2016-2018 Gioacchino Mazzurco <gio@eigenlab.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "serialiser/rsserializer.h"
/** @brief Minimal ancestor for all serializable structs in RetroShare.
* If you want your struct to be easly serializable you should inherit from this
* struct.
*/
struct RsSerializable
{
/** Process struct members to serialize in this method taking advantage of
* the helper macro @see RS_SERIAL_PROCESS(I)
*/
virtual void serial_process(RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx) = 0;
};
/** @def RS_SERIAL_PROCESS(I)
* Use this macro to process the members of `YourSerializable` for serial
* processing inside `YourSerializable::serial_process(j, ctx)`
*
* Pay special attention for member of enum type which must be declared
* specifying the underlying type otherwise the serialization format may differ
* in an uncompatible way depending on the compiler/platform.
*
* Inspired by http://stackoverflow.com/a/39345864
*/
#define RS_SERIAL_PROCESS(I) do { \
RsTypeSerializer::serial_process(j, ctx, I, #I ); \
} while(0)

174
libretroshare/src/serialiser/rsserializer.h
View File

@ -3,7 +3,8 @@
* *
* RetroShare Serialiser. * RetroShare Serialiser.
* *
* Copyright 2016 by Cyril Soler * Copyright (C) 2016 Cyril Soler
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -153,11 +154,13 @@
#include <string.h> #include <string.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <rapidjson/document.h>
#include "retroshare/rsflags.h" #include "retroshare/rsflags.h"
#include "serialiser/rsserial.h" #include "serialiser/rsserial.h"
#include "util/rsdeprecate.h"
class RsItem ; struct RsItem;
#define SERIALIZE_ERROR() std::cerr << __PRETTY_FUNCTION__ << " : " #define SERIALIZE_ERROR() std::cerr << __PRETTY_FUNCTION__ << " : "
@ -194,106 +197,125 @@ class RsRawSerialiser: public RsSerialType
virtual RsItem * deserialise(void *data, uint32_t *size); virtual RsItem * deserialise(void *data, uint32_t *size);
}; };
// Top class for all services and config serializers. typedef rapidjson::Document RsJson;
class RsGenericSerializer: public RsSerialType /// Top class for all services and config serializers.
struct RsGenericSerializer : RsSerialType
{ {
public: typedef enum
typedef enum { SIZE_ESTIMATE = 0x01, SERIALIZE = 0x02, DESERIALIZE = 0x03, PRINT=0x04 } SerializeJob ; {
typedef enum { FORMAT_BINARY = 0x01, FORMAT_JSON = 0x02 } SerializationFormat ; SIZE_ESTIMATE = 0x01,
SERIALIZE = 0x02,
class SerializeContext DESERIALIZE = 0x03,
{ PRINT = 0x04,
public: TO_JSON,
FROM_JSON
} SerializeJob;
SerializeContext(uint8_t *data,uint32_t size,SerializationFormat format,SerializationFlags flags) /** @deprecated use SerializeJob instead */
: mData(data),mSize(size),mOffset(0),mOk(true),mFormat(format),mFlags(flags) {} RS_DEPRECATED typedef enum
{
FORMAT_BINARY = 0x01,
FORMAT_JSON = 0x02
} SerializationFormat;
unsigned char *mData ; struct SerializeContext
uint32_t mSize ; {
uint32_t mOffset ; /** Allow shared allocator usage to avoid costly JSON deepcopy for
bool mOk ; * nested RsSerializable */
SerializationFormat mFormat ; SerializeContext(
SerializationFlags mFlags ; uint8_t *data, uint32_t size, SerializationFormat format,
}; SerializationFlags flags,
RsJson::AllocatorType* allocator = nullptr) :
mData(data), mSize(size), mOffset(0), mOk(true), mFormat(format),
mFlags(flags), mJson(rapidjson::kObjectType, allocator) {}
// These are convenience flags to be used by the items when processing the data. The names of the flags unsigned char *mData;
// are not very important. What matters is that the serial_process() method of each item correctly uint32_t mSize;
// deals with the data when it sees the flags, if the serialiser sets them. By default the flags are not uint32_t mOffset;
// set and shouldn't be handled. bool mOk;
// When deriving a new serializer, the user can set his own flags, using compatible values RS_DEPRECATED SerializationFormat mFormat;
SerializationFlags mFlags;
RsJson mJson;
};
static const SerializationFlags SERIALIZATION_FLAG_NONE ; // 0x0000 /** These are convenience flags to be used by the items when processing the
static const SerializationFlags SERIALIZATION_FLAG_CONFIG ; // 0x0001 * data. The names of the flags are not very important. What matters is that
static const SerializationFlags SERIALIZATION_FLAG_SIGNATURE ; // 0x0002 * the serial_process() method of each item correctly deals with the data
static const SerializationFlags SERIALIZATION_FLAG_SKIP_HEADER ; // 0x0004 * when it sees the flags, if the serialiser sets them.
* By default the flags are not set and shouldn't be handled.
* When deriving a new serializer, the user can set his own flags, using
* compatible values
*/
static const SerializationFlags SERIALIZATION_FLAG_NONE; // 0x0000
static const SerializationFlags SERIALIZATION_FLAG_CONFIG; // 0x0001
static const SerializationFlags SERIALIZATION_FLAG_SIGNATURE; // 0x0002
static const SerializationFlags SERIALIZATION_FLAG_SKIP_HEADER; // 0x0004
// The following functions overload RsSerialType. They *should not* need to be further overloaded. /**
* The following functions overload RsSerialType.
RsItem *deserialise(void *data,uint32_t *size) =0; * They *should not* need to be further overloaded.
bool serialise(RsItem *item,void *data,uint32_t *size) ; */
uint32_t size(RsItem *item) ; RsItem *deserialise(void *data,uint32_t *size) = 0;
void print(RsItem *item) ; bool serialise(RsItem *item,void *data,uint32_t *size);
uint32_t size(RsItem *item);
void print(RsItem *item);
protected: protected:
RsGenericSerializer(uint8_t serial_class, RsGenericSerializer(
uint8_t serial_type, uint8_t serial_class, uint8_t serial_type,
SerializationFormat format, SerializationFormat format, SerializationFlags flags ) :
SerializationFlags flags ) RsSerialType( RS_PKT_VERSION1, serial_class, serial_type),
: RsSerialType(RS_PKT_VERSION1,serial_class,serial_type), mFormat(format),mFlags(flags) mFormat(format), mFlags(flags) {}
{}
RsGenericSerializer(uint16_t service, RsGenericSerializer(
SerializationFormat format, uint16_t service, SerializationFormat format,
SerializationFlags flags ) SerializationFlags flags ) :
: RsSerialType(RS_PKT_VERSION_SERVICE,service), mFormat(format),mFlags(flags) RsSerialType( RS_PKT_VERSION_SERVICE, service ), mFormat(format),
{} mFlags(flags) {}
SerializationFormat mFormat ;
SerializationFlags mFlags ;
SerializationFormat mFormat;
SerializationFlags mFlags;
}; };
// Top class for service serializers. Derive your on service serializer from this class and overload creat_item().
class RsServiceSerializer: public RsGenericSerializer /** Top class for service serializers.
* Derive your on service serializer from this class and overload creat_item().
*/
struct RsServiceSerializer : RsGenericSerializer
{ {
public: RsServiceSerializer(
RsServiceSerializer(uint16_t service_id, uint16_t service_id, SerializationFormat format = FORMAT_BINARY,
SerializationFormat format = FORMAT_BINARY, SerializationFlags flags = SERIALIZATION_FLAG_NONE ) :
SerializationFlags flags = SERIALIZATION_FLAG_NONE) RsGenericSerializer(service_id, format, flags) {}
: RsGenericSerializer(service_id,format,flags) {} /*! should be overloaded to create the correct type of item depending on the
* data */
virtual RsItem *create_item( uint16_t /* service */,
uint8_t /* item_sub_id */ ) const = 0;
/*! create_item RsItem *deserialise(void *data, uint32_t *size);
* should be overloaded to create the correct type of item depending on the data
*/
virtual RsItem *create_item(uint16_t /* service */, uint8_t /* item_sub_id */) const=0;
RsItem *deserialise(void *data,uint32_t *size) ;
}; };
// Top class for config serializers. Config serializers are only used internally by RS core. The development of new services or plugins do not need this.
class RsConfigSerializer: public RsGenericSerializer /** Top class for config serializers.
* Config serializers are only used internally by RS core.
* The development of new services or plugins do not need this.
*/
struct RsConfigSerializer : RsGenericSerializer
{ {
public:
RsConfigSerializer(uint8_t config_class, RsConfigSerializer(uint8_t config_class,
uint8_t config_type, uint8_t config_type,
SerializationFormat format = FORMAT_BINARY, SerializationFormat format = FORMAT_BINARY,
SerializationFlags flags = SERIALIZATION_FLAG_NONE) SerializationFlags flags = SERIALIZATION_FLAG_NONE) :
RsGenericSerializer(config_class,config_type,format,flags) {}
: RsGenericSerializer(config_class,config_type,format,flags) {} /*! should be overloaded to create the correct type of item depending on the
* data */
virtual RsItem *create_item(uint8_t /* item_type */,
uint8_t /* item_sub_type */) const = 0;
/*! create_item RsItem *deserialise(void *data,uint32_t *size);
* should be overloaded to create the correct type of item depending on the data
*/
virtual RsItem *create_item(uint8_t /* item_type */, uint8_t /* item_sub_type */) const=0;
RsItem *deserialise(void *data,uint32_t *size) ;
}; };

470
libretroshare/src/serialiser/rstypeserializer.cc
View File

@ -3,7 +3,8 @@
* *
* RetroShare Serialiser. * RetroShare Serialiser.
* *
* Copyright 2017 by Cyril Soler * Copyright (C) 2017 Cyril Soler
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -26,27 +27,49 @@
#include "serialiser/rstypeserializer.h" #include "serialiser/rstypeserializer.h"
#include "serialiser/rsbaseserial.h" #include "serialiser/rsbaseserial.h"
#include "serialiser/rstlvkeys.h" #include "serialiser/rstlvkeys.h"
#include "serialiser/rsserializable.h"
#include "rsitems/rsitem.h"
#include "util/rsprint.h" #include "util/rsprint.h"
#include <iomanip> #include <iomanip>
#include <typeinfo>
#include <time.h> #include <time.h>
#include <string>
#include <typeinfo> // for typeid
#include <rapidjson/document.h>
#include <rapidjson/prettywriter.h>
//static const uint32_t MAX_SERIALIZED_ARRAY_SIZE = 500 ; //static const uint32_t MAX_SERIALIZED_ARRAY_SIZE = 500 ;
static const uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB. static const uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB.
//=================================================================================================// #define SAFE_GET_JSON_V() \
// Integer types // const char* mName = memberName.c_str(); \
//=================================================================================================// bool ret = jDoc.HasMember(mName); \
if(!ret) \
{ \
std::cerr << __PRETTY_FUNCTION__ << " \"" << memberName \
<< "\" not found in JSON:" << std::endl \
<< jDoc << std::endl << std::endl; \
print_stacktrace(); \
return false; \
} \
rapidjson::Value& v = jDoc[mName]
//============================================================================//
// Integer types //
//============================================================================//
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset, const bool& member) template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset, const bool& member)
{ {
return setRawUInt8(data,size,&offset,member); return setRawUInt8(data,size,&offset,member);
} }
template<> bool RsTypeSerializer::serialize(uint8_t /*data*/[], uint32_t /*size*/, uint32_t& /*offset*/, const int32_t& /*member*/)
{
std::cerr << __PRETTY_FUNCTION__ << " Not implemented!" << std::endl;
print_stacktrace();
return false;
}
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset, const uint8_t& member) template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset, const uint8_t& member)
{ {
return setRawUInt8(data,size,&offset,member); return setRawUInt8(data,size,&offset,member);
@ -70,10 +93,16 @@ template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint3
template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size, uint32_t &offset, bool& member) template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size, uint32_t &offset, bool& member)
{ {
uint8_t m ; uint8_t m;
bool ok = getRawUInt8(data,size,&offset,&m); bool ok = getRawUInt8(data,size,&offset,&m);
member = m ; member = m;
return ok; return ok;
}
template<> bool RsTypeSerializer::deserialize(const uint8_t /*data*/[], uint32_t /*size*/, uint32_t& /*offset*/, int32_t& /*member*/)
{
std::cerr << __PRETTY_FUNCTION__ << " Not implemented!" << std::endl;
print_stacktrace();
return false;
} }
template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size, uint32_t &offset, uint8_t& member) template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size, uint32_t &offset, uint8_t& member)
{ {
@ -100,6 +129,12 @@ template<> uint32_t RsTypeSerializer::serial_size(const bool& /* member*/)
{ {
return 1; return 1;
} }
template<> uint32_t RsTypeSerializer::serial_size(const int32_t& /* member*/)
{
std::cerr << __PRETTY_FUNCTION__ << " Not implemented!" << std::endl;
print_stacktrace();
return 0;
}
template<> uint32_t RsTypeSerializer::serial_size(const uint8_t& /* member*/) template<> uint32_t RsTypeSerializer::serial_size(const uint8_t& /* member*/)
{ {
return 1; return 1;
@ -125,6 +160,10 @@ template<> void RsTypeSerializer::print_data(const std::string& n, const bool &
{ {
std::cerr << " [bool ] " << n << ": " << V << std::endl; std::cerr << " [bool ] " << n << ": " << V << std::endl;
} }
template<> void RsTypeSerializer::print_data(const std::string& n, const int32_t& V)
{
std::cerr << " [int32_t ] " << n << ": " << V << std::endl;
}
template<> void RsTypeSerializer::print_data(const std::string& n, const uint8_t & V) template<> void RsTypeSerializer::print_data(const std::string& n, const uint8_t & V)
{ {
std::cerr << " [uint8_t ] " << n << ": " << V << std::endl; std::cerr << " [uint8_t ] " << n << ": " << V << std::endl;
@ -146,10 +185,121 @@ template<> void RsTypeSerializer::print_data(const std::string& n, const time_t&
std::cerr << " [time_t ] " << n << ": " << V << " (" << time(NULL)-V << " secs ago)" << std::endl; std::cerr << " [time_t ] " << n << ": " << V << " (" << time(NULL)-V << " secs ago)" << std::endl;
} }
#define SIMPLE_TO_JSON_DEF(T) \
template<> bool RsTypeSerializer::to_JSON( const std::string& memberName, \
const T& member, RsJson& jDoc ) \
{ \
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator(); \
\
rapidjson::Value key; \
key.SetString(memberName.c_str(), memberName.length(), allocator); \
\
rapidjson::Value value(member); \
\
jDoc.AddMember(key, value, allocator); \
\
return true; \
}
//=================================================================================================// SIMPLE_TO_JSON_DEF(bool)
// FLoats // SIMPLE_TO_JSON_DEF(int32_t)
//=================================================================================================//
template<> bool RsTypeSerializer::to_JSON( const std::string& memberName,
const time_t& member, RsJson& jDoc )
{
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator();
rapidjson::Value key;
key.SetString(memberName.c_str(), memberName.length(), allocator);
// without this compilation may break depending on how time_t is defined
int64_t tValue = member;
rapidjson::Value value(tValue);
jDoc.AddMember(key, value, allocator);
return true;
}
SIMPLE_TO_JSON_DEF(uint8_t)
SIMPLE_TO_JSON_DEF(uint16_t)
SIMPLE_TO_JSON_DEF(uint32_t)
SIMPLE_TO_JSON_DEF(uint64_t)
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName, bool& member,
RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsBool();
if(ret) member = v.GetBool();
return ret;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName,
int32_t& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsInt();
if(ret) member = v.GetInt();
return ret;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName, time_t& member,
RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsInt();
if(ret) member = v.GetInt();
return ret;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName,
uint8_t& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsUint();
if(ret) member = v.GetUint();
return ret;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName,
uint16_t& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsUint();
if(ret) member = v.GetUint();
return ret;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName,
uint32_t& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsUint();
if(ret) member = v.GetUint();
return ret;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName,
uint64_t& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsUint();
if(ret) member = v.GetUint();
return ret;
}
//============================================================================//
// Floats //
//============================================================================//
template<> uint32_t RsTypeSerializer::serial_size(const float&){ return 4; } template<> uint32_t RsTypeSerializer::serial_size(const float&){ return 4; }
@ -166,10 +316,75 @@ template<> void RsTypeSerializer::print_data(const std::string& n, const float&
std::cerr << " [float ] " << n << ": " << V << std::endl; std::cerr << " [float ] " << n << ": " << V << std::endl;
} }
SIMPLE_TO_JSON_DEF(float)
//=================================================================================================// template<> /*static*/
// TlvString with subtype // bool RsTypeSerializer::from_JSON( const std::string& memberName,
//=================================================================================================// float& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsFloat();
if(ret) member = v.GetFloat();
return ret;
}
//============================================================================//
// std::string //
//============================================================================//
template<> uint32_t RsTypeSerializer::serial_size(const std::string& str)
{
return getRawStringSize(str);
}
template<> bool RsTypeSerializer::serialize( uint8_t data[], uint32_t size,
uint32_t& offset,
const std::string& str )
{
return setRawString(data, size, &offset, str);
}
template<> bool RsTypeSerializer::deserialize( const uint8_t data[],
uint32_t size, uint32_t &offset,
std::string& str )
{
return getRawString(data, size, &offset, str);
}
template<> void RsTypeSerializer::print_data( const std::string& n,
const std::string& str )
{
std::cerr << " [std::string] " << n << ": " << str << std::endl;
}
template<> /*static*/
bool RsTypeSerializer::to_JSON( const std::string& membername,
const std::string& member, RsJson& jDoc )
{
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator();
rapidjson::Value key;
key.SetString(membername.c_str(), membername.length(), allocator);
rapidjson::Value value;;
value.SetString(member.c_str(), member.length(), allocator);
jDoc.AddMember(key, value, allocator);
return true;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName,
std::string& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsString();
if(ret) member = v.GetString();
return ret;
}
//============================================================================//
// TlvString with subtype //
//============================================================================//
template<> uint32_t RsTypeSerializer::serial_size(uint16_t /* type_subtype */,const std::string& s) template<> uint32_t RsTypeSerializer::serial_size(uint16_t /* type_subtype */,const std::string& s)
{ {
@ -188,46 +403,131 @@ template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t siz
template<> void RsTypeSerializer::print_data(const std::string& n, uint16_t type_substring,const std::string& V) template<> void RsTypeSerializer::print_data(const std::string& n, uint16_t type_substring,const std::string& V)
{ {
std::cerr << " [TlvString ] " << n << ": type=" << std::hex <<std::setw(4)<<std::setfill('0') << type_substring << std::dec << " s=\"" << V<< "\"" << std::endl; std::cerr << " [TlvString ] " << n << ": type=" << std::hex <<std::setw(4)<<std::setfill('0') << type_substring << std::dec << " s=\"" << V<< "\"" << std::endl;
} }
//=================================================================================================// template<> /*static*/
// TlvInt with subtype // bool RsTypeSerializer::to_JSON( const std::string& memberName,
//=================================================================================================// uint16_t /*sub_type*/,
const std::string& member, RsJson& jDoc )
template<> uint32_t RsTypeSerializer::serial_size(uint16_t /* type_subtype */,const uint32_t& /*s*/)
{ {
return GetTlvUInt32Size() ; return to_JSON<std::string>(memberName, member, jDoc);
} }
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset,uint16_t sub_type,const uint32_t& s) template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& memberName,
uint16_t /*sub_type*/,
std::string& member, RsJson& jDoc )
{ {
return SetTlvUInt32(data,size,&offset,sub_type,s) ; return from_JSON<std::string>(memberName, member, jDoc);
} }
template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size,uint32_t& offset,uint16_t sub_type,uint32_t& s) //============================================================================//
// TlvInt with subtype //
//============================================================================//
template<> uint32_t RsTypeSerializer::serial_size( uint16_t /* type_subtype */,
const uint32_t& /*s*/ )
{ {
return GetTlvUInt32((void*)data,size,&offset,sub_type,&s) ; return GetTlvUInt32Size();
}
template<> bool RsTypeSerializer::serialize( uint8_t data[], uint32_t size,
uint32_t &offset,uint16_t sub_type,
const uint32_t& s)
{
return SetTlvUInt32(data,size,&offset,sub_type,s);
}
template<> bool RsTypeSerializer::deserialize( const uint8_t data[],
uint32_t size, uint32_t& offset,
uint16_t sub_type, uint32_t& s)
{
return GetTlvUInt32((void*)data, size, &offset, sub_type, &s);
} }
template<> void RsTypeSerializer::print_data(const std::string& n, uint16_t sub_type,const uint32_t& V) template<> void RsTypeSerializer::print_data(const std::string& n, uint16_t sub_type,const uint32_t& V)
{ {
std::cerr << " [TlvUInt32 ] " << n << ": type=" << std::hex <<std::setw(4)<<std::setfill('0') << sub_type << std::dec << " s=\"" << V<< "\"" << std::endl; std::cerr << " [TlvUInt32 ] " << n << ": type=" << std::hex
<< std::setw(4) << std::setfill('0') << sub_type << std::dec
<< " s=\"" << V << "\"" << std::endl;
} }
template<> /*static*/
//=================================================================================================// bool RsTypeSerializer::to_JSON( const std::string& memberName,
// std::string // uint16_t /*sub_type*/,
//=================================================================================================// const uint32_t& member, RsJson& jDoc )
template<> void RsTypeSerializer::print_data(const std::string& n, const std::string& V)
{ {
std::cerr << " [std::string] " << n << ": " << V << std::endl; return to_JSON<uint32_t>(memberName, member, jDoc);
} }
//=================================================================================================// template<> /*static*/
// Binary blocks // bool RsTypeSerializer::from_JSON( const std::string& memberName,
//=================================================================================================// uint16_t /*sub_type*/,
uint32_t& member, RsJson& jDoc )
{
return from_JSON<uint32_t>(memberName, member, jDoc);
}
//============================================================================//
// TlvItems //
//============================================================================//
template<> uint32_t RsTypeSerializer::serial_size(const RsTlvItem& s)
{
return s.TlvSize();
}
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size,
uint32_t &offset,const RsTlvItem& s)
{
return s.SetTlv(data,size,&offset);
}
template<> bool RsTypeSerializer::deserialize(const uint8_t data[],
uint32_t size,uint32_t& offset,
RsTlvItem& s)
{
return s.GetTlv((void*)data,size,&offset) ;
}
template<> void RsTypeSerializer::print_data( const std::string& n,
const RsTlvItem& s )
{
std::cerr << " [" << typeid(s).name() << "] " << n << std::endl;
}
template<> /*static*/
bool RsTypeSerializer::to_JSON( const std::string& memberName,
const RsTlvItem& member, RsJson& jDoc )
{
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator();
rapidjson::Value key;
key.SetString(memberName.c_str(), memberName.length(), allocator);
rapidjson::Value value;
const char* tName = typeid(member).name();
value.SetString(tName, allocator);
jDoc.AddMember(key, value, allocator);
return true;
}
template<> /*static*/
bool RsTypeSerializer::from_JSON( const std::string& /*memberName*/,
RsTlvItem& member, RsJson& /*jDoc*/)
{
member.TlvClear();
return true;
}
//============================================================================//
// Binary blocks //
//============================================================================//
template<> uint32_t RsTypeSerializer::serial_size(const RsTypeSerializer::TlvMemBlock_proxy& r) { return 4 + r.second ; } template<> uint32_t RsTypeSerializer::serial_size(const RsTypeSerializer::TlvMemBlock_proxy& r) { return 4 + r.second ; }
@ -286,82 +586,40 @@ template<> void RsTypeSerializer::print_data(const std::string& n, const RsTypeS
std::cerr << " [Binary data] " << n << ", length=" << s.second << " data=" << RsUtil::BinToHex((uint8_t*)s.first,std::min(50u,s.second)) << ((s.second>50)?"...":"") << std::endl; std::cerr << " [Binary data] " << n << ", length=" << s.second << " data=" << RsUtil::BinToHex((uint8_t*)s.first,std::min(50u,s.second)) << ((s.second>50)?"...":"") << std::endl;
} }
//=================================================================================================// template<> /*static*/
// TlvItems // bool RsTypeSerializer::to_JSON(
//=================================================================================================// const std::string& memberName,
const RsTypeSerializer::TlvMemBlock_proxy& member, RsJson& jDoc )
template<> uint32_t RsTypeSerializer::serial_size(const RsTlvItem& s)
{ {
return s.TlvSize() ; rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator();
}
template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset,const RsTlvItem& s) rapidjson::Value key;
{ key.SetString(memberName.c_str(), memberName.length(), allocator);
return s.SetTlv(data,size,&offset) ;
}
template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size,uint32_t& offset,RsTlvItem& s) rapidjson::Value value;
{ const char* tName = typeid(member).name();
return s.GetTlv((void*)data,size,&offset) ; value.SetString(tName, allocator);
}
template<> void RsTypeSerializer::print_data(const std::string& n, const RsTlvItem& s) jDoc.AddMember(key, value, allocator);
{
// can we call TlvPrint inside this?
std::cerr << " [" << typeid(s).name() << "] " << n << std::endl;
}
//============================================================================//
// RsItem and derivated //
//============================================================================//
template<> uint32_t RsTypeSerializer::serial_size(const RsItem& s)
{
RsGenericSerializer::SerializeContext ctx(
NULL, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE );
ctx.mOffset = 8; // header size
const_cast<RsItem&>(s).serial_process(RsGenericSerializer::SIZE_ESTIMATE,
ctx);
return ctx.mOffset;
}
template<> bool RsTypeSerializer::serialize( uint8_t data[], uint32_t size,
uint32_t &offset, const RsItem& s )
{
RsGenericSerializer::SerializeContext ctx(
data, size, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE );
ctx.mOffset = offset;
const_cast<RsItem&>(s).serial_process(RsGenericSerializer::SERIALIZE,
ctx);
return true; return true;
} }
template<> bool RsTypeSerializer::deserialize( const uint8_t data[], template<> /*static*/
uint32_t size, uint32_t& offset, bool RsTypeSerializer::from_JSON( const std::string& /*memberName*/,
RsItem& s ) RsTypeSerializer::TlvMemBlock_proxy&,
{ RsJson& /*jDoc*/)
RsGenericSerializer::SerializeContext ctx( { return true; }
const_cast<uint8_t*>(data), size,
RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE );
ctx.mOffset = offset;
const_cast<RsItem&>(s).serial_process(RsGenericSerializer::DESERIALIZE,
ctx);
return true;
}
template<> void RsTypeSerializer::print_data( const std::string& /*n*/,
const RsItem& s ) //============================================================================//
// RsJson std:ostream support //
//============================================================================//
std::ostream &operator<<(std::ostream &out, const RsJson &jDoc)
{ {
RsGenericSerializer::SerializeContext ctx( rapidjson::StringBuffer buffer; buffer.Clear();
NULL, 0, rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
RsGenericSerializer::FORMAT_BINARY, jDoc.Accept(writer);
RsGenericSerializer::SERIALIZATION_FLAG_NONE ); return out << buffer.GetString();
const_cast<RsItem&>(s).serial_process(RsGenericSerializer::PRINT,
ctx);
} }

651
libretroshare/src/serialiser/rstypeserializer.h
View File

@ -3,7 +3,8 @@
* *
* RetroShare Serialiser. * RetroShare Serialiser.
* *
* Copyright 2017 by Cyril Soler * Copyright (C) 2017 Cyril Soler
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -32,83 +33,95 @@
#include "retroshare/rsids.h" #include "retroshare/rsids.h"
#include "serialiser/rsserializer.h" #include "serialiser/rsserializer.h"
#include "serialiser/rsserializable.h"
/** @def RS_REGISTER_SERIAL_MEMBER(I) #include <rapidjson/document.h>
* Use this macro to register the members of `YourItem` for serial processing #include <typeinfo> // for typeid
* inside `YourItem::serial_process(j, ctx)` #include <type_traits>
* #include <errno.h>
* Inspired by http://stackoverflow.com/a/39345864
/** INTERNAL ONLY helper to avoid copy paste code for std::{vector,list,set}<T>
* Can't use a template function because T is needed for const_cast */
#define RsTypeSerializer_PRIVATE_TO_JSON_ARRAY() do \
{ \
using namespace rapidjson; \
\
Document::AllocatorType& allocator = ctx.mJson.GetAllocator(); \
\
Value arrKey; arrKey.SetString(memberName.c_str(), allocator); \
\
Value arr(kArrayType); \
\
for (auto& el : v) \
{ \
/* Use same allocator to avoid deep copy */\
RsGenericSerializer::SerializeContext elCtx(\
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,\
RsGenericSerializer::SERIALIZATION_FLAG_NONE,\
&allocator );\
\
/* If el is const the default serial_process template is matched */ \
/* also when specialization is necessary so the compilation break */ \
serial_process(j, elCtx, const_cast<T&>(el), memberName); \
\
elCtx.mOk = elCtx.mOk && elCtx.mJson.HasMember(arrKey);\
if(elCtx.mOk) arr.PushBack(elCtx.mJson[arrKey], allocator);\
else\
{\
ctx.mOk = false;\
break;\
}\
}\
\
ctx.mJson.AddMember(arrKey, arr, allocator);\
} while (false)
/** INTERNAL ONLY helper to avoid copy paste code for std::{vector,list,set}<T>
* Can't use a template function because std::{vector,list,set}<T> has different
* name for insert/push_back function
*/ */
#define RS_REGISTER_SERIAL_MEMBER(I) \ #define RsTypeSerializer_PRIVATE_FROM_JSON_ARRAY(INSERT_FUN) do\
do { RsTypeSerializer::serial_process(j, ctx, I, #I); } while(0) {\
using namespace rapidjson;\
\
bool& ok(ctx.mOk);\
Document& jDoc(ctx.mJson);\
Document::AllocatorType& allocator = jDoc.GetAllocator();\
\
Value arrKey;\
arrKey.SetString(memberName.c_str(), memberName.length());\
\
ok = ok && jDoc.IsObject();\
ok = ok && jDoc.HasMember(arrKey);\
\
if(ok && jDoc[arrKey].IsArray())\
{\
for (auto&& arrEl : jDoc[arrKey].GetArray())\
{\
RsGenericSerializer::SerializeContext elCtx(\
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,\
RsGenericSerializer::SERIALIZATION_FLAG_NONE,\
&allocator );\
elCtx.mJson.AddMember(arrKey, arrEl, allocator);\
\
T el;\
serial_process(j, elCtx, el, memberName); \
ok = ok && elCtx.mOk;\
\
if(ok) v.INSERT_FUN(el);\
else break;\
}\
}\
} while(false)
/** @def RS_REGISTER_SERIAL_MEMBER_TYPED(I, T) std::ostream &operator<<(std::ostream &out, const RsJson &jDoc);
* This macro usage is similar to @see RS_REGISTER_SERIAL_MEMBER(I) but it
* permit to force serialization/deserialization type, it is expecially useful
* with enum class members or RsTlvItem derivative members, be very careful with
* the type you pass, as reinterpret_cast on a reference is used that is
* expecially permissive so you can shot your feet if not carefull enough.
*
* If you are using this with an RsItem derivative (so passing RsItem as T)
* consider to register your item type with @see RS_REGISTER_ITEM_TYPE(T) in
* association with @see RS_REGISTER_SERIAL_MEMBER(I) that rely on template
* function generation, as in this particular case
* RS_REGISTER_SERIAL_MEMBER_TYPED(I, T) would cause the serial code rely on
* C++ dynamic dispatching that may have a noticeable impact on runtime
* performances.
*/
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#define RS_REGISTER_SERIAL_MEMBER_TYPED(I, T) do {\
RsTypeSerializer::serial_process<T>(j, ctx, reinterpret_cast<T&>(I), #I);\
} while(0)
#pragma GCC diagnostic pop
/** @def RS_REGISTER_ITEM_TYPE(T)
* Use this macro into `youritem.cc` only if you need to process members of
* subtypes of RsItem.
*
* The usage of this macro is strictly needed only in some cases, for example if
* you are registering for serialization a member of a container that contains
* items of subclasses of RsItem like * `std::map<uint64_t, RsChatMsgItem>`
*
* @code{.cpp}
struct PrivateOugoingMapItem : RsChatItem
{
PrivateOugoingMapItem() : RsChatItem(RS_PKT_SUBTYPE_OUTGOING_MAP) {}
void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx );
std::map<uint64_t, RsChatMsgItem> store;
};
RS_REGISTER_ITEM_TYPE(RsChatMsgItem)
void PrivateOugoingMapItem::serial_process(
RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
// store is of type
RS_REGISTER_SERIAL_MEMBER(store);
}
* @endcode
*
* If you use this macro with a lot of different item types this can cause the
* generated binary grow in size, consider the usage of
* @see RS_REGISTER_SERIAL_MEMBER_TYPED(I, T) passing RsItem as type in that
* case.
*/
#define RS_REGISTER_ITEM_TYPE(T) template<> \
void RsTypeSerializer::serial_process<T>( \
RsGenericSerializer::SerializeJob j,\
RsGenericSerializer::SerializeContext& ctx, T& item,\
const std::string& /*name*/) { item.serial_process(j, ctx); }
struct RsTypeSerializer struct RsTypeSerializer
{ {
/** This type should be used to pass a parameter to drive the serialisation /** This type should be used to pass a parameter to drive the serialisation
* if needed */ * if needed */
struct TlvMemBlock_proxy: public std::pair<void*&,uint32_t&> struct TlvMemBlock_proxy : std::pair<void*&,uint32_t&>
{ {
TlvMemBlock_proxy(void*& p, uint32_t& s) : TlvMemBlock_proxy(void*& p, uint32_t& s) :
std::pair<void*&,uint32_t&>(p,s) {} std::pair<void*&,uint32_t&>(p,s) {}
@ -118,9 +131,10 @@ struct RsTypeSerializer
/// Generic types /// Generic types
template<typename T> template<typename T>
static void serial_process( RsGenericSerializer::SerializeJob j, typename std::enable_if<std::is_same<RsTlvItem,T>::value || !(std::is_base_of<RsSerializable,T>::value || std::is_enum<T>::value || std::is_base_of<RsTlvItem,T>::value)>::type
static /*void*/ serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx, RsGenericSerializer::SerializeContext& ctx,
T& member,const std::string& member_name) T& member, const std::string& member_name)
{ {
switch(j) switch(j)
{ {
@ -138,9 +152,17 @@ struct RsTypeSerializer
case RsGenericSerializer::PRINT: case RsGenericSerializer::PRINT:
print_data(member_name,member); print_data(member_name,member);
break; break;
case RsGenericSerializer::TO_JSON:
ctx.mOk = ctx.mOk && to_JSON(member_name, member, ctx.mJson);
break;
case RsGenericSerializer::FROM_JSON:
ctx.mOk = ctx.mOk && from_JSON(member_name, member, ctx.mJson);
break;
default: default:
ctx.mOk = false; std::cerr << __PRETTY_FUNCTION__ << " Unknown serial job: "
throw std::runtime_error("Unknown serial job"); << static_cast<std::underlying_type<decltype(j)>::type>(j)
<< std::endl;
exit(EINVAL);
} }
} }
@ -165,11 +187,21 @@ struct RsTypeSerializer
serialize(ctx.mData,ctx.mSize,ctx.mOffset,type_id,member); serialize(ctx.mData,ctx.mSize,ctx.mOffset,type_id,member);
break; break;
case RsGenericSerializer::PRINT: case RsGenericSerializer::PRINT:
print_data(member_name,type_id,member); print_data(member_name, member);
break;
case RsGenericSerializer::TO_JSON:
ctx.mOk = ctx.mOk &&
to_JSON(member_name, type_id, member, ctx.mJson);
break;
case RsGenericSerializer::FROM_JSON:
ctx.mOk = ctx.mOk &&
from_JSON(member_name, type_id, member, ctx.mJson);
break; break;
default: default:
ctx.mOk = false; std::cerr << __PRETTY_FUNCTION__ << " Unknown serial job: "
throw std::runtime_error("Unknown serial job"); << static_cast<std::underlying_type<decltype(j)>::type>(j)
<< std::endl;
exit(EINVAL);
} }
} }
@ -178,7 +210,7 @@ struct RsTypeSerializer
static void serial_process( RsGenericSerializer::SerializeJob j, static void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx, RsGenericSerializer::SerializeContext& ctx,
std::map<T,U>& v, std::map<T,U>& v,
const std::string& member_name ) const std::string& memberName )
{ {
switch(j) switch(j)
{ {
@ -225,11 +257,11 @@ struct RsTypeSerializer
case RsGenericSerializer::PRINT: case RsGenericSerializer::PRINT:
{ {
if(v.empty()) if(v.empty())
std::cerr << " Empty map \"" << member_name << "\"" std::cerr << " Empty map \"" << memberName << "\""
<< std::endl; << std::endl;
else else
std::cerr << " std::map of " << v.size() << " elements: \"" std::cerr << " std::map of " << v.size() << " elements: \""
<< member_name << "\"" << std::endl; << memberName << "\"" << std::endl;
for(typename std::map<T,U>::iterator it(v.begin());it!=v.end();++it) for(typename std::map<T,U>::iterator it(v.begin());it!=v.end();++it)
{ {
@ -242,6 +274,95 @@ struct RsTypeSerializer
} }
break; break;
} }
case RsGenericSerializer::TO_JSON:
{
using namespace rapidjson;
Document::AllocatorType& allocator = ctx.mJson.GetAllocator();
Value arrKey; arrKey.SetString(memberName.c_str(),
memberName.length(), allocator);
Value arr(kArrayType);
for (auto& kv : v)
{
// Use same allocator to avoid deep copy
RsGenericSerializer::SerializeContext kCtx(
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE,
&allocator );
serial_process<T>(j, kCtx, const_cast<T&>(kv.first), "key");
RsGenericSerializer::SerializeContext vCtx(
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE,
&allocator );
serial_process<U>(j, vCtx, const_cast<U&>(kv.second), "value");
if(kCtx.mOk && vCtx.mOk)
{
Value el(kObjectType);
el.AddMember("key", kCtx.mJson["key"], allocator);
el.AddMember("value", vCtx.mJson["value"], allocator);
arr.PushBack(el, allocator);
}
}
ctx.mJson.AddMember(arrKey, arr, allocator);
break;
}
case RsGenericSerializer::FROM_JSON:
{
using namespace rapidjson;
bool& ok(ctx.mOk);
Document& jDoc(ctx.mJson);
Document::AllocatorType& allocator = jDoc.GetAllocator();
Value arrKey;
arrKey.SetString(memberName.c_str(), memberName.length());
ok = ok && jDoc.IsObject();
ok = ok && jDoc.HasMember(arrKey);
if(ok && jDoc[arrKey].IsArray())
{
for (auto&& kvEl : jDoc[arrKey].GetArray())
{
ok = ok && kvEl.IsObject();
ok = ok && kvEl.HasMember("key");
ok = ok && kvEl.HasMember("value");
if (!ok) break;
RsGenericSerializer::SerializeContext kCtx(
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE,
&allocator );
if(ok)
kCtx.mJson.AddMember("key", kvEl["key"], allocator);
T key;
ok = ok && (serial_process(j, kCtx, key, "key"), kCtx.mOk);
RsGenericSerializer::SerializeContext vCtx(
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE,
&allocator );
if(ok)
vCtx.mJson.AddMember("value", kvEl["value"], allocator);
U value;
ok = ok && ( serial_process(j, vCtx, value, "value"),
vCtx.mOk );
if(ok) v.insert(std::pair<T,U>(key,value));
else break;
}
}
break;
}
default: break; default: break;
} }
} }
@ -251,7 +372,7 @@ struct RsTypeSerializer
static void serial_process( RsGenericSerializer::SerializeJob j, static void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx, RsGenericSerializer::SerializeContext& ctx,
std::vector<T>& v, std::vector<T>& v,
const std::string& member_name ) const std::string& memberName )
{ {
switch(j) switch(j)
{ {
@ -259,7 +380,7 @@ struct RsTypeSerializer
{ {
ctx.mOffset += 4; ctx.mOffset += 4;
for(uint32_t i=0;i<v.size();++i) for(uint32_t i=0;i<v.size();++i)
serial_process(j,ctx,v[i],member_name); serial_process(j,ctx,v[i],memberName);
break; break;
} }
case RsGenericSerializer::DESERIALIZE: case RsGenericSerializer::DESERIALIZE:
@ -268,7 +389,7 @@ struct RsTypeSerializer
serial_process(j,ctx,n,"temporary size"); serial_process(j,ctx,n,"temporary size");
v.resize(n); v.resize(n);
for(uint32_t i=0;i<v.size();++i) for(uint32_t i=0;i<v.size();++i)
serial_process(j,ctx,v[i],member_name); serial_process(j,ctx,v[i],memberName);
break; break;
} }
case RsGenericSerializer::SERIALIZE: case RsGenericSerializer::SERIALIZE:
@ -276,7 +397,7 @@ struct RsTypeSerializer
uint32_t n=v.size(); uint32_t n=v.size();
serial_process(j,ctx,n,"temporary size"); serial_process(j,ctx,n,"temporary size");
for(uint32_t i=0; i<v.size(); ++i) for(uint32_t i=0; i<v.size(); ++i)
serial_process(j,ctx,v[i],member_name); serial_process(j,ctx,v[i],memberName);
break; break;
} }
case RsGenericSerializer::PRINT: case RsGenericSerializer::PRINT:
@ -289,10 +410,16 @@ struct RsTypeSerializer
for(uint32_t i=0;i<v.size();++i) for(uint32_t i=0;i<v.size();++i)
{ {
std::cerr << " " ; std::cerr << " " ;
serial_process(j,ctx,v[i],member_name); serial_process(j,ctx,v[i],memberName);
} }
break; break;
} }
case RsGenericSerializer::TO_JSON:
RsTypeSerializer_PRIVATE_TO_JSON_ARRAY();
break;
case RsGenericSerializer::FROM_JSON:
RsTypeSerializer_PRIVATE_FROM_JSON_ARRAY(push_back);
break;
default: break; default: break;
} }
} }
@ -301,7 +428,7 @@ struct RsTypeSerializer
template<typename T> template<typename T>
static void serial_process( RsGenericSerializer::SerializeJob j, static void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx, RsGenericSerializer::SerializeContext& ctx,
std::set<T>& v, const std::string& member_name ) std::set<T>& v, const std::string& memberName )
{ {
switch(j) switch(j)
{ {
@ -311,7 +438,7 @@ struct RsTypeSerializer
for(typename std::set<T>::iterator it(v.begin());it!=v.end();++it) for(typename std::set<T>::iterator it(v.begin());it!=v.end();++it)
// the const cast here is a hack to avoid serial_process to // the const cast here is a hack to avoid serial_process to
// instantiate serialise(const T&) // instantiate serialise(const T&)
serial_process(j,ctx,const_cast<T&>(*it) ,member_name); serial_process(j,ctx,const_cast<T&>(*it) ,memberName);
break; break;
} }
case RsGenericSerializer::DESERIALIZE: case RsGenericSerializer::DESERIALIZE:
@ -321,7 +448,7 @@ struct RsTypeSerializer
for(uint32_t i=0; i<n; ++i) for(uint32_t i=0; i<n; ++i)
{ {
T tmp; T tmp;
serial_process<T>(j,ctx,tmp,member_name); serial_process<T>(j,ctx,tmp,memberName);
v.insert(tmp); v.insert(tmp);
} }
break; break;
@ -333,7 +460,7 @@ struct RsTypeSerializer
for(typename std::set<T>::iterator it(v.begin());it!=v.end();++it) for(typename std::set<T>::iterator it(v.begin());it!=v.end();++it)
// the const cast here is a hack to avoid serial_process to // the const cast here is a hack to avoid serial_process to
// instantiate serialise(const T&) // instantiate serialise(const T&)
serial_process(j,ctx,const_cast<T&>(*it) ,member_name); serial_process(j,ctx,const_cast<T&>(*it) ,memberName);
break; break;
} }
case RsGenericSerializer::PRINT: case RsGenericSerializer::PRINT:
@ -343,6 +470,12 @@ struct RsTypeSerializer
<< std::endl; << std::endl;
break; break;
} }
case RsGenericSerializer::TO_JSON:
RsTypeSerializer_PRIVATE_TO_JSON_ARRAY();
break;
case RsGenericSerializer::FROM_JSON:
RsTypeSerializer_PRIVATE_FROM_JSON_ARRAY(insert);
break;
default: break; default: break;
} }
} }
@ -352,7 +485,7 @@ struct RsTypeSerializer
static void serial_process( RsGenericSerializer::SerializeJob j, static void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx, RsGenericSerializer::SerializeContext& ctx,
std::list<T>& v, std::list<T>& v,
const std::string& member_name ) const std::string& memberName )
{ {
switch(j) switch(j)
{ {
@ -360,7 +493,7 @@ struct RsTypeSerializer
{ {
ctx.mOffset += 4; ctx.mOffset += 4;
for(typename std::list<T>::iterator it(v.begin());it!=v.end();++it) for(typename std::list<T>::iterator it(v.begin());it!=v.end();++it)
serial_process(j,ctx,*it ,member_name); serial_process(j,ctx,*it ,memberName);
break; break;
} }
case RsGenericSerializer::DESERIALIZE: case RsGenericSerializer::DESERIALIZE:
@ -370,7 +503,7 @@ struct RsTypeSerializer
for(uint32_t i=0;i<n;++i) for(uint32_t i=0;i<n;++i)
{ {
T tmp; T tmp;
serial_process<T>(j,ctx,tmp,member_name); serial_process<T>(j,ctx,tmp,memberName);
v.push_back(tmp); v.push_back(tmp);
} }
break; break;
@ -380,7 +513,7 @@ struct RsTypeSerializer
uint32_t n=v.size(); uint32_t n=v.size();
serial_process(j,ctx,n,"temporary size"); serial_process(j,ctx,n,"temporary size");
for(typename std::list<T>::iterator it(v.begin());it!=v.end();++it) for(typename std::list<T>::iterator it(v.begin());it!=v.end();++it)
serial_process(j,ctx,*it ,member_name); serial_process(j,ctx,*it ,memberName);
break; break;
} }
case RsGenericSerializer::PRINT: case RsGenericSerializer::PRINT:
@ -390,6 +523,12 @@ struct RsTypeSerializer
<< std::endl; << std::endl;
break; break;
} }
case RsGenericSerializer::TO_JSON:
RsTypeSerializer_PRIVATE_TO_JSON_ARRAY();
break;
case RsGenericSerializer::FROM_JSON:
RsTypeSerializer_PRIVATE_FROM_JSON_ARRAY(push_back);
break;
default: break; default: break;
} }
} }
@ -399,7 +538,7 @@ struct RsTypeSerializer
static void serial_process( RsGenericSerializer::SerializeJob j, static void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx, RsGenericSerializer::SerializeContext& ctx,
t_RsFlags32<N>& v, t_RsFlags32<N>& v,
const std::string& /*member_name*/) const std::string& memberName )
{ {
switch(j) switch(j)
{ {
@ -421,16 +560,139 @@ struct RsTypeSerializer
std::cerr << " Flags of type " << std::hex << N << " : " std::cerr << " Flags of type " << std::hex << N << " : "
<< v.toUInt32() << std::endl; << v.toUInt32() << std::endl;
break; break;
case RsGenericSerializer::TO_JSON:
ctx.mOk = to_JSON(memberName, v.toUInt32(), ctx.mJson);
break;
case RsGenericSerializer::FROM_JSON:
{
uint32_t f;
ctx.mOk = from_JSON(memberName, f, ctx.mJson);
v = t_RsFlags32<N>(f);
break;
}
default: break;
} }
} }
/** TODO /**
* Serialization format is inside context, but context is not passed to * @brief serial process enum types
* following functions, that need to know the format to do the job, actually *
* RsGenericSerializer::FORMAT_BINARY is assumed in all of them!! * On declaration of your member of enum type you must specify the
*/ * underlying type otherwise the serialization format may differ in an
* uncompatible way depending on the compiler/platform.
*/
template<typename E>
typename std::enable_if<std::is_enum<E>::value>::type
static /*void*/ serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx,
E& member,
const std::string& memberName )
{
#ifdef RSSERIAL_DEBUG
std::cerr << __PRETTY_FUNCTION__ << " processing enum: "
<< typeid(E).name() << " as "
<< typeid(typename std::underlying_type<E>::type).name()
<< std::endl;
#endif
serial_process(
j, ctx,
reinterpret_cast<typename std::underlying_type<E>::type&>(member),
memberName );
}
/// RsSerializable and derivatives
template<typename T>
typename std::enable_if<std::is_base_of<RsSerializable,T>::value>::type
static /*void*/ serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx,
T& member,
const std::string& memberName )
{
switch(j)
{
case RsGenericSerializer::SIZE_ESTIMATE: // fallthrough
case RsGenericSerializer::DESERIALIZE: // fallthrough
case RsGenericSerializer::SERIALIZE: // fallthrough
case RsGenericSerializer::PRINT:
member.serial_process(j, ctx);
break;
case RsGenericSerializer::TO_JSON:
{
rapidjson::Document& jDoc(ctx.mJson);
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator();
// Reuse allocator to avoid deep copy later
RsGenericSerializer::SerializeContext lCtx(
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE,
&allocator );
member.serial_process(j, lCtx);
rapidjson::Value key;
key.SetString(memberName.c_str(), memberName.length(), allocator);
/* Because the passed allocator is reused it doesn't go out of scope and
* there is no need of deep copy and we can take advantage of the much
* faster rapidjson move semantic */
jDoc.AddMember(key, lCtx.mJson, allocator);
ctx.mOk = ctx.mOk && lCtx.mOk;
break;
}
case RsGenericSerializer::FROM_JSON:
{
rapidjson::Document& jDoc(ctx.mJson);
const char* mName = memberName.c_str();
ctx.mOk = ctx.mOk && jDoc.HasMember(mName);
if(!ctx.mOk)
{
std::cerr << __PRETTY_FUNCTION__ << " \"" << memberName
<< "\" not found in JSON:" << std::endl
<< jDoc << std::endl << std::endl;
print_stacktrace();
break;
}
rapidjson::Value& v = jDoc[mName];
RsGenericSerializer::SerializeContext lCtx(
nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE );
lCtx.mJson.SetObject() = v; // Beware of move semantic!!
member.serial_process(j, lCtx);
ctx.mOk = ctx.mOk && lCtx.mOk;
break;
}
default:
std::cerr << __PRETTY_FUNCTION__ << " Unknown serial job: "
<< static_cast<std::underlying_type<decltype(j)>::type>(j)
<< std::endl;
exit(EINVAL);
break;
}
}
/// RsTlvItem derivatives only
template<typename T>
typename std::enable_if<std::is_base_of<RsTlvItem,T>::value && !std::is_same<RsTlvItem,T>::value>::type
static /*void*/ serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx,
T& member,
const std::string& memberName )
{
serial_process(j, ctx, static_cast<RsTlvItem&>(member), memberName);
}
protected: protected:
//============================================================================//
// Generic types declarations //
//============================================================================//
template<typename T> static bool serialize( template<typename T> static bool serialize(
uint8_t data[], uint32_t size, uint32_t &offset, const T& member ); uint8_t data[], uint32_t size, uint32_t &offset, const T& member );
@ -442,17 +704,41 @@ protected:
template<typename T> static void print_data( template<typename T> static void print_data(
const std::string& name, const T& member); const std::string& name, const T& member);
template<typename T> static bool to_JSON( const std::string& membername,
const T& member, RsJson& jDoc );
template<typename T> static bool from_JSON( const std::string& memberName,
T& member, RsJson& jDoc );
//============================================================================//
// Generic types + type_id declarations //
//============================================================================//
template<typename T> static bool serialize( template<typename T> static bool serialize(
uint8_t data[], uint32_t size, uint32_t &offset, uint16_t type_id, uint8_t data[], uint32_t size, uint32_t &offset, uint16_t type_id,
const T& member ); const T& member );
template<typename T> static bool deserialize( template<typename T> static bool deserialize(
const uint8_t data[], uint32_t size, uint32_t &offset, const uint8_t data[], uint32_t size, uint32_t &offset,
uint16_t type_id, T& member ); uint16_t type_id, T& member );
template<typename T> static uint32_t serial_size( template<typename T> static uint32_t serial_size(
uint16_t type_id,const T& member ); uint16_t type_id,const T& member );
template<typename T> static void print_data(
const std::string& name,uint16_t type_id,const T& member ); template<typename T> static void print_data( const std::string& n,
uint16_t type_id,const T& member );
template<typename T> static bool to_JSON( const std::string& membername,
uint16_t type_id,
const T& member, RsJson& jVal );
template<typename T> static bool from_JSON( const std::string& memberName,
uint16_t type_id,
T& member, RsJson& jDoc );
//============================================================================//
// t_RsGenericId<...> declarations //
//============================================================================//
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER> template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
static bool serialize( static bool serialize(
@ -466,13 +752,29 @@ protected:
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER> template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
static uint32_t serial_size( static uint32_t serial_size(
const t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member ); const t_RsGenericIdType<
ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member );
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER> template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
static void print_data( static void print_data(
const std::string& name, const std::string& name,
const t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member ); const t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member );
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
static bool to_JSON(
const std::string& membername,
const t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member,
RsJson& jVal );
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
static bool from_JSON(
const std::string& memberName,
t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member,
RsJson& jDoc );
//============================================================================//
// t_RsTlvList<...> declarations //
//============================================================================//
template<class TLV_CLASS,uint32_t TLV_TYPE> template<class TLV_CLASS,uint32_t TLV_TYPE>
static bool serialize( static bool serialize(
@ -491,16 +793,33 @@ protected:
static void print_data( static void print_data(
const std::string& name, const std::string& name,
const t_RsTlvList<TLV_CLASS,TLV_TYPE>& member); const t_RsTlvList<TLV_CLASS,TLV_TYPE>& member);
template<class TLV_CLASS,uint32_t TLV_TYPE>
static bool to_JSON( const std::string& membername,
const t_RsTlvList<TLV_CLASS,TLV_TYPE>& member,
RsJson& jVal );
template<class TLV_CLASS,uint32_t TLV_TYPE>
static bool from_JSON( const std::string& memberName,
t_RsTlvList<TLV_CLASS,TLV_TYPE>& member,
RsJson& jDoc );
}; };
//============================================================================//
// t_RsGenericId<...> //
//============================================================================//
// t_RsGenericId<>
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER> template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
bool RsTypeSerializer::serialize ( bool RsTypeSerializer::serialize (
uint8_t data[], uint32_t size, uint32_t &offset, uint8_t data[], uint32_t size, uint32_t &offset,
const t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member ) const t_RsGenericIdType<
{ return (*const_cast<const t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER> *>(&member)).serialise(data,size,offset); } ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member )
{
return (*const_cast<const t_RsGenericIdType<
ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER> *>(&member)
).serialise(data,size,offset);
}
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER> template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
bool RsTypeSerializer::deserialize( bool RsTypeSerializer::deserialize(
@ -522,8 +841,45 @@ void RsTypeSerializer::print_data(
<< member << std::endl; << member << std::endl;
} }
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
bool RsTypeSerializer::to_JSON( const std::string& memberName,
const t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member,
RsJson& jDoc )
{
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator();
rapidjson::Value key;
key.SetString(memberName.c_str(), memberName.length(), allocator);
const std::string vStr = member.toStdString();
rapidjson::Value value;
value.SetString(vStr.c_str(), vStr.length(), allocator);
jDoc.AddMember(key, value, allocator);
return true;
}
template<uint32_t ID_SIZE_IN_BYTES,bool UPPER_CASE,uint32_t UNIQUE_IDENTIFIER>
bool RsTypeSerializer::from_JSON( const std::string& membername,
t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>& member,
RsJson& jVal )
{
const char* mName = membername.c_str();
bool ret = jVal.HasMember(mName);
if(ret)
{
rapidjson::Value& v = jVal[mName];
ret = ret && v.IsString();
if(ret) member = t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>(std::string(v.GetString()));
}
return ret;
}
//============================================================================//
// t_RsTlvList<...> //
//============================================================================//
// t_RsTlvList<>
template<class TLV_CLASS,uint32_t TLV_TYPE> template<class TLV_CLASS,uint32_t TLV_TYPE>
bool RsTypeSerializer::serialize( bool RsTypeSerializer::serialize(
uint8_t data[], uint32_t size, uint32_t &offset, uint8_t data[], uint32_t size, uint32_t &offset,
@ -553,3 +909,86 @@ void RsTypeSerializer::print_data(
std::cerr << " [t_RsTlvString<" << std::hex << TLV_TYPE << ">] : size=" std::cerr << " [t_RsTlvString<" << std::hex << TLV_TYPE << ">] : size="
<< member.mList.size() << std::endl; << member.mList.size() << std::endl;
} }
template<class TLV_CLASS,uint32_t TLV_TYPE> /* static */
bool RsTypeSerializer::to_JSON( const std::string& memberName,
const t_RsTlvList<TLV_CLASS,TLV_TYPE>& member,
RsJson& jDoc )
{
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator();
rapidjson::Value key;
key.SetString(memberName.c_str(), memberName.length(), allocator);
rapidjson::Value value;
const char* tName = typeid(member).name();
value.SetString(tName, allocator);
jDoc.AddMember(key, value, allocator);
std::cerr << __PRETTY_FUNCTION__ << " JSON serialization for type "
<< typeid(member).name() << " " << memberName
<< " not available." << std::endl;
print_stacktrace();
return true;
}
template<class TLV_CLASS,uint32_t TLV_TYPE>
bool RsTypeSerializer::from_JSON( const std::string& memberName,
t_RsTlvList<TLV_CLASS,TLV_TYPE>& member,
RsJson& /*jVal*/ )
{
std::cerr << __PRETTY_FUNCTION__ << " JSON deserialization for type "
<< typeid(member).name() << " " << memberName
<< " not available." << std::endl;
print_stacktrace();
return true;
}
//============================================================================//
// Not implemented types macros //
//============================================================================//
/**
* @def RS_TYPE_SERIALIZER_TO_JSON_NOT_IMPLEMENTED_DEF(T)
* @def RS_TYPE_SERIALIZER_FROM_JSON_NOT_IMPLEMENTED_DEF(T)
* Helper macros for types that has not yet implemented to/from JSON
* should be deleted from the code as soon as they are not needed anymore
*/
#define RS_TYPE_SERIALIZER_TO_JSON_NOT_IMPLEMENTED_DEF(T) \
template<> /*static*/ \
bool RsTypeSerializer::to_JSON(const std::string& memberName, T const& member, \
RsJson& jDoc ) \
{ \
rapidjson::Document::AllocatorType& allocator = jDoc.GetAllocator(); \
\
rapidjson::Value key; \
key.SetString(memberName.c_str(), memberName.length(), allocator); \
\
rapidjson::Value value; \
const char* tName = typeid(member).name(); \
value.SetString(tName, allocator); \
\
jDoc.AddMember(key, value, allocator); \
\
std::cerr << __FILE__ << __LINE__ << __PRETTY_FUNCTION__ \
<< " JSON serialization for type " \
<< typeid(member).name() << " " << memberName \
<< " not available." << std::endl; \
print_stacktrace(); \
return true; \
}
#define RS_TYPE_SERIALIZER_FROM_JSON_NOT_IMPLEMENTED_DEF(T) \
template<> /*static*/ \
bool RsTypeSerializer::from_JSON( const std::string& memberName, \
T& member, RsJson& /*jDoc*/ ) \
{ \
std::cerr << __FILE__ << __LINE__ << __PRETTY_FUNCTION__ \
<< " JSON deserialization for type " \
<< typeid(member).name() << " " << memberName \
<< " not available." << std::endl; \
print_stacktrace(); \
return true; \
}

35
libretroshare/src/services/p3idservice.cc
View File

@ -3,7 +3,8 @@
* *
* Id interface for RetroShare. * Id interface for RetroShare.
* *
* Copyright 2012-2012 by Robert Fernie. * Copyright (C) 2012 Robert Fernie
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -4505,11 +4506,30 @@ void p3IdService::handle_event(uint32_t event_type, const std::string &/*elabel*
} }
} }
RsIdentityUsage::RsIdentityUsage(uint16_t service,const RsIdentityUsage::UsageCode& code,const RsGxsGroupId& gid,const RsGxsMessageId& mid,uint64_t additional_id,const std::string& comment) void RsGxsIdGroup::serial_process(
: mServiceId(service), mUsageCode(code), mGrpId(gid), mMsgId(mid),mAdditionalId(additional_id),mComment(comment) RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
RS_SERIAL_PROCESS(mMeta);
RS_SERIAL_PROCESS(mPgpIdHash);
//RS_SERIAL_PROCESS(mPgpIdSign);
RS_SERIAL_PROCESS(mRecognTags);
//RS_SERIAL_PROCESS(mImage);
RS_SERIAL_PROCESS(mLastUsageTS);
RS_SERIAL_PROCESS(mPgpKnown);
RS_SERIAL_PROCESS(mIsAContact);
RS_SERIAL_PROCESS(mPgpId);
RS_SERIAL_PROCESS(mReputation);
}
RsIdentityUsage::RsIdentityUsage(
uint16_t service, const RsIdentityUsage::UsageCode& code,
const RsGxsGroupId& gid, const RsGxsMessageId& mid,
uint64_t additional_id,const std::string& comment ) :
mServiceId(service), mUsageCode(code), mGrpId(gid), mMsgId(mid),
mAdditionalId(additional_id), mComment(comment)
{ {
#ifdef DEBUG_IDS #ifdef DEBUG_IDS
// This is a hack, since it will hash also mHash, but because it is initialized to 0, and only computed in the constructor here, it should be ok.
std::cerr << "New identity usage: " << std::endl; std::cerr << "New identity usage: " << std::endl;
std::cerr << " service=" << std::hex << service << std::endl; std::cerr << " service=" << std::hex << service << std::endl;
std::cerr << " code =" << std::hex << code << std::endl; std::cerr << " code =" << std::hex << code << std::endl;
@ -4519,6 +4539,9 @@ RsIdentityUsage::RsIdentityUsage(uint16_t service,const RsIdentityUsage::UsageCo
std::cerr << " commnt =\"" << std::hex << comment << "\"" << std::endl; std::cerr << " commnt =\"" << std::hex << comment << "\"" << std::endl;
#endif #endif
/* This is a hack, since it will hash also mHash, but because it is
* initialized to 0, and only computed in the constructor here, it should
* be ok. */
librs::crypto::HashStream hs(librs::crypto::HashStream::SHA1) ; librs::crypto::HashStream hs(librs::crypto::HashStream::SHA1) ;
hs << (uint32_t)service ; hs << (uint32_t)service ;
@ -4535,5 +4558,5 @@ RsIdentityUsage::RsIdentityUsage(uint16_t service,const RsIdentityUsage::UsageCo
#endif #endif
} }
RsIdentityUsage::RsIdentityUsage() :
mServiceId(0), mUsageCode(UNKNOWN_USAGE), mAdditionalId(0) {}

6
libretroshare/src/turtle/rsturtleitem.cc
View File

@ -140,6 +140,9 @@ template<> void RsTypeSerializer::print_data(const std::string& n, const RsRegul
std::cerr << " [RegExpr ] " << n << ", tokens=" << expr._tokens.size() << " ints=" << expr._ints.size() << " strings=" << expr._strings.size() << std::endl; std::cerr << " [RegExpr ] " << n << ", tokens=" << expr._tokens.size() << " ints=" << expr._ints.size() << " strings=" << expr._strings.size() << std::endl;
} }
RS_TYPE_SERIALIZER_TO_JSON_NOT_IMPLEMENTED_DEF(RsRegularExpression::LinearizedExpression)
RS_TYPE_SERIALIZER_FROM_JSON_NOT_IMPLEMENTED_DEF(RsRegularExpression::LinearizedExpression)
void RsTurtleSearchResultItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) void RsTurtleSearchResultItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
{ {
RsTypeSerializer::serial_process<uint32_t>(j,ctx,request_id,"request_id") ; RsTypeSerializer::serial_process<uint32_t>(j,ctx,request_id,"request_id") ;
@ -193,6 +196,9 @@ template<> void RsTypeSerializer::print_data(const std::string& n, const TurtleF
std::cerr << " [FileInfo ] " << n << " size=" << i.size << " hash=" << i.hash << ", name=" << i.name << std::endl; std::cerr << " [FileInfo ] " << n << " size=" << i.size << " hash=" << i.hash << ", name=" << i.name << std::endl;
} }
RS_TYPE_SERIALIZER_TO_JSON_NOT_IMPLEMENTED_DEF(TurtleFileInfo)
RS_TYPE_SERIALIZER_FROM_JSON_NOT_IMPLEMENTED_DEF(TurtleFileInfo)
void RsTurtleOpenTunnelItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) void RsTurtleOpenTunnelItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
{ {
RsTypeSerializer::serial_process (j,ctx,file_hash ,"file_hash") ; RsTypeSerializer::serial_process (j,ctx,file_hash ,"file_hash") ;

2
libretroshare/src/turtle/turtleclientservice.h
View File

@ -36,7 +36,7 @@
#include <serialiser/rsserial.h> #include <serialiser/rsserial.h>
#include <turtle/rsturtleitem.h> #include <turtle/rsturtleitem.h>
class RsItem ; struct RsItem;
class p3turtle ; class p3turtle ;
class RsTurtleClientService class RsTurtleClientService

2
tests/librssimulator/testing/IsolatedServiceTester.h
View File

@ -4,7 +4,7 @@
#include "retroshare/rsids.h" #include "retroshare/rsids.h"
#include "pqi/p3linkmgr.h" #include "pqi/p3linkmgr.h"
class RsItem; struct RsItem;
class PeerNode; class PeerNode;
class RsSerialType; class RsSerialType;
class RsSerialiser; class RsSerialiser;

2
tests/librssimulator/testing/SetFilter.h
View File

@ -4,7 +4,7 @@
#include "retroshare/rsids.h" #include "retroshare/rsids.h"
#include "SetPacket.h" #include "SetPacket.h"
class RsItem; struct RsItem;
class SetFilter class SetFilter
{ {

2
tests/librssimulator/testing/SetPacket.h
View File

@ -5,7 +5,7 @@
#include <list> #include <list>
#include "retroshare/rsids.h" #include "retroshare/rsids.h"
class RsItem; struct RsItem;
class SetPacket class SetPacket
{ {

2
tests/librssimulator/testing/SetServiceTester.h
View File

@ -8,7 +8,7 @@
#include "SetPacket.h" #include "SetPacket.h"
#include "SetFilter.h" #include "SetFilter.h"
class RsItem; struct RsItem;
class PeerNode; class PeerNode;
class RsSerialType; class RsSerialType;
class RsSerialiser; class RsSerialiser;