tools/mesh-cfgclient: Store remote's model publication info

Update remote node's model publication after a successful completion
of "pub-set" or "pub-get" commands.

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 19a4294..2766d47 100644 (file)
--- a/tools/mesh/cfgcli.c
+++ b/tools/mesh/cfgcli.c
@@ -334,7 +334,7 @@ static void print_pub(uint16_t ele_addr, uint32_t mod_id,
                                                struct model_pub *pub)
 {
        bt_shell_printf("\tElement: %4.4x\n", ele_addr);
-       bt_shell_printf("\tPub Addr: %4.4x\n", pub->u.addr16);
+       bt_shell_printf("\tPub Addr: %4.4x\n", pub->u.addr);
 
        if (mod_id < VENDOR_ID_MASK)
                bt_shell_printf("\tModel: %8.8x\n", mod_id);
@@ -634,31 +634,51 @@ static bool msg_recvd(uint16_t src, uint16_t idx, uint8_t *data,
 
                mod_id = print_mod_id(data + 10, len == 14, "");
 
-               pub.u.addr16 = get_le16(data + 3);
+               pub.u.addr = get_le16(data + 3);
+
                pub.app_idx = get_le16(data + 5);
+               pub.cred = ((pub.app_idx & 0x1000) != 0);
+               pub.app_idx &= 0x3ff;
+
                pub.ttl = data[7];
-               pub.period = data[8];
-               n = (data[8] & 0x3f);
+               pub.prd_steps = (data[8] & 0x3f);
 
                print_pub(ele_addr, mod_id, &pub);
 
                switch (data[8] >> 6) {
                case 0:
-                       bt_shell_printf("Period\t\t%d ms\n", n * 100);
+                       pub.prd_res = 100;
                        break;
                case 2:
-                       n *= 10;
-                       /* fall through */
+                       pub.prd_res = 10;
+                       break;
                case 1:
-                       bt_shell_printf("Period\t\t%d sec\n", n);
+                       pub.prd_res = 10000;
                        break;
                case 3:
-                       bt_shell_printf("Period\t\t%d min\n", n * 10);
+                       pub.prd_res = 600000;
                        break;
                }
 
-               bt_shell_printf("Rexmit count\t%d\n", data[9] & 0x7);
-               bt_shell_printf("Rexmit steps\t%d\n", data[9] >> 3);
+               bt_shell_printf("Period\t\t%d ms\n", pub.period);
+
+               pub.rtx_cnt = data[9] & 0x7;
+               pub.rtx_interval = ((data[9] >> 3) + 1) * 50;
+               bt_shell_printf("Rexmit count\t%d\n", pub.rtx_cnt);
+               bt_shell_printf("Rexmit steps\t%d\n", pub.rtx_interval);
+
+               if (IS_VIRTUAL(pub.u.addr)) {
+                       grp = l_queue_find(groups, match_group_addr,
+                                               L_UINT_TO_PTR(pub.u.addr));
+                       if (!grp)
+                               return true;
+
+                       memcpy(pub.u.label, grp->label, sizeof(pub.u.label));
+
+               }
+
+               mesh_db_node_model_set_pub(src, ele_addr, len == 14, mod_id,
+                                               &pub, IS_VIRTUAL(pub.u.addr));
 
                break;
 

diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c
index b2dc58e..61b5c87 100644 (file)
--- a/tools/mesh/mesh-db.c
+++ b/tools/mesh/mesh-db.c
@@ -34,6 +34,7 @@
 #include "tools/mesh/keys.h"
 #include "tools/mesh/remote.h"
 #include "tools/mesh/cfgcli.h"
+#include "tools/mesh/model.h"
 #include "tools/mesh/mesh-db.h"
 
 #define KEY_IDX_INVALID NET_IDX_INVALID
@@ -994,6 +995,86 @@ bool mesh_db_node_model_overwrt_sub_virt(uint16_t unicast, uint16_t ele,
        return sub_overwrite(unicast, ele, vendor, mod_id, buf);
 }
 
+static bool add_transmit_info(json_object *jobj, int cnt, int interval,
+                                                       const char *desc)
+{
+       json_object *jtxmt;
+
+       jtxmt = json_object_new_object();
+
+       if (!write_int(jtxmt, "count", cnt))
+               return false;
+
+       if (!write_int(jtxmt, "interval", interval))
+               return false;
+
+       json_object_object_add(jobj, desc, jtxmt);
+       return true;
+}
+
+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)
+{
+       json_object *jmod, *jpub, *jobj = NULL;
+
+       if (!cfg || !cfg->jcfg)
+               return false;
+
+       jmod = get_model(unicast, ele_addr, mod_id, vendor);
+       if (!jmod)
+               return false;
+
+       jpub = json_object_new_object();
+
+       if (!virt && !write_uint16_hex(jpub, "address", pub->u.addr))
+               goto fail;
+
+       if (virt) {
+               char buf[33];
+
+               hex2str(pub->u.label, 16, buf, sizeof(buf));
+
+               if (!add_string(jpub, "address", buf))
+                       goto fail;
+       }
+
+       if (!write_int(jpub, "index", pub->app_idx))
+               goto fail;
+
+       if (!write_int(jpub, "ttl", pub->ttl))
+               goto fail;
+
+       if (!write_int(jpub, "credentials", pub->cred ? 1 : 0))
+               goto fail;
+
+       if (!add_transmit_info(jpub, pub->rtx_cnt, pub->rtx_interval,
+                                                       "retransmit"))
+               goto fail;
+
+       jobj = json_object_new_object();
+
+       if (!write_int(jobj, "numberOfSteps", pub->prd_steps))
+               goto fail;
+
+       if (!write_int(jobj, "resolution", pub->prd_res))
+               goto fail;
+
+       json_object_object_add(jpub, "period", jobj);
+
+       json_object_object_del(jmod, "publish");
+       json_object_object_add(jmod, "publish", jpub);
+
+       return save_config();
+
+fail:
+       if (jobj)
+               json_object_put(jobj);
+
+       json_object_put(jpub);
+       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 384376c..5dddf04 100644 (file)
--- a/tools/mesh/mesh-db.h
+++ b/tools/mesh/mesh-db.h
@@ -11,6 +11,7 @@
 #include "mesh/mesh-config.h"
 
 struct mesh_group;
+struct model_pub;
 
 bool mesh_db_create(const char *fname, const uint8_t token[8],
                                                        const char *name);
@@ -63,6 +64,9 @@ bool mesh_db_node_model_del_sub_virt(uint16_t unicast, uint16_t ele,
 bool mesh_db_node_model_overwrt_sub_virt(uint16_t unicast, uint16_t ele,
                                                bool vendor, uint32_t mod_id,
                                                                uint8_t *label);
+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_model_del_sub_all(uint16_t unicast, uint16_t ele, bool vendor,
                                                        uint32_t mod_id);
 struct l_queue *mesh_db_load_groups(void);

diff --git a/tools/mesh/model.h b/tools/mesh/model.h
index 7359ea7..5e20719 100644 (file)
--- a/tools/mesh/model.h
+++ b/tools/mesh/model.h
@@ -25,14 +25,17 @@ typedef int (*model_bind_func_t)(uint16_t app_idx, int action);
 
 struct model_pub {
        uint16_t app_idx;
+       uint16_t period;
        union {
-               uint16_t addr16;
-               uint8_t va_128[16];
+               uint16_t addr;
+               uint8_t label[16];
        } u;
+       bool cred;
+       uint32_t prd_res;
+       uint16_t rtx_interval;
+       uint8_t prd_steps;
+       uint8_t rtx_cnt;
        uint8_t ttl;
-       uint8_t credential;
-       uint8_t period;
-       uint8_t retransmit;
 };
 
 typedef int (*model_pub_func_t)(struct model_pub *pub);