michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: fix dfu srv applying phase

Browse source 
Commit fixes bug if dfu server failed to deliver
apply response it gets stuck in applying phase.
In this phase it skips all further client attempts
to apply image again.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
This commit is contained in:
Aleksandr Khromykh 2024-04-18 16:08:15 +02:00 • committed by Alberto Escolar
commit 0015ab0f77
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/bluetooth/mesh/dfu_srv.c
View file

@ -78,7 +78,9 @@ static void apply_rsp_sent(int err, void *cb_params)
struct bt_mesh_dfu_srv *srv = cb_params;
if (err) {
LOG_WRN("Apply response failed, wait for retry");
/* return phase back to give client one more chance. */
srv->update.phase = BT_MESH_DFU_PHASE_VERIFY_OK;
LOG_WRN("Apply response failed, wait for retry (err %d)", err);
return;
}
@ -87,15 +89,18 @@ static void apply_rsp_sent(int err, void *cb_params)
if (!srv->cb->apply || srv->update.idx == UPDATE_IDX_NONE) {
srv->update.phase = BT_MESH_DFU_PHASE_IDLE;
store_state(srv);
LOG_DBG("Prerequisites for apply callback are wrong");
return;
}
store_state(srv);
err = srv->cb->apply(srv, &srv->imgs[srv->update.idx]);
if (err) {
srv->update.phase = BT_MESH_DFU_PHASE_IDLE;
store_state(srv);
LOG_DBG("Application apply callback failed (err %d)", err);
}
store_state(srv);
}
static void apply_rsp_sending(uint16_t duration, int err, void *cb_params)
@ -418,8 +423,6 @@ static int handle_apply(const struct bt_mesh_model *mod, struct bt_mesh_msg_ctx
* case it triggers a reboot:
*/
srv->update.phase = BT_MESH_DFU_PHASE_APPLYING;
store_state(srv);
update_status_rsp(srv, ctx, BT_MESH_DFU_SUCCESS, &send_cb);
return 0;