michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: reset obj_inst/res_inst data structure when delete

Browse source 
When a request demands to create a new object instance, it will search
whether the request object instance exists or not. However, current
implementation does not reset the lwm2m_engine_obj_inst at the time it
is deleted. It only removes the object instance from the sys list.

Correct the behavior by resetting both object instance and resource
instances at the time it's deleted. Also, consolidate function
lwm2m_delete_handler() and lwm2m_delete_obj_inst().

To reproduce the issue, try to create light control object instance
(/3301), delete the created instance and create it again. You shall find
following error message dumped.
> [ipso_light_control] [ERR] light_control_create: Can not create
  instance - already existing: 0
> [lib/lwm2m_engine] [ERR] lwm2m_create_obj_inst: unable to create obj -
  3311 instance 0

Signed-off-by: Robert Chou <robert.ch.chou@acer.com>
This commit is contained in:
Robert Chou 2017-09-04 16:59:37 +08:00 • committed by Jukka Rissanen
commit dc0b838641
1 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

42
subsys/net/lib/lwm2m/lwm2m_engine.c
View file

@ -415,6 +415,7 @@ int lwm2m_create_obj_inst(u16_t obj_id, u16_t obj_inst_id,
int lwm2m_delete_obj_inst(u16_t obj_id, u16_t obj_inst_id)
{
int i, ret = 0;
struct lwm2m_engine_obj *obj;
struct lwm2m_engine_obj_inst *obj_inst;
@ -430,11 +431,22 @@ int lwm2m_delete_obj_inst(u16_t obj_id, u16_t obj_inst_id)
engine_unregister_obj_inst(obj_inst);
obj->instance_count--;
if (obj->delete_cb) {
return obj->delete_cb(obj_inst_id);
ret = obj->delete_cb(obj_inst_id);
}
return 0;
/* reset obj_inst and res_inst data structure */
for (i = 0; i < obj_inst->resource_count; i++) {
memset(obj_inst->resources + i, 0,
sizeof(struct lwm2m_engine_res_inst));
}
memset(obj_inst, 0, sizeof(struct lwm2m_engine_obj_inst));
#ifdef CONFIG_LWM2M_RD_CLIENT_SUPPORT
engine_trigger_update();
#endif
return ret;
}
/* utility functions */
@ -1674,32 +1686,12 @@ static int lwm2m_exec_handler(struct lwm2m_engine_obj *obj,
static int lwm2m_delete_handler(struct lwm2m_engine_obj *obj,
struct lwm2m_engine_context *context)
{
struct lwm2m_obj_path *path = context->path;
struct lwm2m_engine_obj_inst *obj_inst;
SYS_LOG_DBG(">> DELETE [path:%u/%u/%u(%u)]",
path->obj_id, path->obj_inst_id, path->res_id, path->level);
if (!obj || !context) {
if (!context) {
return -EINVAL;
}
obj_inst = get_engine_obj_inst(path->obj_id, path->obj_inst_id);
if (!obj_inst) {
return -ENOENT;
}
engine_unregister_obj_inst(obj_inst);
obj->instance_count--;
#ifdef CONFIG_LWM2M_RD_CLIENT_SUPPORT
engine_trigger_update();
#endif
if (obj->delete_cb) {
return obj->delete_cb(path->obj_inst_id);
}
return 0;
return lwm2m_delete_obj_inst(context->path->obj_id,
context->path->obj_inst_id);
}
/*