michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: OMA TLV dynamic Resource instance allocation

Browse source 
Integrated dynamic resouce instance allocation to OMA TLV.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
This commit is contained in:
Juha Heiskanen 2022-02-11 07:03:25 -08:00 • committed by Anas Nashif
commit fcbf84b5d7
1 changed files with 5 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

38
subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
View file

@ -807,49 +807,21 @@ static int do_write_op_tlv_item(struct lwm2m_message *msg)
struct lwm2m_engine_res_inst *res_inst = NULL; struct lwm2m_engine_res_inst *res_inst = NULL;
struct lwm2m_engine_obj_field *obj_field = NULL; struct lwm2m_engine_obj_field *obj_field = NULL;
uint8_t created = 0U; uint8_t created = 0U;
int ret, i; int ret;
ret = lwm2m_get_or_create_engine_obj(msg, &obj_inst, &created); ret = lwm2m_get_or_create_engine_obj(msg, &obj_inst, &created);
if (ret < 0) { if (ret < 0) {
goto error; goto error;
} }
obj_field = lwm2m_get_engine_obj_field(obj_inst->obj, ret = lwm2m_engine_validate_write_access(msg, obj_inst, &obj_field);
msg->path.res_id); if (ret < 0) {
if (!obj_field) {
ret = -ENOENT;
goto error; goto error;
} }
if (!LWM2M_HAS_PERM(obj_field, LWM2M_PERM_W) && ret = lwm2m_engine_get_create_res_inst(&msg->path, &res, &res_inst);
!lwm2m_engine_bootstrap_override(msg->ctx, &msg->path)) {
ret = -EPERM;
goto error;
}
if (!obj_inst->resources || obj_inst->resource_count == 0U) { if (ret < 0) {
ret = -EINVAL;
goto error;
}
for (i = 0; i < obj_inst->resource_count; i++) {
if (obj_inst->resources[i].res_id == msg->path.res_id) {
res = &obj_inst->resources[i];
break;
}
}
if (res) {
for (i = 0; i < res->res_inst_count; i++) {
if (res->res_instances[i].res_inst_id ==
msg->path.res_inst_id) {
res_inst = &res->res_instances[i];
break;
}
}
}
if (!res || !res_inst) {
/* if OPTIONAL and BOOTSTRAP-WRITE or CREATE use ENOTSUP */ /* if OPTIONAL and BOOTSTRAP-WRITE or CREATE use ENOTSUP */
if ((msg->ctx->bootstrap_mode || if ((msg->ctx->bootstrap_mode ||
msg->operation == LWM2M_OP_CREATE) && msg->operation == LWM2M_OP_CREATE) &&