tools/mesh-cfgclient: Disallow sending a non-existing key

Prior to sending either NetKeyAdd or AppKeyAdd message to a
remote node, check if the key exists locally.

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

diff --git a/tools/mesh-cfgclient.c b/tools/mesh-cfgclient.c
index 94bbd40..43999a9 100644 (file)
--- a/tools/mesh-cfgclient.c
+++ b/tools/mesh-cfgclient.c
@@ -318,8 +318,20 @@ static bool send_key(void *user_data, uint16_t dst, uint16_t key_idx,
        const char *method_name = (!is_appkey) ? "AddNetKey" : "AddAppKey";
 
        net_idx = remote_get_subnet_idx(dst);
-       if (net_idx == NET_IDX_INVALID)
+       if (net_idx == NET_IDX_INVALID) {
+               bt_shell_printf("Node %4.4x not found\n", dst);
                return false;
+       }
+
+       if (!is_appkey && !keys_subnet_exists(key_idx)) {
+               bt_shell_printf("Local NetKey %u not found\n", key_idx);
+               return false;
+       }
+
+       if (is_appkey && (keys_get_bound_key(key_idx) == NET_IDX_INVALID)) {
+               bt_shell_printf("Local AppKey %u not found\n", key_idx);
+               return false;
+       }
 
        req = l_new(struct key_data, 1);
        req->ele_path = user_data;

diff --git a/tools/mesh/keys.c b/tools/mesh/keys.c
index 7d20582..0ce8ce8 100644 (file)
--- a/tools/mesh/keys.c
+++ b/tools/mesh/keys.c
@@ -173,3 +173,11 @@ void keys_print_keys(void)
 {
        l_queue_foreach(net_keys, print_netkey, NULL);
 }
+
+bool keys_subnet_exists(uint16_t idx)
+{
+       if (!l_queue_find(net_keys, net_idx_match, L_UINT_TO_PTR(idx)))
+               return false;
+
+       return true;
+}

diff --git a/tools/mesh/keys.h b/tools/mesh/keys.h
index 2a9faed..71c3bb3 100644 (file)
--- a/tools/mesh/keys.h
+++ b/tools/mesh/keys.h
@@ -23,4 +23,5 @@ void keys_del_net_key(uint16_t net_idx);
 void keys_add_app_key(uint16_t net_idx, uint16_t app_idx);
 void keys_del_app_key(uint16_t app_idx);
 uint16_t keys_get_bound_key(uint16_t app_idx);
+bool keys_subnet_exists(uint16_t idx);
 void keys_print_keys(void);