[mynewt-nimble] branch master updated: host/mesh: fix paths in persistent storage

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kopyscinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 3a77b6f  host/mesh: fix paths in persistent storage
3a77b6f is described below

commit 3a77b6f019412720c7ad83a45af9a7cd74eb5217
Author: Krzysztof Kopyściński <kr...@codecoup.pl>
AuthorDate: Mon Apr 19 13:32:55 2021 +0200

    host/mesh: fix paths in persistent storage
    
    All paths should be using bt_mesh instead of bt/mesh
---
 nimble/host/mesh/src/settings.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nimble/host/mesh/src/settings.c b/nimble/host/mesh/src/settings.c
index 30fbf5a..193cc0b 100644
--- a/nimble/host/mesh/src/settings.c
+++ b/nimble/host/mesh/src/settings.c
@@ -1239,7 +1239,7 @@ static void clear_rpl(struct bt_mesh_rpl *rpl, void *user_data)
 		return;
 	}
 
-	snprintk(path, sizeof(path), "bt/mesh/RPL/%x", rpl->src);
+	snprintk(path, sizeof(path), "bt_mesh/RPL/%x", rpl->src);
 	err = settings_save_one(path, NULL);
 	if (err) {
 		BT_ERR("Failed to clear RPL");
@@ -1388,7 +1388,7 @@ static void store_subnet(uint16_t net_idx)
 
 	BT_DBG("NetKeyIndex 0x%03x", net_idx);
 
-	snprintk(path, sizeof(path), "bt/mesh/NetKey/%x", net_idx);
+	snprintk(path, sizeof(path), "bt_mesh/NetKey/%x", net_idx);
 
 	memcpy(&key.val[0], sub->keys[0].net, 16);
 	memcpy(&key.val[1], sub->keys[1].net, 16);
@@ -1418,7 +1418,7 @@ static void store_app(uint16_t app_idx)
 	char *str;
 	int err;
 
-	snprintk(path, sizeof(path), "bt/mesh/AppKey/%x", app_idx);
+	snprintk(path, sizeof(path), "bt_mesh/AppKey/%x", app_idx);
 
 	app = bt_mesh_app_key_get(app_idx);
 	if (!app) {
@@ -1532,7 +1532,7 @@ static void store_cdb_node(const struct bt_mesh_cdb_node *node)
 	memcpy(val.uuid, node->uuid, 16);
 	memcpy(val.dev_key, node->dev_key, 16);
 
-	snprintk(path, sizeof(path), "bt/mesh/cdb/Node/%x", node->addr);
+	snprintk(path, sizeof(path), "bt_mesh/cdb/Node/%x", node->addr);
 
 	str = settings_str_from_bytes(&val, sizeof(val), buf, sizeof(buf));
 	if (!str) {