2019-06-28 09:51:44

by Jakub Witowski

Subject: [PATCH] mesh: Clear nodes queue on get_managed_objects_cb() fails

Currently when the get_managed_objects_cb() fails it frees
the node resources but the node still remains on the "nodes" queue.

This implementation calls node_remove() instead of
free_node_resources()."
---
mesh/node.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mesh/node.c b/mesh/node.c
index 4e35bb3ff..2229aa711 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -1601,7 +1601,7 @@ fail:
} else {
/* Handle failed Join and Create requests */
if (node)
- free_node_resources(node);
+ node_remove(node);

if (req->type == REQUEST_TYPE_JOIN) {
node_join_ready_func_t cb = req->cb;
--
2.20.1

2019-07-01 16:40:59

by Gix, Brian

Subject: Re: [PATCH] mesh: Clear nodes queue on get_managed_objects_cb() fails

Hi Jakub,

I am applying this, but please in the future subject tag your BlueZ mesh patches as [PATCH BlueZ <...>] so that
they are easier to spot.

On Fri, 2019-06-28 at 11:50 +0200, Jakub Witowski wrote:
> Currently when the get_managed_objects_cb() fails it frees
> the node resources but the node still remains on the "nodes" queue.
>
> This implementation calls node_remove() instead of
> free_node_resources()."
> ---
> mesh/node.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mesh/node.c b/mesh/node.c
> index 4e35bb3ff..2229aa711 100644
> --- a/mesh/node.c
> +++ b/mesh/node.c
> @@ -1601,7 +1601,7 @@ fail:
> } else {
> /* Handle failed Join and Create requests */
> if (node)
> - free_node_resources(node);
> + node_remove(node);
>
> if (req->type == REQUEST_TYPE_JOIN) {
> node_join_ready_func_t cb = req->cb;