michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix senml cbor object link encoding

Browse source 
use text format instead of tlv format

Signed-off-by: Pascal Brogle <pascal.brogle@husqvarnagroup.com>
This commit is contained in:
Pascal Brogle 2022-11-24 14:38:04 +01:00 • committed by Carles Cufí
commit 60bf310aae
2 changed files with 57 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

44
subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
View file

@ -46,6 +46,13 @@ struct cbor_out_fmt_data {
/* Basetime for Cached data timestamp */ /* Basetime for Cached data timestamp */
time_t basetime; time_t basetime;
/* Storage for object links */
struct {
char objlnk[CONFIG_LWM2M_RW_SENML_CBOR_RECORDS][sizeof("65535:65535")];
size_t objlnk_sz; /* Object link buff size */
uint8_t objlnk_cnt;
};
}; };
struct cbor_in_fmt_data { struct cbor_in_fmt_data {
@ -88,6 +95,7 @@ static void setup_out_fmt_data(struct lwm2m_message *msg)
engine_set_out_user_data(&msg->out, fd); engine_set_out_user_data(&msg->out, fd);
fd->name_sz = sizeof("/65535/999/"); fd->name_sz = sizeof("/65535/999/");
fd->basetime = 0; fd->basetime = 0;
fd->objlnk_sz = sizeof("65535:65535");
} }
static void clear_out_fmt_data(struct lwm2m_message *msg) static void clear_out_fmt_data(struct lwm2m_message *msg)
@ -117,6 +125,7 @@ static void clear_in_fmt_data(struct lwm2m_message *msg)
static int fmt_range_check(struct cbor_out_fmt_data *fd) static int fmt_range_check(struct cbor_out_fmt_data *fd)
{ {
if (fd->name_cnt >= CONFIG_LWM2M_RW_SENML_CBOR_RECORDS || if (fd->name_cnt >= CONFIG_LWM2M_RW_SENML_CBOR_RECORDS ||
fd->objlnk_cnt >= CONFIG_LWM2M_RW_SENML_CBOR_RECORDS ||
fd->input._lwm2m_senml__record_count >= CONFIG_LWM2M_RW_SENML_CBOR_RECORDS) { fd->input._lwm2m_senml__record_count >= CONFIG_LWM2M_RW_SENML_CBOR_RECORDS) {
LOG_ERR("CONFIG_LWM2M_RW_SENML_CBOR_RECORDS too small"); LOG_ERR("CONFIG_LWM2M_RW_SENML_CBOR_RECORDS too small");
return -ENOMEM; return -ENOMEM;
@ -482,9 +491,40 @@ static int put_opaque(struct lwm2m_output_context *out, struct lwm2m_obj_path *p
static int put_objlnk(struct lwm2m_output_context *out, struct lwm2m_obj_path *path, static int put_objlnk(struct lwm2m_output_context *out, struct lwm2m_obj_path *path,
struct lwm2m_objlnk *value) struct lwm2m_objlnk *value)
{ {
int32_t value_s32 = (value->obj_id << 16) | value->obj_inst; int ret = 0;
struct cbor_out_fmt_data *fd = LWM2M_OFD_CBOR(out);
return put_s32(out, path, value_s32); ret = fmt_range_check(fd);
if (ret < 0) {
return ret;
}
/* Format object link */
int objlnk_idx = fd->objlnk_cnt;
char *objlink_buf = fd->objlnk[objlnk_idx];
int objlnk_len =
snprintk(objlink_buf, fd->objlnk_sz, "%u:%u", value->obj_id, value->obj_inst);
if (objlnk_len < 0) {
return -EINVAL;
}
ret = put_name_nth_ri(out, path);
if (ret < 0) {
return ret;
}
struct record *record = CONSUME_CBOR_FD_REC(LWM2M_OFD_CBOR(out));
/* Write the value */
record->_record_union._record_union_choice = _union_vlo;
record->_record_union._union_vlo.value = objlink_buf;
record->_record_union._union_vlo.len = objlnk_len;
record->_record_union_present = 1;
fd->objlnk_cnt++;
return 0;
} }
static int get_opaque(struct lwm2m_input_context *in, static int get_opaque(struct lwm2m_input_context *in,

25
tests/net/lib/lwm2m/content_senml_cbor/src/main.c
View file

@ -791,10 +791,12 @@ ZTEST(net_content_senml_cbor, test_put_objlnk)
(0x00 << 5) | 0, (0x00 << 5) | 0,
(0x03 << 5) | 1, (0x03 << 5) | 1,
'7', '7',
(0x00 << 5) | 2, (0x03 << 5) | 3,
(0x00 << 5) | 0 'v', 'l', 'o',
(0x03 << 5) | 3,
'0', ':', '0',
}, },
.len = 18 .len = 24
}, },
{ {
.data = { .data = {
@ -806,11 +808,12 @@ ZTEST(net_content_senml_cbor, test_put_objlnk)
(0x00 << 5) | 0, (0x00 << 5) | 0,
(0x03 << 5) | 1, (0x03 << 5) | 1,
'7', '7',
(0x00 << 5) | 2, (0x03 << 5) | 3,
(0x00 << 5) | 26, 'v', 'l', 'o',
0, 1, 0, 2 (0x03 << 5) | 3,
'1', ':', '2',
}, },
.len = 22 .len = 24
}, },
{ {
.data = { .data = {
@ -822,10 +825,12 @@ ZTEST(net_content_senml_cbor, test_put_objlnk)
(0x00 << 5) | 0, (0x00 << 5) | 0,
(0x03 << 5) | 1, (0x03 << 5) | 1,
'7', '7',
(0x00 << 5) | 2, (0x03 << 5) | 3,
(0x01 << 5) | 0, 'v', 'l', 'o',
(0x03 << 5) | 11,
'6', '5', '5', '3', '5', ':', '6', '5', '5', '3', '5',
}, },
.len = 18 .len = 32
}, },
}; };