Bluetooth: Mesh: CDB for config client in shell

When available, the shell will use the CDB when configuring. This
replaces the default key for configuration and self-provisioning,
ensuring that there aren't multiple key values for the same indexes.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>

subsys/bluetooth/mesh/shell.c

@@ -947,6 +947,7 @@ static int cmd_relay(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_net_key_add(const struct shell *shell, size_t argc, char *argv[])
 {
+	bool has_key_val = (argc > 2);
 	u8_t key_val[16];
 	u16_t key_net_idx;
 	u8_t status;
@@ -958,7 +959,7 @@ static int cmd_net_key_add(const struct shell *shell, size_t argc, char *argv[])
 
 	key_net_idx = strtoul(argv[1], NULL, 0);
 
-	if (argc > 2) {
+	if (has_key_val) {
 		size_t len;
 
 		len = hex2bin(argv[3], strlen(argv[3]),
@@ -968,6 +969,32 @@ static int cmd_net_key_add(const struct shell *shell, size_t argc, char *argv[])
 		memcpy(key_val, default_key, sizeof(key_val));
 	}
 
+	if (IS_ENABLED(CONFIG_BT_MESH_CDB)) {
+		struct bt_mesh_cdb_subnet *subnet;
+
+		subnet = bt_mesh_cdb_subnet_get(key_net_idx);
+		if (subnet) {
+			if (has_key_val) {
+				shell_error(shell,
+					    "Subnet 0x%03x already has a value",
+					    key_net_idx);
+				return 0;
+			}
+
+			memcpy(key_val, subnet->keys[0].net_key, 16);
+		} else {
+			subnet = bt_mesh_cdb_subnet_alloc(key_net_idx);
+			if (!subnet) {
+				shell_error(shell,
+					    "No space for subnet in cdb");
+				return 0;
+			}
+
+			memcpy(subnet->keys[0].net_key, key_val, 16);
+			bt_mesh_cdb_subnet_store(subnet);
+		}
+	}
+
 	err = bt_mesh_cfg_net_key_add(net.net_idx, net.dst, key_net_idx,
 				      key_val, &status);
 	if (err) {
@@ -990,6 +1017,7 @@ static int cmd_app_key_add(const struct shell *shell, size_t argc, char *argv[])
 {
 	u8_t key_val[16];
 	u16_t key_net_idx, key_app_idx;
+	bool has_key_val = (argc > 3);
 	u8_t status;
 	int err;
 
@@ -1000,7 +1028,7 @@ static int cmd_app_key_add(const struct shell *shell, size_t argc, char *argv[])
 	key_net_idx = strtoul(argv[1], NULL, 0);
 	key_app_idx = strtoul(argv[2], NULL, 0);
 
-	if (argc > 3) {
+	if (has_key_val) {
 		size_t len;
 
 		len = hex2bin(argv[3], strlen(argv[3]),
@@ -1010,6 +1038,34 @@ static int cmd_app_key_add(const struct shell *shell, size_t argc, char *argv[])
 		memcpy(key_val, default_key, sizeof(key_val));
 	}
 
+	if (IS_ENABLED(CONFIG_BT_MESH_CDB)) {
+		struct bt_mesh_cdb_app_key *app_key;
+
+		app_key = bt_mesh_cdb_app_key_get(key_app_idx);
+		if (app_key) {
+			if (has_key_val) {
+				shell_error(
+					shell,
+					"App key 0x%03x already has a value",
+					key_app_idx);
+				return 0;
+			}
+
+			memcpy(key_val, app_key->keys[0].app_key, 16);
+		} else {
+			app_key = bt_mesh_cdb_app_key_alloc(key_net_idx,
+							    key_app_idx);
+			if (!app_key) {
+				shell_error(shell,
+					    "No space for app key in cdb");
+				return 0;
+			}
+
+			memcpy(app_key->keys[0].app_key, key_val, 16);
+			bt_mesh_cdb_app_key_store(app_key);
+		}
+	}
+
 	err = bt_mesh_cfg_app_key_add(net.net_idx, net.dst, key_net_idx,
 				      key_app_idx, key_val, &status);
 	if (err) {
@@ -1596,6 +1652,7 @@ static int cmd_pb_gatt(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_provision(const struct shell *shell, size_t argc, char *argv[])
 {
+	const u8_t *net_key = default_key;
 	u16_t net_idx, addr;
 	u32_t iv_index;
 	int err;
@@ -1613,7 +1670,20 @@ static int cmd_provision(const struct shell *shell, size_t argc, char *argv[])
 		iv_index = 0U;
 	}
 
-	err = bt_mesh_provision(default_key, net_idx, 0, iv_index, addr,
+	if (IS_ENABLED(CONFIG_BT_MESH_CDB)) {
+		const struct bt_mesh_cdb_subnet *sub;
+
+		sub = bt_mesh_cdb_subnet_get(net_idx);
+		if (!sub) {
+			shell_error(shell, "No cdb entry for subnet 0x%03x",
+				    net_idx);
+			return 0;
+		}
+
+		net_key = sub->keys[sub->kr_flag].net_key;
+	}
+
+	err = bt_mesh_provision(net_key, net_idx, 0, iv_index, addr,
 				default_key);
 	if (err) {
 		shell_error(shell, "Provisioning failed (err %d)", err);