Skip to contentSkip to conversation

mesh: Fix clean up after AddNode method

PATCH Applied Inga Stotland 2 participants 2 messages Nov 9, 2019 – Nov 12, 2019 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mesh: Fix clean up after AddNode method

This fixes the cleanup routine that is called after AddNode method on org.bluez.mesh.Manager1 interface is complete: do not remove the agent associated with the Provisioner (owner of Manager interface).

---
 mesh/manager.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mesh/manager.c +1 -3
index b39ea6ed7..0b11b4541 100644
@@ -80,8 +80,6 @@ static void free_pending_add_call()
 		l_dbus_remove_watch(dbus_get_bus(),
 						add_pending->disc_watch);
 
-	mesh_agent_remove(add_pending->agent);
-
 	l_free(add_pending);
 	add_pending = NULL;
 }
@@ -246,7 +244,7 @@ static struct l_dbus_message *add_node_call(struct l_dbus *dbus,
 	add_pending = l_new(struct add_data, 1);
 	memcpy(add_pending->uuid, uuid, 16);
 	add_pending->node = node;
-	add_pending->agent = node_get_agent(node);;
+	add_pending->agent = node_get_agent(node);
 
 	if (!node_is_provisioner(node) || (add_pending->agent == NULL)) {
 		l_info("Provisioner: %d", node_is_provisioner(node));
Signature · 1 line
2.21.0
Applied
#1 lore raw

Applied, Thanks

Quoted 29 lines · Inga Stotland

This fixes the cleanup routine that is called after AddNode method on org.bluez.mesh.Manager1 interface is complete: do not remove the agent associated with the Provisioner (owner of Manager interface).

---
 mesh/manager.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mesh/manager.c +1 -3
index b39ea6ed7..0b11b4541 100644
@@ -80,8 +80,6 @@ static void free_pending_add_call()
 		l_dbus_remove_watch(dbus_get_bus(),
 						add_pending->disc_watch);
 
-	mesh_agent_remove(add_pending->agent);
-
 	l_free(add_pending);
 	add_pending = NULL;
 }
@@ -246,7 +244,7 @@ static struct l_dbus_message *add_node_call(struct l_dbus *dbus,
 	add_pending = l_new(struct add_data, 1);
 	memcpy(add_pending->uuid, uuid, 16);
 	add_pending->node = node;
-	add_pending->agent = node_get_agent(node);;
+	add_pending->agent = node_get_agent(node);
 
 	if (!node_is_provisioner(node) || (add_pending->agent == NULL)) {
 		l_info("Provisioner: %d", node_is_provisioner(node));