mesh: Add api to release node dbus resources

Currently, there is no way to release the node
and attach it back without disconnection of
dbus client. It is possible that dbus client
is owner of multiple mesh nodes and it intends
to stop using one or multiple nodes & re-attach
them back without disconnecting from dbus.

This patch introduces a Release API through which
dbus client can request to release the node's
dbus resources. dbus client can attach the node
after releasing it at any point of time.

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

diff --git a/doc/mesh-api.txt b/doc/mesh-api.txt
index 24cface22cac41b99f83b3b38d677bf334955967..e71cf784d62eb5eb3750a632dbdc00ba517537b3 100644 (file)
--- a/doc/mesh-api.txt
+++ b/doc/mesh-api.txt
@@ -127,6 +127,18 @@ Methods:
                PossibleErrors:
                        org.bluez.mesh.Error.InvalidArguments
 
+       void Release(uint64 token)
+
+               This removes the dbus resources of the mesh node
+               identified by the 64-bit token parameter. The token parameter
+               has been obtained as a result of successful Join() method call.
+               The mesh node whose dbus resources are removed can be attached back to
+               network by Attach() call.
+
+               PossibleErrors:
+                       org.bluez.mesh.Error.InvalidArguments,
+                       org.bluez.mesh.Error.NotFound
+
        void CreateNetwork(object app_root, array{byte}[16] uuid)
 
                This is the first method that an application calls to become

diff --git a/mesh/mesh.c b/mesh/mesh.c
index c1eeeaa8cb9e4cfd5daf757722d7daeb92eefae7..c744ddf525c322fa7f88131cbf30bdcd45a49813 100644 (file)
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -665,6 +665,29 @@ static struct l_dbus_message *leave_call(struct l_dbus *dbus,
        return l_dbus_message_new_method_return(msg);
 }
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+static struct l_dbus_message *release_call(struct l_dbus *dbus,
+                                               struct l_dbus_message *msg,
+                                               void *user_data)
+{
+       uint64_t token;
+       struct mesh_node *node;
+
+       l_debug("Release");
+
+       if (!l_dbus_message_get_arguments(msg, "t", &token))
+               return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
+
+       node = node_find_by_token(token);
+
+       if (!node)
+               return dbus_error(msg, MESH_ERROR_NOT_FOUND, NULL);
+
+       node_release_resources(node);
+       return l_dbus_message_new_method_return(msg);
+}
+#endif
+
 static void create_join_complete_reply_cb(struct l_dbus_message *message,
                                                                void *user_data)
 {
@@ -848,6 +871,11 @@ static void setup_network_interface(struct l_dbus_interface *iface)
        l_dbus_interface_method(iface, "Leave", 0, leave_call, "", "t",
                                                                "token");
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       l_dbus_interface_method(iface, "Release", 0, release_call, "", "t",
+                                                               "token");
+#endif
+
        l_dbus_interface_method(iface, "CreateNetwork", 0, create_network_call,
                                        "", "oay", "app", "uuid");
 

diff --git a/mesh/node.c b/mesh/node.c
index 66b9c41b0661a5d85aee1585f5ea59b4d419beae..cd3dd78bcdaeb0948337102b5c890b782507797f 100644 (file)
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -340,6 +340,22 @@ static void free_node_resources(void *data)
        l_free(node);
 }
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+/*
+ * This function is called to free resources
+ */
+void node_release_resources(struct mesh_node *node)
+{
+       if (!node)
+               return;
+
+       /* Free dynamic resources */
+       free_node_dbus_resources(node);
+
+       l_debug("Node DBUS Resources are removed");
+}
+#endif
+
 /*
  * This function is called to free resources and remove the
  * configuration files for the specified node.

diff --git a/mesh/node.h b/mesh/node.h
index 290681e28f0ec6b6fd8a74ba0da4754e90501f7b..7a51205e25fe2d28bcdb0e8a82471bf8f645ba2b 100644 (file)
--- a/mesh/node.h
+++ b/mesh/node.h
@@ -31,6 +31,9 @@ typedef void (*node_join_ready_func_t) (struct mesh_node *node,
                                                struct mesh_agent *agent);
 
 void node_remove(struct mesh_node *node);
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+void node_release_resources(struct mesh_node *node);
+#endif
 void node_join(const char *app_root, const char *sender, const uint8_t *uuid,
                                                node_join_ready_func_t cb);
 uint8_t *node_uuid_get(struct mesh_node *node);