This fixes the checks for the presence of AppKeys and Netkeys.
Also disallow sending a non-existing key: prior to sending either
NetKeyAdd or AppKeyAdd message to a remote node, check if the
key exists locally.
---
tools/mesh-cfgclient.c | 14 +++++++++++++-
tools/mesh/keys.c | 33 ++++++++++++++++++++++++---------
tools/mesh/keys.h | 1 +
tools/mesh/remote.c | 17 +++++++++++++----
4 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/tools/mesh-cfgclient.c b/tools/mesh-cfgclient.c
index 200eb5b84..b4d76de93 100644
--- a/tools/mesh-cfgclient.c
+++ b/tools/mesh-cfgclient.c
@@ -316,8 +316,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 7d2058294..77b32da63 100644
--- a/tools/mesh/keys.c
+++ b/tools/mesh/keys.c
@@ -37,9 +37,18 @@ struct net_key {
static struct l_queue *net_keys;
-static bool simple_match(const void *a, const void *b)
+static bool app_key_present(const struct net_key *key, uint16_t app_idx)
{
- return a == b;
+ const struct l_queue_entry *l;
+
+ for (l = l_queue_get_entries(key->app_keys); l; l = l->next) {
+ uint16_t idx = L_PTR_TO_UINT(l->data);
+
+ if (idx == app_idx)
+ return true;
+ }
+
+ return false;
}
static bool net_idx_match(const void *a, const void *b)
@@ -102,7 +111,7 @@ void keys_add_app_key(uint16_t net_idx, uint16_t app_idx)
if (!key->app_keys)
key->app_keys = l_queue_new();
- if (l_queue_find(key->app_keys, simple_match, L_UINT_TO_PTR(app_idx)))
+ if (app_key_present(key, app_idx))
return;
l_queue_push_tail(key->app_keys, L_UINT_TO_PTR(app_idx));
@@ -121,8 +130,7 @@ void keys_del_app_key(uint16_t app_idx)
if (!key->app_keys)
continue;
- if (l_queue_remove_if(key->app_keys, simple_match,
- L_UINT_TO_PTR(app_idx)))
+ if (l_queue_remove(key->app_keys, L_UINT_TO_PTR(app_idx)))
return;
}
}
@@ -140,8 +148,7 @@ uint16_t keys_get_bound_key(uint16_t app_idx)
if (!key->app_keys)
continue;
- if (l_queue_find(key->app_keys, simple_match,
- L_UINT_TO_PTR(app_idx)))
+ if (app_key_present(key, app_idx))
return key->idx;
}
@@ -152,14 +159,14 @@ static void print_appkey(void *app_key, void *user_data)
{
uint16_t app_idx = L_PTR_TO_UINT(app_key);
- bt_shell_printf("%3.3x, ", app_idx);
+ bt_shell_printf("0x%3.3x, ", app_idx);
}
static void print_netkey(void *net_key, void *user_data)
{
struct net_key *key = net_key;
- bt_shell_printf(COLOR_YELLOW "NetKey: %3.3x\n" COLOR_OFF, key->idx);
+ bt_shell_printf(COLOR_YELLOW "NetKey: 0x%3.3x\n" COLOR_OFF, key->idx);
if (!key->app_keys || l_queue_isempty(key->app_keys))
return;
@@ -173,3 +180,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 2a9faede6..71c3bb390 100644
--- 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);
diff --git a/tools/mesh/remote.c b/tools/mesh/remote.c
index 673c7b0fb..25e8d23f8 100644
--- a/tools/mesh/remote.c
+++ b/tools/mesh/remote.c
@@ -41,9 +41,18 @@ struct remote_node {
static struct l_queue *nodes;
-static bool simple_match(const void *a, const void *b)
+static bool key_present(struct l_queue *keys, uint16_t app_idx)
{
- return a == b;
+ const struct l_queue_entry *l;
+
+ for (l = l_queue_get_entries(keys); l; l = l->next) {
+ uint16_t idx = L_PTR_TO_UINT(l->data);
+
+ if (idx == app_idx)
+ return true;
+ }
+
+ return false;
}
static int compare_unicast(const void *a, const void *b, void *user_data)
@@ -104,7 +113,7 @@ bool remote_add_net_key(uint16_t addr, uint16_t net_idx)
if (!rmt)
return false;
- if (l_queue_find(rmt->net_keys, simple_match, L_UINT_TO_PTR(net_idx)))
+ if (key_present(rmt->net_keys, net_idx))
return false;
l_queue_push_tail(rmt->net_keys, L_UINT_TO_PTR(net_idx));
@@ -146,7 +155,7 @@ bool remote_add_app_key(uint16_t addr, uint16_t app_idx)
if (!rmt->app_keys)
rmt->app_keys = l_queue_new();
- if (l_queue_find(rmt->app_keys, simple_match, L_UINT_TO_PTR(app_idx)))
+ if (key_present(rmt->app_keys, app_idx))
return false;
l_queue_push_tail(rmt->app_keys, L_UINT_TO_PTR(app_idx));
--
2.21.0
