espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

ble_mesh: Continue node info restore even if failure happens

Browse Source
This commit is contained in:
lly
2020-03-28 16:03:46 +08:00
committed by baohongde
parent 20f1838563
commit e9b87fda73
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/bt/esp_ble_mesh/mesh_core/settings.c
View File

@ -1191,13 +1191,13 @@ static int p_node_set(const char *name)
u16_t addr = net_buf_simple_pull_le16(buf); u16_t addr = net_buf_simple_pull_le16(buf);
if (!BLE_MESH_ADDR_IS_UNICAST(addr)) { if (!BLE_MESH_ADDR_IS_UNICAST(addr)) {
BT_ERR("%s, 0x%04x is not a unicast address", __func__, addr); BT_ERR("%s, 0x%04x is not a unicast address", __func__, addr);
goto free; continue;
} }
err = node_info_set(addr, prov, &exist); err = node_info_set(addr, prov, &exist);
if (err) { if (err) {
BT_ERR("%s, Failed to load node 0x%04x info", __func__, addr); BT_ERR("%s, Failed to load node 0x%04x info", __func__, addr);
goto free; continue;
} }
if (exist == false) { if (exist == false) {
@ -1207,17 +1207,16 @@ static int p_node_set(const char *name)
err = node_name_set(addr, prov); err = node_name_set(addr, prov);
if (err) { if (err) {
BT_ERR("%s, Failed to load node 0x%04x name", __func__, addr); BT_ERR("%s, Failed to load node 0x%04x name", __func__, addr);
goto free; continue;
} }
err = node_comp_data_set(addr, prov); err = node_comp_data_set(addr, prov);
if (err) { if (err) {
BT_ERR("%s, Failed to load node 0x%04x comp data", __func__, addr); BT_ERR("%s, Failed to load node 0x%04x comp data", __func__, addr);
goto free; continue;
} }
} }
free:
bt_mesh_free_buf(buf); bt_mesh_free_buf(buf);
return err; return err;
} }