michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Fix reject command

Browse source 
Command reject may contain optional data depending on reject reason.

Change-Id: I0665f44e2adfbf03daa1625519530cabe247631e
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2016-06-06 09:23:20 +02:00 • committed by Johan Hedberg
commit 8fc854029a
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
net/bluetooth/l2cap.c
View file

@ -249,7 +249,7 @@ void bt_l2cap_send(struct bt_conn *conn, uint16_t cid, struct net_buf *buf)
} }
static void l2cap_send_reject(struct bt_conn *conn, uint8_t ident, static void l2cap_send_reject(struct bt_conn *conn, uint8_t ident,
uint16_t reason) uint16_t reason, void *data, uint8_t data_len)
{ {
struct bt_l2cap_cmd_reject *rej; struct bt_l2cap_cmd_reject *rej;
struct bt_l2cap_sig_hdr *hdr; struct bt_l2cap_sig_hdr *hdr;
@ -263,11 +263,15 @@ static void l2cap_send_reject(struct bt_conn *conn, uint8_t ident,
hdr = net_buf_add(buf, sizeof(*hdr)); hdr = net_buf_add(buf, sizeof(*hdr));
hdr->code = BT_L2CAP_CMD_REJECT; hdr->code = BT_L2CAP_CMD_REJECT;
hdr->ident = ident; hdr->ident = ident;
hdr->len = sys_cpu_to_le16(sizeof(*rej)); hdr->len = sys_cpu_to_le16(sizeof(*rej) + data_len);
rej = net_buf_add(buf, sizeof(*rej)); rej = net_buf_add(buf, sizeof(*rej));
rej->reason = sys_cpu_to_le16(reason); rej->reason = sys_cpu_to_le16(reason);
if (data) {
memcpy(net_buf_add(buf, data_len), data, data_len);
}
bt_l2cap_send(conn, BT_L2CAP_CID_LE_SIG, buf); bt_l2cap_send(conn, BT_L2CAP_CID_LE_SIG, buf);
} }
@ -301,7 +305,8 @@ static void le_conn_param_update_req(struct bt_l2cap *l2cap, uint8_t ident,
} }
if (conn->role != BT_HCI_ROLE_MASTER) { if (conn->role != BT_HCI_ROLE_MASTER) {
l2cap_send_reject(conn, ident, BT_L2CAP_REJ_NOT_UNDERSTOOD); l2cap_send_reject(conn, ident, BT_L2CAP_REJ_NOT_UNDERSTOOD,
NULL, 0);
return; return;
} }
@ -587,7 +592,13 @@ static void le_disconn_req(struct bt_l2cap *l2cap, uint8_t ident,
chan = l2cap_remove_tx_cid(conn, scid); chan = l2cap_remove_tx_cid(conn, scid);
if (!chan) { if (!chan) {
l2cap_send_reject(conn, ident, BT_L2CAP_REJ_INVALID_CID); struct bt_l2cap_cmd_reject_cid_data data;
data.scid = req->scid;
data.dcid = req->dcid;
l2cap_send_reject(conn, ident, BT_L2CAP_REJ_INVALID_CID, &data,
sizeof(data));
return; return;
} }
@ -833,7 +844,7 @@ static void l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
default: default:
BT_WARN("Unknown L2CAP PDU code 0x%02x", hdr->code); BT_WARN("Unknown L2CAP PDU code 0x%02x", hdr->code);
l2cap_send_reject(chan->conn, hdr->ident, l2cap_send_reject(chan->conn, hdr->ident,
BT_L2CAP_REJ_NOT_UNDERSTOOD); BT_L2CAP_REJ_NOT_UNDERSTOOD, NULL, 0);
break; break;
} }
} }

5
net/bluetooth/l2cap_internal.h
View file

@ -50,6 +50,11 @@ struct bt_l2cap_cmd_reject {
uint8_t data[0]; uint8_t data[0];
} __packed; } __packed;
struct bt_l2cap_cmd_reject_cid_data {
uint16_t scid;
uint16_t dcid;
} __packed;
#define BT_L2CAP_DISCONN_REQ 0x06 #define BT_L2CAP_DISCONN_REQ 0x06
struct bt_l2cap_disconn_req { struct bt_l2cap_disconn_req {
uint16_t dcid; uint16_t dcid;