diff --git a/libretroshare/src/serialiser/Makefile b/libretroshare/src/serialiser/Makefile index 47c154144..e2abd4044 100644 --- a/libretroshare/src/serialiser/Makefile +++ b/libretroshare/src/serialiser/Makefile @@ -11,10 +11,10 @@ RSOBJ = rsserial.o rsbaseserial.o rstlvbase.o rstlvtypes.o rsbaseitems.o RSOBJ += rstlvfileitem.o rstlvutil.o TESTOBJ = tlvbase_test.o tlvbase_test2.o tlvfileitem_test.o -TESTOBJ += tlvitems_test.o tlvstack_test.o +TESTOBJ += tlvitems_test.o tlvstack_test.o tlvconfig_test.o TESTS = tlvbase_test tlvbase_test2 tlvfileitem_test -TESTS += tlvitems_test tlvstack_test +TESTS += tlvitems_test tlvstack_test tlvconfig_test all: librs tests @@ -33,6 +33,11 @@ tlvitems_test : tlvitems_test.o tlvstack_test : tlvstack_test.o $(CC) $(CFLAGS) -o tlvstack_test tlvstack_test.o $(OBJ) $(LIBS) +tlvconfig_test : tlvconfig_test.o + $(CC) $(CFLAGS) -o tlvconfig_test tlvconfig_test.o $(OBJ) $(LIBS) + + + ############################################################### diff --git a/libretroshare/src/serialiser/rstlvbase.h b/libretroshare/src/serialiser/rstlvbase.h index 6a4ad105c..214d4fa94 100644 --- a/libretroshare/src/serialiser/rstlvbase.h +++ b/libretroshare/src/serialiser/rstlvbase.h @@ -78,6 +78,7 @@ const uint16_t TLV_TYPE_UINT32_SIZE = 0x0010; const uint16_t TLV_TYPE_UINT32_POP = 0x0011; const uint16_t TLV_TYPE_UINT32_AGE = 0x0012; const uint16_t TLV_TYPE_UINT32_OFFSET = 0x0013; +const uint16_t TLV_TYPE_UINT32_SERID = 0x0014; const uint16_t TLV_TYPE_STR_HASH = 0x0020; const uint16_t TLV_TYPE_STR_NAME = 0x0021; diff --git a/libretroshare/src/serialiser/rstlvtypes.h b/libretroshare/src/serialiser/rstlvtypes.h index baa0be0fc..400293f7f 100644 --- a/libretroshare/src/serialiser/rstlvtypes.h +++ b/libretroshare/src/serialiser/rstlvtypes.h @@ -156,7 +156,7 @@ virtual bool SetTlv(void *data, uint32_t size, uint32_t *offset); /* seriali virtual bool GetTlv(void *data, uint32_t size, uint32_t *offset); /* deserialise */ virtual std::ostream &print(std::ostream &out, uint16_t indent); - std::list ids; /* Mandatory */ + std::list ids; /* Mandatory */ }; diff --git a/libretroshare/src/serialiser/tlvconfig_test.cc b/libretroshare/src/serialiser/tlvconfig_test.cc index 50c0704b5..5bb962c11 100755 --- a/libretroshare/src/serialiser/tlvconfig_test.cc +++ b/libretroshare/src/serialiser/tlvconfig_test.cc @@ -7,9 +7,9 @@ #include #include -#include "rstlvtypes.h" -#include "rstlvutil.h" -#include "utest.h" +#include "serialiser/rstlvtypes.h" +#include "serialiser/rstlvutil.h" +#include "util/utest.h" INITTEST();