tools/mesh-cfgclient: Update stored NetKey and AppKey

NetKeys:
- Record additional properties: "name", "minSecurity", "timestamp"

AppKeys:
- Record additional property: "name"

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

diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c
index be1caa3..f6682dc 100644 (file)
--- a/tools/mesh/mesh-db.c
+++ b/tools/mesh/mesh-db.c
@@ -519,6 +519,7 @@ static void load_remotes(json_object *jcfg)
 static bool add_app_key(json_object *jobj, uint16_t net_idx, uint16_t app_idx)
 {
        json_object *jkey, *jarray;
+       char buf[12];
 
        json_object_object_get_ex(jobj, "appKeys", &jarray);
        if (!jarray || json_object_get_type(jarray) != json_type_array)
@@ -526,6 +527,11 @@ static bool add_app_key(json_object *jobj, uint16_t net_idx, uint16_t app_idx)
 
        jkey = json_object_new_object();
 
+       snprintf(buf, 12, "AppKey %4.4x", app_idx);
+
+       if (!add_string(jkey, "name", buf))
+               goto fail;
+
        if (!write_int(jkey, "boundNetKey", (int)net_idx))
                goto fail;
 
@@ -723,6 +729,7 @@ static bool load_keys(json_object *jobj)
 bool mesh_db_net_key_add(uint16_t net_idx)
 {
        json_object *jkey, *jarray;
+       char buf[12];
 
        if (!cfg || !cfg->jcfg)
                return false;
@@ -736,12 +743,20 @@ bool mesh_db_net_key_add(uint16_t net_idx)
 
        jkey = json_object_new_object();
 
+       snprintf(buf, 12, "Subnet %4.4x", net_idx);
+
+       if (!add_string(jkey, "name", buf))
+               goto fail;
+
        if (!write_int(jkey, "index", net_idx))
                goto fail;
 
        if (!write_int(jkey, "phase", KEY_REFRESH_PHASE_NONE))
                goto fail;
 
+       if (!add_string(jkey, "minSecurity", "secure"))
+               goto fail;
+
        if (!set_timestamp(jkey))
                goto fail;