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

ble_mesh: fix provisioning send error handling

Browse Source
This commit is contained in:
lly
2019-09-02 14:42:35 +08:00
parent 299c86cc84
commit 6ec0c6743a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/bt/esp_ble_mesh/mesh_core/prov.c
View File

@ -549,7 +549,10 @@ static void prov_send_fail_msg(u8_t err)
prov_buf_init(&buf, PROV_FAILED); prov_buf_init(&buf, PROV_FAILED);
net_buf_simple_add_u8(&buf, err); net_buf_simple_add_u8(&buf, err);
prov_send(&buf);
if (prov_send(&buf)) {
BT_ERR("Failed to send Provisioning Failed message");
}
bt_mesh_atomic_set_bit(link.flags, LINK_INVALID); bt_mesh_atomic_set_bit(link.flags, LINK_INVALID);
} }
@ -596,7 +599,6 @@ static void prov_invite(const u8_t *data)
if (prov_send(&buf)) { if (prov_send(&buf)) {
BT_ERR("%s, Failed to send capabilities", __func__); BT_ERR("%s, Failed to send capabilities", __func__);
prov_send_fail_msg(PROV_ERR_RESOURCES);
return; return;
} }
@ -845,7 +847,6 @@ static void send_confirm(void)
if (prov_send(&cfm)) { if (prov_send(&cfm)) {
BT_ERR("%s, Unable to send Provisioning Confirm", __func__); BT_ERR("%s, Unable to send Provisioning Confirm", __func__);
prov_send_fail_msg(PROV_ERR_RESOURCES);
return; return;
} }
@ -857,7 +858,9 @@ static void send_input_complete(void)
PROV_BUF(buf, 1); PROV_BUF(buf, 1);
prov_buf_init(&buf, PROV_INPUT_COMPLETE); prov_buf_init(&buf, PROV_INPUT_COMPLETE);
prov_send(&buf); if (prov_send(&buf)) {
BT_ERR("Failed to send Provisioning Input Complete");
}
} }
int bt_mesh_input_number(u32_t num) int bt_mesh_input_number(u32_t num)
@ -1108,7 +1111,6 @@ static void prov_random(const u8_t *data)
if (prov_send(&rnd)) { if (prov_send(&rnd)) {
BT_ERR("%s, Failed to send Provisioning Random", __func__); BT_ERR("%s, Failed to send Provisioning Random", __func__);
prov_send_fail_msg(PROV_ERR_RESOURCES);
return; return;
} }
@ -1192,7 +1194,10 @@ static void prov_data(const u8_t *data)
net_idx, iv_index, addr); net_idx, iv_index, addr);
prov_buf_init(&msg, PROV_COMPLETE); prov_buf_init(&msg, PROV_COMPLETE);
prov_send(&msg); if (prov_send(&msg)) {
BT_ERR("Failed to send Provisioning Complete");
return;
}
/* Ignore any further PDUs on this link */ /* Ignore any further PDUs on this link */
link.expect = 0U; link.expect = 0U;