michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: Fix removed engine_observer_list usage

Browse source 
`engine_remove_observer_by_path()` was not updated during some recent
LwM2M observer changes, still using the `engine_observer_list` which got
moved into the `lwm2m_context` structure. Update the function to align
with these changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2021-11-02 11:32:26 +01:00 • committed by Carles Cufí
commit 96b8ed85ad
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -577,14 +577,15 @@ char *lwm2m_path_log_strdup(char *buf, struct lwm2m_obj_path *path)
#endif /* CONFIG_LOG */
#if defined(CONFIG_LWM2M_CANCEL_OBSERVE_BY_PATH)
static int engine_remove_observer_by_path(struct lwm2m_obj_path *path)
static int engine_remove_observer_by_path(struct lwm2m_ctx *ctx,
struct lwm2m_obj_path *path)
{
char buf[LWM2M_MAX_PATH_STR_LEN];
struct observe_node *obs, *found_obj = NULL;
sys_snode_t *prev_node = NULL;
/* find the node index */
SYS_SLIST_FOR_EACH_CONTAINER(&engine_observer_list, obs, node) {
SYS_SLIST_FOR_EACH_CONTAINER(&ctx->observer, obs, node) {
if (memcmp(path, &obs->path, sizeof(*path)) == 0) {
found_obj = obs;
break;
@ -599,7 +600,7 @@ static int engine_remove_observer_by_path(struct lwm2m_obj_path *path)
LOG_INF("Removing observer for path %s",
lwm2m_path_log_strdup(buf, path));
sys_slist_remove(&engine_observer_list, prev_node, &found_obj->node);
sys_slist_remove(&ctx->observer, prev_node, &found_obj->node);
(void)memset(found_obj, 0, sizeof(*found_obj));
return 0;
@ -3832,7 +3833,8 @@ static int handle_request(struct coap_packet *request,
r = engine_remove_observer(msg->ctx, token, tkl);
if (r < 0) {
#if defined(CONFIG_LWM2M_CANCEL_OBSERVE_BY_PATH)
r = engine_remove_observer_by_path(&msg->path);
r = engine_remove_observer_by_path(msg->ctx,
&msg->path);
if (r < 0)
#endif /* CONFIG_LWM2M_CANCEL_OBSERVE_BY_PATH */
{