patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: L2CAP: Extend available return codes from accept cb

Browse source 
This adds support for returning various return codes from
the channel accept callback.
This is needed for implementation of incoming connection
authorization for certification purposes.

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This commit is contained in:
Mariusz Skamra 2018-10-23 11:26:30 +02:00 committed by Johan Hedberg
parent 2c6065c2d1
commit e82ebb2c84
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/bluetooth/l2cap.h
View file

@ -246,6 +246,10 @@ struct bt_l2cap_server {
* @param chan Pointer to received the allocated channel
*
* @return 0 in case of success or negative value in case of error.
* Possible return values:
* -ENOMEM if no available space for new channel.
* -EACCES if application did not authorize the connection.
* -EKEYREJECTED if encryption key size is too short.
*/
int (*accept)(struct bt_conn *conn, struct bt_l2cap_chan **chan);

22
subsys/bluetooth/host/l2cap.c
View file

@ -723,6 +723,20 @@ static void l2cap_chan_destroy(struct bt_l2cap_chan *chan)
}
}
static u16_t le_err_to_result(int err)
{
switch (err) {
case -ENOMEM:
return BT_L2CAP_LE_ERR_NO_RESOURCES;
case -EACCES:
return BT_L2CAP_LE_ERR_AUTHORIZATION;
case -EKEYREJECTED:
return BT_L2CAP_LE_ERR_KEY_SIZE;
default:
return BT_L2CAP_LE_ERR_UNACCEPT_PARAMS;
}
}
static void le_conn_req(struct bt_l2cap *l2cap, u8_t ident,
struct net_buf *buf)
{
@ -732,6 +746,7 @@ static void le_conn_req(struct bt_l2cap *l2cap, u8_t ident,
struct bt_l2cap_le_conn_req *req = (void *)buf->data;
struct bt_l2cap_le_conn_rsp *rsp;
u16_t psm, scid, mtu, mps, credits;
int err;
if (buf->len < sizeof(*req)) {
BT_ERR("Too small LE conn req packet size");
@ -784,11 +799,10 @@ static void le_conn_req(struct bt_l2cap *l2cap, u8_t ident,
/* Request server to accept the new connection and allocate the
* channel.
*
* TODO: Handle different errors, it may be required to respond async.
*/
if (server->accept(conn, &chan) < 0) {
rsp->result = sys_cpu_to_le16(BT_L2CAP_LE_ERR_NO_RESOURCES);
err = server->accept(conn, &chan);
if (err < 0) {
rsp->result = sys_cpu_to_le16(le_err_to_result(err));
goto rsp;
}