michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Notify application about prepare write error

Browse source 
Notify application about prepare write error when continueing the write
procedure fails when RX thread is processing responses. It is possible
that this operation fails, either because of disconnection or ATT
timeout on the ATT bearer. Notify the application in case it needs to
clear up resources, e.g. the write parameters.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2021-05-28 13:03:37 +02:00 • committed by Carles Cufí
commit f5f8eb7263
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
subsys/bluetooth/host/gatt.c
View file

@ -4185,14 +4185,20 @@ static void gatt_prepare_write_rsp(struct bt_conn *conn, uint8_t err,
len = length - sizeof(*rsp);
if (len > params->length) {
BT_ERR("Incorrect length, canceling write");
gatt_cancel_all_writes(conn, params);
if (gatt_cancel_all_writes(conn, params)) {
goto fail;
}
return;
}
data_valid = memcmp(params->data, rsp->value, len) == 0;
if (params->offset != rsp->offset || !data_valid) {
BT_ERR("Incorrect offset or data in response, canceling write");
gatt_cancel_all_writes(conn, params);
if (gatt_cancel_all_writes(conn, params)) {
goto fail;
}
return;
}
@ -4203,12 +4209,22 @@ static void gatt_prepare_write_rsp(struct bt_conn *conn, uint8_t err,
/* If there is no more data execute */
if (!params->length) {
gatt_exec_write(conn, params);
if (gatt_exec_write(conn, params)) {
goto fail;
}
return;
}
/* Write next chunk */
bt_gatt_write(conn, params);
if (!bt_gatt_write(conn, params)) {
/* Success */
return;
}
fail:
/* Notify application that the write operation has failed */
params->func(conn, BT_ATT_ERR_UNLIKELY, params);
}
static int gatt_prepare_write_encode(struct net_buf *buf, size_t len,