Modify for IoTivity 1.1.1

Change-Id: Idd071a110afdb6006dcff0c6c1a843c75dd8e454
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/src/ic-cbor.c b/src/ic-cbor.c
index 1eb4097..e12bb6c 100644 (file)
--- a/src/ic-cbor.c
+++ b/src/ic-cbor.c
@@ -34,69 +34,86 @@ int icl_cbor_create_svr_db(const char *path)
        int fd;
        int ret;
        const uint8_t cbor_binary[] = {
-               0xa3, 0x63, 0x61, 0x63, 0x6c, 0x59, 0x02, 0x2a, 0xa2, 0x66, 0x61, 0x63, 0x6c, 0x69,
-               0x73, 0x74, 0xa1, 0x64, 0x61, 0x63, 0x65, 0x73, 0x82, 0xa3, 0x6b, 0x73, 0x75, 0x62,
-               0x6a, 0x65, 0x63, 0x74, 0x75, 0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73,
-               0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x87, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x68,
-               0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x72, 0x65, 0x73, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62,
-               0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x66,
-               0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x64, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74,
-               0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x66, 0x2f, 0x6f,
-               0x69, 0x63, 0x2f, 0x70, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62,
-               0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6a, 0x2f, 0x6f, 0x69, 0x63,
-               0x2f, 0x72, 0x65, 0x73, 0x2f, 0x64, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74,
-               0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x70, 0x2f, 0x6f,
-               0x69, 0x63, 0x2f, 0x72, 0x65, 0x73, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x64,
-               0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0xa4,
-               0x64, 0x68, 0x72, 0x65, 0x66, 0x6d, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x70, 0x72, 0x65,
-               0x73, 0x65, 0x6e, 0x63, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60,
-               0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6c, 0x2f, 0x6f, 0x69,
-               0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x76, 0x65, 0x72, 0x63, 0x72, 0x65, 0x6c, 0x60,
-               0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69,
-               0x73, 0x73, 0x69, 0x6f, 0x6e, 0x02, 0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63,
-               0x74, 0x75, 0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-               0x63, 0x65, 0x73, 0x86, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6d, 0x2f, 0x6f, 0x69,
-               0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x64, 0x6f, 0x78, 0x6d, 0x63, 0x72, 0x65, 0x6c,
-               0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65,
-               0x66, 0x6e, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x70, 0x73, 0x74,
-               0x61, 0x74, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66,
-               0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6c, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73,
-               0x65, 0x63, 0x2f, 0x61, 0x63, 0x6c, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74,
-               0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6d, 0x2f, 0x6f,
-               0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x63, 0x72, 0x65, 0x64, 0x63, 0x72, 0x65,
-               0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72,
-               0x65, 0x66, 0x6e, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x70, 0x63,
-               0x6f, 0x6e, 0x66, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69,
-               0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x71, 0x2f, 0x6f, 0x69, 0x63, 0x2f,
-               0x73, 0x65, 0x63, 0x2f, 0x64, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x63, 0x72,
-               0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0x6a, 0x70, 0x65,
-               0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x06, 0x6a, 0x72, 0x6f, 0x77, 0x6e,
-               0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30,
-               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x65, 0x70, 0x73, 0x74, 0x61, 0x74, 0x58, 0x79, 0xa7, 0x64, 0x69, 0x73,
-               0x6f, 0x70, 0xf4, 0x6a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69, 0x64,
-               0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30,
-               0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x6a, 0x72, 0x6f, 0x77,
-               0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d,
-               0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x62, 0x63, 0x6d, 0x02, 0x62, 0x74, 0x6d, 0x00, 0x62, 0x6f, 0x6d,
-               0x03, 0x62, 0x73, 0x6d, 0x03, 0x64, 0x64, 0x6f, 0x78, 0x6d, 0x58, 0xb6, 0xa8, 0x64,
-               0x6f, 0x78, 0x6d, 0x73, 0x81, 0x00, 0x66, 0x6f, 0x78, 0x6d, 0x73, 0x65, 0x6c, 0x00,
-               0x63, 0x73, 0x63, 0x74, 0x01, 0x65, 0x6f, 0x77, 0x6e, 0x65, 0x64, 0xf4, 0x6a, 0x64,
-               0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30,
-               0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x6c, 0x64, 0x65, 0x76, 0x6f, 0x77, 0x6e, 0x65, 0x72,
-               0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30,
-               0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x6a, 0x72, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30,
-               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x63, 0x64, 0x70, 0x63, 0xf5};
+               0xbf, 0x63, 0x61, 0x63, 0x6c, 0x59, 0x03, 0x4f, 0xa4, 0x66, 0x61, 0x63, 0x6c, 0x69, 0x73, 0x74,
+               0xa1, 0x64, 0x61, 0x63, 0x65, 0x73, 0x84, 0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74,
+               0x75, 0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+               0x83, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x68, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x72, 0x65, 0x73,
+               0x62, 0x72, 0x74, 0x81, 0x6a, 0x6f, 0x69, 0x63, 0x2e, 0x77, 0x6b, 0x2e, 0x72, 0x65, 0x73, 0x62,
+               0x69, 0x66, 0x81, 0x69, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x6c, 0x6c, 0x63, 0x72, 0x65,
+               0x6c, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x66, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x64, 0x62,
+               0x72, 0x74, 0x81, 0x68, 0x6f, 0x69, 0x63, 0x2e, 0x77, 0x6b, 0x2e, 0x64, 0x62, 0x69, 0x66, 0x82,
+               0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65,
+               0x68, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x72, 0x63, 0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64,
+               0x68, 0x72, 0x65, 0x66, 0x66, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x72, 0x74, 0x81, 0x68,
+               0x6f, 0x69, 0x63, 0x2e, 0x77, 0x6b, 0x2e, 0x70, 0x62, 0x69, 0x66, 0x82, 0x6f, 0x6f, 0x69, 0x63,
+               0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x68, 0x6f, 0x69, 0x63,
+               0x2e, 0x69, 0x66, 0x2e, 0x72, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69,
+               0x73, 0x73, 0x69, 0x6f, 0x6e, 0x02, 0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x75,
+               0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x84,
+               0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6d, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f,
+               0x64, 0x6f, 0x78, 0x6d, 0x62, 0x72, 0x74, 0x81, 0x6a, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x64,
+               0x6f, 0x78, 0x6d, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62,
+               0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64, 0x68, 0x72,
+               0x65, 0x66, 0x6e, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x70, 0x73, 0x74, 0x61,
+               0x74, 0x62, 0x72, 0x74, 0x81, 0x6b, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x70, 0x73, 0x74, 0x61,
+               0x74, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73,
+               0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66,
+               0x6c, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x61, 0x63, 0x6c, 0x62, 0x72, 0x74,
+               0x81, 0x69, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x61, 0x63, 0x6c, 0x62, 0x69, 0x66, 0x81, 0x6f,
+               0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63,
+               0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6d, 0x2f, 0x6f, 0x69, 0x63, 0x2f,
+               0x73, 0x65, 0x63, 0x2f, 0x63, 0x72, 0x65, 0x64, 0x62, 0x72, 0x74, 0x81, 0x6a, 0x6f, 0x69, 0x63,
+               0x2e, 0x72, 0x2e, 0x63, 0x72, 0x65, 0x64, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e,
+               0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60,
+               0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x06, 0xa3, 0x6b, 0x73, 0x75,
+               0x62, 0x6a, 0x65, 0x63, 0x74, 0x75, 0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f,
+               0x75, 0x72, 0x63, 0x65, 0x73, 0x82, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6e, 0x2f, 0x6f, 0x69,
+               0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x70, 0x63, 0x6f, 0x6e, 0x66, 0x62, 0x72, 0x74, 0x81, 0x6b,
+               0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x70, 0x63, 0x6f, 0x6e, 0x66, 0x62, 0x69, 0x66, 0x81, 0x6f,
+               0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63,
+               0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x71, 0x2f, 0x6f, 0x69, 0x63, 0x2f,
+               0x73, 0x65, 0x63, 0x2f, 0x64, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x62, 0x72, 0x74, 0x81,
+               0x6e, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x64, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x62,
+               0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c,
+               0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+               0x69, 0x6f, 0x6e, 0x06, 0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x75, 0x75, 0x69,
+               0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x81, 0xa4, 0x64,
+               0x68, 0x72, 0x65, 0x66, 0x6c, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x76, 0x65,
+               0x72, 0x62, 0x72, 0x74, 0x81, 0x69, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x76, 0x65, 0x72, 0x62,
+               0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c,
+               0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+               0x69, 0x6f, 0x6e, 0x02, 0x6a, 0x72, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78,
+               0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30,
+               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+               0x30, 0x30, 0x30, 0x30, 0x30, 0x62, 0x72, 0x74, 0x81, 0x69, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e,
+               0x61, 0x63, 0x6c, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62,
+               0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x65, 0x70, 0x73, 0x74, 0x61, 0x74, 0x58, 0x9d, 0xa9,
+               0x64, 0x69, 0x73, 0x6f, 0x70, 0xf4, 0x6a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69,
+               0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30,
+               0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30,
+               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x62, 0x63, 0x6d, 0x02, 0x62, 0x74, 0x6d, 0x00, 0x62,
+               0x6f, 0x6d, 0x03, 0x62, 0x73, 0x6d, 0x03, 0x6a, 0x72, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75,
+               0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30,
+               0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30,
+               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x62, 0x72, 0x74, 0x81, 0x6b, 0x6f, 0x69, 0x63,
+               0x2e, 0x72, 0x2e, 0x70, 0x73, 0x74, 0x61, 0x74, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63,
+               0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x64, 0x64, 0x6f, 0x78,
+               0x6d, 0x58, 0xe9, 0xaa, 0x64, 0x6f, 0x78, 0x6d, 0x73, 0x82, 0x00, 0x01, 0x66, 0x6f, 0x78, 0x6d,
+               0x73, 0x65, 0x6c, 0x00, 0x63, 0x73, 0x63, 0x74, 0x01, 0x65, 0x6f, 0x77, 0x6e, 0x65, 0x64, 0xf4,
+               0x6a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30,
+               0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d,
+               0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+               0x30, 0x6c, 0x64, 0x65, 0x76, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24,
+               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30,
+               0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+               0x30, 0x30, 0x30, 0x30, 0x6a, 0x72, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78,
+               0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30,
+               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+               0x30, 0x30, 0x30, 0x30, 0x30, 0x72, 0x78, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x69, 0x6f, 0x74, 0x69,
+               0x76, 0x69, 0x74, 0x79, 0x2e, 0x64, 0x70, 0x63, 0xf5, 0x62, 0x72, 0x74, 0x81, 0x6a, 0x6f, 0x69,
+               0x63, 0x2e, 0x72, 0x2e, 0x64, 0x6f, 0x78, 0x6d, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63,
+               0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0xff,
+       };
 
        fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, 0660);
        if (fd < 0) {
@@ -123,59 +140,74 @@ int icl_cbor_create_pt_svr_db(const char *path)
        int ret;
        uint8_t uuid[ICL_CBOR_UUID_SIZE];
        char uuid_str[ICL_CBOR_UUID_STR_LEN + 1];
-       const int uuid_points[] = {356, 420, 485, 569, 620, 669};
-       uint8_t cbor_binary[] = {
-               0xbf, 0x63, 0x61, 0x63, 0x6c, 0x59, 0x01, 0x80, 0xa2, 0x66, 0x61, 0x63, 0x6c, 0x69,
-               0x73, 0x74, 0xa1, 0x64, 0x61, 0x63, 0x65, 0x73, 0x82, 0xa3, 0x6b, 0x73, 0x75, 0x62,
-               0x6a, 0x65, 0x63, 0x74, 0x75, 0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73,
-               0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x86, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x68,
-               0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x72, 0x65, 0x73, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62,
-               0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x66,
-               0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x64, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74,
-               0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x66, 0x2f, 0x6f,
-               0x69, 0x63, 0x2f, 0x70, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62,
-               0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x70, 0x2f, 0x6f, 0x69, 0x63,
-               0x2f, 0x72, 0x65, 0x73, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x64, 0x63, 0x72,
-               0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68,
-               0x72, 0x65, 0x66, 0x67, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x61, 0x64, 0x63, 0x72, 0x65,
-               0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72,
-               0x65, 0x66, 0x6e, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x61, 0x6d,
-               0x61, 0x63, 0x6c, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69,
-               0x66, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x02,
-               0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x75, 0x75, 0x69, 0x64, 0x61,
-               0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x82, 0xa4, 0x64,
-               0x68, 0x72, 0x65, 0x66, 0x6d, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f,
-               0x64, 0x6f, 0x78, 0x6d, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x62, 0x72, 0x74, 0x60, 0x62,
-               0x69, 0x66, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6e, 0x2f, 0x6f, 0x69, 0x63,
-               0x2f, 0x73, 0x65, 0x63, 0x2f, 0x70, 0x73, 0x74, 0x61, 0x74, 0x63, 0x72, 0x65, 0x6c,
-               0x60, 0x62, 0x72, 0x74, 0x60, 0x62, 0x69, 0x66, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d,
-               0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x02, 0x6a, 0x72, 0x6f, 0x77, 0x6e, 0x65, 0x72,
-               0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30,
-               0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x65, 0x70, 0x73, 0x74, 0x61, 0x74, 0x58, 0x79, 0xa7, 0x64, 0x69, 0x73, 0x6f, 0x70,
-               0xf5, 0x6a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d,
-               0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x62, 0x63, 0x6d, 0x00, 0x62, 0x74,
-               0x6d, 0x00, 0x62, 0x6f, 0x6d, 0x03, 0x62, 0x73, 0x6d, 0x03, 0x6a, 0x72, 0x6f, 0x77,
-               0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d,
-               0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x64, 0x64, 0x6f, 0x78, 0x6d, 0x58, 0xb6, 0xa8, 0x64, 0x6f, 0x78,
-               0x6d, 0x73, 0x81, 0x00, 0x66, 0x6f, 0x78, 0x6d, 0x73, 0x65, 0x6c, 0x00, 0x63, 0x73,
-               0x63, 0x74, 0x01, 0x65, 0x6f, 0x77, 0x6e, 0x65, 0x64, 0xf5, 0x6a, 0x64, 0x65, 0x76,
-               0x69, 0x63, 0x65, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d,
-               0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x6c, 0x64, 0x65, 0x76, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75,
-               0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30,
-               0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x6a, 0x72,
-               0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30,
-               0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x2d, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-               0x30, 0x30, 0x30, 0x30, 0x30, 0x63, 0x64, 0x70, 0x63, 0xf4, 0xff
+       const int uuid_points[] = {571, 669, 734, 854, 905, 954};
+       static uint8_t cbor_binary[] = {
+               0xbf, 0x63, 0x61, 0x63, 0x6c, 0x59, 0x02, 0x79, 0xa4, 0x66, 0x61, 0x63, 0x6c, 0x69, 0x73, 0x74,
+               0xa1, 0x64, 0x61, 0x63, 0x65, 0x73, 0x83, 0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74,
+               0x75, 0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+               0x83, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x68, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x72, 0x65, 0x73,
+               0x62, 0x72, 0x74, 0x81, 0x6a, 0x6f, 0x69, 0x63, 0x2e, 0x77, 0x6b, 0x2e, 0x72, 0x65, 0x73, 0x62,
+               0x69, 0x66, 0x81, 0x69, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x6c, 0x6c, 0x63, 0x72, 0x65,
+               0x6c, 0x60, 0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x66, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x64, 0x62,
+               0x72, 0x74, 0x81, 0x68, 0x6f, 0x69, 0x63, 0x2e, 0x77, 0x6b, 0x2e, 0x64, 0x62, 0x69, 0x66, 0x82,
+               0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65,
+               0x68, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x72, 0x63, 0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64,
+               0x68, 0x72, 0x65, 0x66, 0x66, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x72, 0x74, 0x81, 0x68,
+               0x6f, 0x69, 0x63, 0x2e, 0x77, 0x6b, 0x2e, 0x70, 0x62, 0x69, 0x66, 0x82, 0x6f, 0x6f, 0x69, 0x63,
+               0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x68, 0x6f, 0x69, 0x63,
+               0x2e, 0x69, 0x66, 0x2e, 0x72, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69,
+               0x73, 0x73, 0x69, 0x6f, 0x6e, 0x02, 0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x75,
+               0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x82,
+               0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6d, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f,
+               0x64, 0x6f, 0x78, 0x6d, 0x62, 0x72, 0x74, 0x81, 0x6a, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x64,
+               0x6f, 0x78, 0x6d, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62,
+               0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64, 0x68, 0x72,
+               0x65, 0x66, 0x6e, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x70, 0x73, 0x74, 0x61,
+               0x74, 0x62, 0x72, 0x74, 0x81, 0x6b, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x70, 0x73, 0x74, 0x61,
+               0x74, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73,
+               0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69,
+               0x73, 0x73, 0x69, 0x6f, 0x6e, 0x02, 0xa3, 0x6b, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x75,
+               0x75, 0x69, 0x64, 0x61, 0x2a, 0x69, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x82,
+               0xa4, 0x64, 0x68, 0x72, 0x65, 0x66, 0x6e, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f,
+               0x70, 0x63, 0x6f, 0x6e, 0x66, 0x62, 0x72, 0x74, 0x81, 0x6b, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e,
+               0x70, 0x63, 0x6f, 0x6e, 0x66, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66,
+               0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x65, 0x6c, 0x60, 0xa4, 0x64,
+               0x68, 0x72, 0x65, 0x66, 0x71, 0x2f, 0x6f, 0x69, 0x63, 0x2f, 0x73, 0x65, 0x63, 0x2f, 0x64, 0x70,
+               0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x62, 0x72, 0x74, 0x81, 0x6e, 0x6f, 0x69, 0x63, 0x2e, 0x72,
+               0x2e, 0x64, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69,
+               0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x65,
+               0x6c, 0x60, 0x6a, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x02, 0x6a, 0x72,
+               0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x36, 0x31, 0x36, 0x34, 0x36,
+               0x64, 0x36, 0x39, 0x2d, 0x36, 0x65, 0x34, 0x34, 0x2d, 0x36, 0x35, 0x37, 0x36, 0x2d, 0x36, 0x39,
+               0x36, 0x33, 0x2d, 0x36, 0x35, 0x35, 0x35, 0x37, 0x35, 0x36, 0x39, 0x36, 0x34, 0x33, 0x30, 0x62,
+               0x72, 0x74, 0x81, 0x69, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x61, 0x63, 0x6c, 0x62, 0x69, 0x66,
+               0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e,
+               0x65, 0x65, 0x70, 0x73, 0x74, 0x61, 0x74, 0x58, 0x9d, 0xa9, 0x64, 0x69, 0x73, 0x6f, 0x70, 0xf5,
+               0x6a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x36, 0x31, 0x36,
+               0x34, 0x36, 0x64, 0x36, 0x39, 0x2d, 0x36, 0x65, 0x34, 0x34, 0x2d, 0x36, 0x35, 0x37, 0x36, 0x2d,
+               0x36, 0x39, 0x36, 0x33, 0x2d, 0x36, 0x35, 0x35, 0x35, 0x37, 0x35, 0x36, 0x39, 0x36, 0x34, 0x33,
+               0x30, 0x62, 0x63, 0x6d, 0x00, 0x62, 0x74, 0x6d, 0x00, 0x62, 0x6f, 0x6d, 0x03, 0x62, 0x73, 0x6d,
+               0x03, 0x6a, 0x72, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x36, 0x31,
+               0x36, 0x34, 0x36, 0x64, 0x36, 0x39, 0x2d, 0x36, 0x65, 0x34, 0x34, 0x2d, 0x36, 0x35, 0x37, 0x36,
+               0x2d, 0x36, 0x39, 0x36, 0x33, 0x2d, 0x36, 0x35, 0x35, 0x35, 0x37, 0x35, 0x36, 0x39, 0x36, 0x34,
+               0x33, 0x30, 0x62, 0x72, 0x74, 0x81, 0x6b, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x70, 0x73, 0x74,
+               0x61, 0x74, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61,
+               0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x64, 0x64, 0x6f, 0x78, 0x6d, 0x58, 0xe8, 0xaa, 0x64, 0x6f,
+               0x78, 0x6d, 0x73, 0x81, 0x00, 0x66, 0x6f, 0x78, 0x6d, 0x73, 0x65, 0x6c, 0x00, 0x63, 0x73, 0x63,
+               0x74, 0x01, 0x65, 0x6f, 0x77, 0x6e, 0x65, 0x64, 0xf5, 0x6a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65,
+               0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x36, 0x31, 0x36, 0x34, 0x36, 0x64, 0x36, 0x39, 0x2d, 0x36,
+               0x65, 0x34, 0x34, 0x2d, 0x36, 0x35, 0x37, 0x36, 0x2d, 0x36, 0x39, 0x36, 0x33, 0x2d, 0x36, 0x35,
+               0x35, 0x35, 0x37, 0x35, 0x36, 0x39, 0x36, 0x34, 0x33, 0x30, 0x6c, 0x64, 0x65, 0x76, 0x6f, 0x77,
+               0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x36, 0x31, 0x36, 0x34, 0x36, 0x64, 0x36,
+               0x39, 0x2d, 0x36, 0x65, 0x34, 0x34, 0x2d, 0x36, 0x35, 0x37, 0x36, 0x2d, 0x36, 0x39, 0x36, 0x33,
+               0x2d, 0x36, 0x35, 0x35, 0x35, 0x37, 0x35, 0x36, 0x39, 0x36, 0x34, 0x33, 0x30, 0x6a, 0x72, 0x6f,
+               0x77, 0x6e, 0x65, 0x72, 0x75, 0x75, 0x69, 0x64, 0x78, 0x24, 0x36, 0x31, 0x36, 0x34, 0x36, 0x64,
+               0x36, 0x39, 0x2d, 0x36, 0x65, 0x34, 0x34, 0x2d, 0x36, 0x35, 0x37, 0x36, 0x2d, 0x36, 0x39, 0x36,
+               0x33, 0x2d, 0x36, 0x35, 0x35, 0x35, 0x37, 0x35, 0x36, 0x39, 0x36, 0x34, 0x33, 0x30, 0x72, 0x78,
+               0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x69, 0x6f, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x64, 0x70,
+               0x63, 0xf4, 0x62, 0x72, 0x74, 0x81, 0x6a, 0x6f, 0x69, 0x63, 0x2e, 0x72, 0x2e, 0x64, 0x6f, 0x78,
+               0x6d, 0x62, 0x69, 0x66, 0x81, 0x6f, 0x6f, 0x69, 0x63, 0x2e, 0x69, 0x66, 0x2e, 0x62, 0x61, 0x73,
+               0x65, 0x6c, 0x69, 0x6e, 0x65, 0xff,
        };
 
        uuid_generate(uuid);

diff --git a/src/ic-ioty-parse.c b/src/ic-ioty-parse.c
index f484802..d563b3c 100644 (file)
--- a/src/ic-ioty-parse.c
+++ b/src/ic-ioty-parse.c
@@ -373,10 +373,11 @@ int ic_ioty_parse_oic_device_payload(OCDevicePayload *payload,
                ERR("strdup(device_name) Fail(%d)", errno);
 
        info->spec_ver = ic_utils_strdup(payload->specVersion);
-       info->data_model_ver = ic_utils_strdup(payload->dataModelVersion);
        info->device_id = ic_utils_strdup(payload->sid);
+       info->data_model_ver = OCCreateString(payload->dataModelVersions);
 
        *device_info = info;
+
        return IOTCON_ERROR_NONE;
 }
 

diff --git a/src/ic-provisioning.c b/src/ic-provisioning.c
index 73700a8..962435a 100644 (file)
--- a/src/ic-provisioning.c
+++ b/src/ic-provisioning.c
@@ -119,6 +119,7 @@ static iotcon_error_e _provisioning_parse_oic_error(OCStackResult ret)
        switch (ret) {
        case OC_STACK_RESOURCE_CREATED:
        case OC_STACK_RESOURCE_DELETED:
+       case OC_STACK_RESOURCE_CHANGED:
                return IOTCON_ERROR_NONE;
        case OC_STACK_AUTHENTICATION_FAILURE:
                return IOTCON_ERROR_AUTHENTICATION_FAILURE;
@@ -985,13 +986,34 @@ static char* _provisioning_parse_uuid(OicUuid_t *uuid)
 }
 
 
+static void _provisioning_ace_add_resource(OicSecAce_t *ace, OicSecRsrc_t *resource)
+{
+       OicSecRsrc_t *current;
+
+       current = ace->resources;
+
+       if (NULL == current) {
+               ace->resources = resource;
+               return;
+       }
+
+       while (current->next)
+               current = current->next;
+
+       current->next = resource;
+}
+
+
 static OicSecAcl_t* _provisioning_convert_acl(iotcon_provisioning_device_h device,
                iotcon_provisioning_acl_h acl)
 {
        int i;
        int permission;
+       int num_of_resources;
        char *uri_path;
        OicSecAcl_t *oic_acl;
+       OicSecAce_t *ace;
+       OicSecRsrc_t *resource;
        OCProvisionDev_t *subject, *oic_device;
 
        oic_acl = calloc(1, sizeof(OicSecAcl_t));
@@ -999,37 +1021,46 @@ static OicSecAcl_t* _provisioning_convert_acl(iotcon_provisioning_device_h devic
                ERR("calloc() Fail(%d)", errno);
                return NULL;
        }
+       ace = calloc(1, sizeof(OicSecAce_t));
+       if (NULL == ace) {
+               ERR("calloc() Fail(%d)", errno);
+               OCDeleteACLList(oic_acl);
+               return NULL;
+       }
+       oic_acl->aces = ace;
 
        subject = icl_provisioning_acl_get_subject(acl);
 
-       memcpy(&oic_acl->subject, &subject->doxm->deviceID, 128/8);
-       memcpy(&oic_acl->rownerID, &subject->doxm->deviceID, sizeof(OicUuid_t));
+       memcpy(&ace->subjectuuid, &subject->doxm->deviceID, 128/8);
 
-       _provisioning_parse_uuid(&oic_acl->subject);
+       _provisioning_parse_uuid(&ace->subjectuuid);
 
-       oic_acl->resourcesLen = icl_provisioning_acl_get_resource_count(acl);
+       num_of_resources = icl_provisioning_acl_get_resource_count(acl);
 
-       oic_acl->resources = calloc(oic_acl->resourcesLen, sizeof(char *));
-       if (NULL == oic_acl->resources) {
-               ERR("calloc() Fail(%d)", errno);
-               OCDeleteACLList(oic_acl);
-               return NULL;
-       }
-       DBG("resource num : %d", oic_acl->resourcesLen);
+       for (i = 0; i < num_of_resources; i++) {
+               resource = calloc(1, sizeof(OicSecRsrc_t));
+               if (NULL == resource) {
+                       ERR("calloc() Fail(%d)", errno);
+                       OCDeleteACLList(oic_acl);
+                       return NULL;
+               }
 
-       for (i = 0; i < oic_acl->resourcesLen; i++) {
                uri_path = icl_provisioning_acl_get_nth_resource(acl, i);
                if (NULL == uri_path) {
                        ERR("icl_provisioning_acl_get_nth_resource() Fail(%d)", errno);
+                       free(resource);
                        OCDeleteACLList(oic_acl);
                        return NULL;
                }
-               oic_acl->resources[i] = ic_utils_strdup(uri_path);
-               DBG("resource : (%s)", oic_acl->resources[i]);
+               resource->href = ic_utils_strdup(uri_path);
+
+               // TODO: resource types & resource interfaces
+
+               _provisioning_ace_add_resource(ace, resource);
        }
 
        permission = icl_provisioning_acl_get_permission(acl);
-       oic_acl->permission = icl_provisioning_acl_convert_permission(permission);
+       ace->permission = icl_provisioning_acl_convert_permission(permission);
 
        oic_device = icl_provisioning_device_get_device(device);