summaryrefslogtreecommitdiff
path: root/mesh/manager.c
diff options
context:
space:
mode:
authorInga Stotland <inga.stotland@intel.com>2019-11-08 16:07:00 -0800
committerBrian Gix <brian.gix@intel.com>2019-11-12 09:37:23 -0800
commit5ae38ddb399d051372dc3cbab827c1675abb36e2 (patch)
tree306f4bd25d67e0f562955cc8e4a136c1f4e17fc5 /mesh/manager.c
parent220ab7b8948f480b98f1b498cb94be46cb3ef38c (diff)
downloadbluez-5ae38ddb399d051372dc3cbab827c1675abb36e2.tar.gz
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).
Diffstat (limited to 'mesh/manager.c')
-rw-r--r--mesh/manager.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mesh/manager.c b/mesh/manager.c
index b39ea6ed7..0b11b4541 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -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));