tools/mesh-cfgclient: Store remote's heartbeat sub/pub

Store remote node's heartbeat publication or subscription info upon
receiving CONFIG_HEARTBEAT_PUB_STATUS or CONFIG_HEARTBEAT_SUB_STATUS
messages when the messages' status code is set to Success.

Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/tools/mesh/cfgcli.c b/tools/mesh/cfgcli.c
index b5f39df..2bf1a15 100644 (file)
--- a/tools/mesh/cfgcli.c
+++ b/tools/mesh/cfgcli.c
@@ -400,7 +400,7 @@ static bool msg_recvd(uint16_t src, uint16_t idx, uint8_t *data,
 {
        uint32_t opcode, mod_id;
        const struct cfg_cmd *cmd;
-       uint16_t app_idx, net_idx, addr, ele_addr;
+       uint16_t app_idx, net_idx, addr, ele_addr, features;
        struct mesh_group *grp;
        struct model_pub pub;
        int n;
@@ -813,13 +813,21 @@ static bool msg_recvd(uint16_t src, uint16_t idx, uint8_t *data,
                bt_shell_printf("\nNode %4.4x Heartbeat publish status %s\n",
                                src, mesh_status_str(data[0]));
 
-               bt_shell_printf("Destination\t%4.4x\n", get_le16(data + 1));
-               bt_shell_printf("Count\t\t%2.2x\n", data[3]);
-               bt_shell_printf("Period\t\t%2.2x\n", data[4]);
+               if (data[0] != MESH_STATUS_SUCCESS)
+                       return true;
+
+               addr = get_le16(data + 1);
+               bt_shell_printf("Destination\t%4.4x\n", addr);
+               bt_shell_printf("CountLog\t\t%2.2x\n", data[3]);
+               bt_shell_printf("PeriodLog\t\t%2.2x\n", data[4]);
                bt_shell_printf("TTL\t\t%2.2x\n", data[5]);
-               bt_shell_printf("Features\t%4.4x\n", get_le16(data + 6));
+               features = get_le16(data + 6);
+               bt_shell_printf("Features\t%4.4x\n", features);
                net_idx = get_le16(data + 8);
                bt_shell_printf("Net_Idx\t%u (0x%3.3x)\n", net_idx, net_idx);
+
+               saved = mesh_db_node_set_hb_pub(src, addr, net_idx, data[4],
+                                                       data[5], features);
                break;
 
        /* Per Mesh Profile 4.3.2.66 */
@@ -830,12 +838,20 @@ static bool msg_recvd(uint16_t src, uint16_t idx, uint8_t *data,
                bt_shell_printf("\nNode %4.4x Heartbeat subscribe status %s\n",
                                src, mesh_status_str(data[0]));
 
-               bt_shell_printf("Source\t\t%4.4x\n", get_le16(data + 1));
-               bt_shell_printf("Destination\t%4.4x\n", get_le16(data + 3));
+               if (data[0] != MESH_STATUS_SUCCESS)
+                       return true;
+
+               ele_addr = get_le16(data + 1);
+               bt_shell_printf("Source\t\t%4.4x\n", ele_addr);
+               addr = get_le16(data + 3);
+               bt_shell_printf("Destination\t%4.4x\n", addr);
                bt_shell_printf("Period\t\t%2.2x\n", data[5]);
                bt_shell_printf("Count\t\t%2.2x\n", data[6]);
                bt_shell_printf("Min Hops\t%2.2x\n", data[7]);
                bt_shell_printf("Max Hops\t%2.2x\n", data[8]);
+
+               saved = mesh_db_node_set_hb_sub(src, ele_addr, addr);
+
                break;
 
        /* Per Mesh Profile 4.3.2.71 */

diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c
index e6d6e87..7de36af 100644 (file)
--- a/tools/mesh/mesh-db.c
+++ b/tools/mesh/mesh-db.c
@@ -965,12 +965,24 @@ static void jarray_string_del(json_object *jarray, const char *str, size_t len)
        }
 }
 
+static bool add_array_string(json_object *jarray, const char *str)
+{
+       json_object *jstring;
+
+       jstring = json_object_new_string(str);
+       if (!jstring)
+               return false;
+
+       json_object_array_add(jarray, jstring);
+       return true;
+}
+
 static bool update_model_string_array(uint16_t unicast, uint16_t ele_addr,
                                                bool vendor, uint32_t mod_id,
                                                const char *str, uint32_t len,
                                                const char *keyword, bool add)
 {
-       json_object *jarray, *jmod, *jstring;
+       json_object *jarray, *jmod;
 
        if (!cfg || !cfg->jcfg)
                return false;
@@ -990,12 +1002,9 @@ static bool update_model_string_array(uint16_t unicast, uint16_t ele_addr,
        if (!add)
                return true;
 
-       jstring = json_object_new_string(str);
-       if (!jstring)
+       if (!add_array_string(jarray, str))
                return false;
 
-       json_object_array_add(jarray, jstring);
-
        return save_config();
 }
 
@@ -1181,6 +1190,100 @@ fail:
        return false;
 }
 
+bool mesh_db_node_set_hb_pub(uint16_t unicast, uint16_t dst, uint16_t net_idx,
+                                               uint8_t period_log, uint8_t ttl,
+                                                       uint16_t features)
+{
+       json_object *jnode, *jpub, *jarray = NULL;
+       uint32_t period;
+
+       if (!cfg || !cfg->jcfg)
+               return false;
+
+       if (period_log > 0x12 || ttl > 0x7F)
+               return  false;
+
+       jnode = get_node_by_unicast(cfg->jcfg, unicast);
+       if (!jnode)
+               return false;
+
+       jpub = json_object_new_object();
+
+       if (!write_uint16_hex(jpub, "address", dst))
+               goto fail;
+
+       period = period_log ? 1 << (period_log - 1) : 0;
+
+       if (!write_int(jpub, "period", period))
+               goto fail;
+
+       if (!write_int(jpub, "ttl", ttl))
+               goto fail;
+
+       if (!write_int(jpub, "index", net_idx))
+               goto fail;
+
+       jarray = json_object_new_array();
+
+       if (features & FEATURE_PROXY)
+               if (!add_array_string(jarray, "proxy"))
+                       goto fail;
+
+       if (features & FEATURE_RELAY)
+               if (!add_array_string(jarray, "relay"))
+                       goto fail;
+
+       if (features & FEATURE_FRIEND)
+               if (!add_array_string(jarray, "friend"))
+                       goto fail;
+
+       if (features & FEATURE_LPN)
+               if (!add_array_string(jarray, "lowPower"))
+                       goto fail;
+
+       json_object_object_add(jpub, "features", jarray);
+       json_object_object_del(jnode, "heartbeatPub");
+       json_object_object_add(jnode, "heartbeatPub", jpub);
+
+       return save_config();
+
+fail:
+       if (jarray)
+               json_object_put(jarray);
+
+       json_object_put(jpub);
+       return false;
+}
+
+bool mesh_db_node_set_hb_sub(uint16_t unicast, uint16_t src, uint16_t dst)
+{
+       json_object *jnode, *jsub;
+
+       if (!cfg || !cfg->jcfg)
+               return false;
+
+       jnode = get_node_by_unicast(cfg->jcfg, unicast);
+       if (!jnode)
+               return false;
+
+       jsub = json_object_new_object();
+
+       if (!write_uint16_hex(jsub, "source", src))
+               goto fail;
+
+       if (!write_uint16_hex(jsub, "destination", dst))
+               goto fail;
+
+       json_object_object_del(jnode, "heartbeatSub");
+       json_object_object_add(jnode, "heartbeatSub", jsub);
+
+       return save_config();
+
+fail:
+       json_object_put(jsub);
+       return false;
+}
+
 static void jarray_key_del(json_object *jarray, int16_t idx)
 {
        int i, sz = json_object_array_length(jarray);

diff --git a/tools/mesh/mesh-db.h b/tools/mesh/mesh-db.h
index 4e27776..84b8c95 100644 (file)
--- a/tools/mesh/mesh-db.h
+++ b/tools/mesh/mesh-db.h
@@ -72,6 +72,10 @@ bool mesh_db_node_model_overwrt_sub_virt(uint16_t unicast, uint16_t ele,
 bool mesh_db_node_model_set_pub(uint16_t unicast, uint16_t ele_addr,
                                                bool vendor, uint32_t mod_id,
                                                struct model_pub *pub, bool virt);
+bool mesh_db_node_set_hb_pub(uint16_t unicast, uint16_t dst, uint16_t net_idx,
+                                               uint8_t period_log, uint8_t ttl,
+                                                       uint16_t features);
+bool mesh_db_node_set_hb_sub(uint16_t unicast, uint16_t src, uint16_t dst);
 bool mesh_db_node_model_del_sub_all(uint16_t unicast, uint16_t ele, bool vendor,
                                                        uint32_t mod_id);
 struct l_queue *mesh_db_load_groups(void);