From: Inga Stotland <inga.stotland@intel.com>
Date: Mon, 22 Apr 2019 04:51:11 +0000 (-0700)
Subject: mesh: Allow only one app attachment per node
X-Git-Tag: accepted/tizen/unified/20191220.123149^2~169
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac46040dc9c95bc848d68207a7431c9da3f9f9fc;p=platform%2Fupstream%2Fbluez.git

mesh: Allow only one app attachment per node

If a node is already attached to an application process,
disallow another appication to attach to the same node.
This means that an Attach() method called with the token
identifying a node that is already in use, returns an error
org.bluez.mesh.Error.AlreadyExists

Change-Id: Ifde6a2c13ed5d0c044086c58bbb5013fe9f8eb59
Signed-off-by: Anupam Roy <anupam.r@samsung.com>
---

diff --git a/doc/mesh-api.txt b/doc/mesh-api.txt
index 0b341a0..0fc0896 100644
--- a/doc/mesh-api.txt
+++ b/doc/mesh-api.txt
@@ -98,6 +98,7 @@ Methods:
 		PossibleErrors:
 			org.bluez.mesh.Error.InvalidArguments
 			org.bluez.mesh.Error.NotFound,
+			org.bluez.mesh.Error.AlreadyExists,
 			org.bluez.mesh.Error.Failed
 
 	void Leave(uint64 token)
diff --git a/mesh/node.c b/mesh/node.c
index dae9a4b..820aeb4 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -1146,9 +1146,13 @@ int node_attach(const char *app_path, const char *sender, uint64_t token,
 	if (!node)
 		return MESH_ERROR_NOT_FOUND;
 
-	/* TODO: decide what to do if previous node->app_path is not NULL */
-	node->app_path = l_strdup(app_path);
+	/* Check if the node is already in use */
+	if (node->owner) {
+		l_warn("The node is already in use");
+		return MESH_ERROR_ALREADY_EXISTS;
+	}
 
+	node->app_path = l_strdup(app_path);
 	node->owner = l_strdup(sender);
 
 	req = l_new(struct attach_obj_request, 1);