tools/mesh-cfgclient: Record remote node's default TTL

This adds code to save the value of a remote node's default TTL
upon receiving Config Default TTL Status message.

Also, cleanup leftover "#if 0" clause

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

diff --git a/tools/mesh/cfgcli.c b/tools/mesh/cfgcli.c
index 0aea7e5..33e77d8 100644 (file)
--- a/tools/mesh/cfgcli.c
+++ b/tools/mesh/cfgcli.c
@@ -557,6 +557,7 @@ static bool msg_recvd(uint16_t src, uint16_t idx, uint8_t *data,
                        return true;
 
                bt_shell_printf("Node %4.4x Default TTL %d\n", src, data[0]);
+               mesh_db_node_ttl_set(src, data[0]);
 
                break;
 

diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c
index 3fae060..cfe9134 100644 (file)
--- a/tools/mesh/mesh-db.c
+++ b/tools/mesh/mesh-db.c
@@ -436,6 +436,24 @@ bool mesh_db_node_net_key_add(uint16_t unicast, uint16_t idx)
        return add_node_key(jnode, "netKeys", idx);
 }
 
+bool mesh_db_node_ttl_set(uint16_t unicast, uint8_t ttl)
+{
+       json_object *jnode;
+
+       if (!cfg || !cfg->jcfg)
+               return false;
+
+       jnode = get_node_by_unicast(unicast);
+       if (!jnode)
+               return false;
+
+       if (!write_int(jnode, "defaultTTL", ttl))
+               return false;
+
+       return mesh_config_save((struct mesh_config *) cfg, true,
+                                                               NULL, NULL);
+}
+
 static void jarray_key_del(json_object *jarray, int16_t idx)
 {
        int i, sz = json_object_array_length(jarray);
@@ -925,13 +943,6 @@ bool mesh_db_create(const char *fname, const uint8_t token[8],
                goto fail;
 
        json_object_object_add(jcfg, "appKeys", jarray);
-#if 0
-       jarray = json_object_new_array();
-       if (!jarray)
-               goto fail;
-
-       json_object_object_add(jcfg, "groups", jarray);
-#endif
 
        if (!mesh_config_save((struct mesh_config *) cfg, true, NULL, NULL))
                goto fail;