michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: ATT: Clone request buffer

Browse source 
Clone request buffer so it can later be used to validate the response.

Change-Id: I306f7b01a9a72a6c4b8e97c30789247b28428365
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2015-09-04 14:29:57 +03:00 • committed by Anas Nashif
commit 2045f0ab12
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
net/bluetooth/att.c
View file

@ -76,7 +76,7 @@ struct bt_att_req {
bt_att_func_t func; bt_att_func_t func;
void *user_data; void *user_data;
bt_att_destroy_t destroy; bt_att_destroy_t destroy;
uint8_t op; struct bt_buf *buf;
}; };
/* ATT channel specific context */ /* ATT channel specific context */
@ -102,6 +102,10 @@ static const struct bt_uuid secondary_uuid = {
static void att_req_destroy(struct bt_att_req *req) static void att_req_destroy(struct bt_att_req *req)
{ {
if (req->buf) {
bt_buf_put(req->buf);
}
if (req->destroy) { if (req->destroy) {
req->destroy(req->user_data); req->destroy(req->user_data);
} }
@ -1192,7 +1196,9 @@ static uint8_t att_signed_write_cmd(struct bt_conn *conn, struct bt_buf *buf)
static uint8_t att_error_rsp(struct bt_conn *conn, struct bt_buf *buf) static uint8_t att_error_rsp(struct bt_conn *conn, struct bt_buf *buf)
{ {
struct bt_att *att = conn->att; struct bt_att *att = conn->att;
struct bt_att_req *req = &att->req;
struct bt_att_error_rsp *rsp; struct bt_att_error_rsp *rsp;
struct bt_att_hdr *hdr;
uint8_t err; uint8_t err;
rsp = (void *)buf->data; rsp = (void *)buf->data;
@ -1200,9 +1206,16 @@ static uint8_t att_error_rsp(struct bt_conn *conn, struct bt_buf *buf)
BT_DBG("request 0x%02x handle 0x%04x error 0x%02x\n", rsp->request, BT_DBG("request 0x%02x handle 0x%04x error 0x%02x\n", rsp->request,
sys_le16_to_cpu(rsp->handle), rsp->error); sys_le16_to_cpu(rsp->handle), rsp->error);
/* Match request with response */ if (!req->buf) {
err = rsp->request == att->req.op ? rsp->error : BT_ATT_ERR_UNLIKELY; err = BT_ATT_ERR_UNLIKELY;
goto done;
}
hdr = (void *)req->buf->data;
err = rsp->request == hdr->code ? rsp->error : BT_ATT_ERR_UNLIKELY;
done:
return att_handle_rsp(conn, NULL, 0, err); return att_handle_rsp(conn, NULL, 0, err);
} }
@ -1492,7 +1505,7 @@ int bt_att_send(struct bt_conn *conn, struct bt_buf *buf, bt_att_func_t func,
return -EBUSY; return -EBUSY;
} }
att->req.op = hdr->code; att->req.buf = bt_buf_clone(buf);
att->req.func = func; att->req.func = func;
att->req.user_data = user_data; att->req.user_data = user_data;
att->req.destroy = destroy; att->req.destroy = destroy;