From d304c7fea6bae3dc59f04d0787cf41146257d1a7 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 12 Sep 2015 09:37:36 -0400 Subject: [PATCH] fixed bug in deserialisation causing the wrong method to be called --- libretroshare/src/serialiser/rsnxsitems.cc | 4 +++- libretroshare/src/serialiser/rsnxsitems.h | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/serialiser/rsnxsitems.cc b/libretroshare/src/serialiser/rsnxsitems.cc index 5b20e204f..9e2498326 100644 --- a/libretroshare/src/serialiser/rsnxsitems.cc +++ b/libretroshare/src/serialiser/rsnxsitems.cc @@ -11,8 +11,10 @@ const uint8_t RsNxsSyncGrpItem::FLAG_RESPONSE = 0x002; const uint8_t RsNxsSyncMsgItem::FLAG_REQUEST = 0x001; const uint8_t RsNxsSyncMsgItem::FLAG_RESPONSE = 0x002; +#ifdef UNUSED_CODE const uint8_t RsNxsSyncGrpItem::FLAG_USE_SYNC_HASH = 0x001; const uint8_t RsNxsSyncMsgItem::FLAG_USE_SYNC_HASH = 0x001; +#endif /** transaction state **/ const uint16_t RsNxsTransacItem::FLAG_BEGIN_P1 = 0x0001; @@ -68,7 +70,7 @@ RsItem* RsNxsSerialiser::deserialise(void *data, uint32_t *size) case RS_PKT_SUBTYPE_NXS_SYNC_GRP_REQ_ITEM: return deserialNxsSyncGrpReqItem(data, size); case RS_PKT_SUBTYPE_NXS_SYNC_GRP_ITEM: return deserialNxsSyncGrpItem(data, size); - case RS_PKT_SUBTYPE_NXS_SYNC_MSG_REQ_ITEM: return deserialNxsSyncMsgItem(data, size); + case RS_PKT_SUBTYPE_NXS_SYNC_MSG_REQ_ITEM: return deserialNxsSyncMsgReqItem(data, size); case RS_PKT_SUBTYPE_NXS_SYNC_MSG_ITEM: return deserialNxsSyncMsgItem(data, size); case RS_PKT_SUBTYPE_NXS_GRP_ITEM: return deserialNxsGrpItem(data, size); case RS_PKT_SUBTYPE_NXS_MSG_ITEM: return deserialNxsMsgItem(data, size); diff --git a/libretroshare/src/serialiser/rsnxsitems.h b/libretroshare/src/serialiser/rsnxsitems.h index b9ac0ac55..0d8670498 100644 --- a/libretroshare/src/serialiser/rsnxsitems.h +++ b/libretroshare/src/serialiser/rsnxsitems.h @@ -195,7 +195,9 @@ public: static const uint8_t FLAG_REQUEST; static const uint8_t FLAG_RESPONSE; +#ifdef UNUSED_CODE static const uint8_t FLAG_USE_SYNC_HASH; +#endif RsNxsSyncGrpItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_GRP_ITEM) { clear(); return ; } virtual ~RsNxsSyncGrpItem() { return; } @@ -313,8 +315,10 @@ class RsNxsSyncMsgReqItem : public RsNxsItem { public: - + +#ifdef UNUSED_CODE static const uint8_t FLAG_USE_SYNC_HASH; +#endif RsNxsSyncMsgReqItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_MSG_REQ_ITEM) { clear(); return; }