michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Change l2cap accept callback return error

Browse source 
This changes EKEYREJECTED to EPERM due to newlib dependencies
errors.

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This commit is contained in:
Mariusz Skamra 2018-10-26 17:09:58 +02:00 • committed by Johan Hedberg
commit 74318e61ca
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bluetooth/l2cap.h
View file

@ -249,7 +249,7 @@ struct bt_l2cap_server {
* 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.
* -EPERM if encryption key size is too short.
*/
int (*accept)(struct bt_conn *conn, struct bt_l2cap_chan **chan);

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

@ -730,7 +730,7 @@ static u16_t le_err_to_result(int err)
return BT_L2CAP_LE_ERR_NO_RESOURCES;
case -EACCES:
return BT_L2CAP_LE_ERR_AUTHORIZATION;
case -EKEYREJECTED:
case -EPERM:
return BT_L2CAP_LE_ERR_KEY_SIZE;
default:
return BT_L2CAP_LE_ERR_UNACCEPT_PARAMS;

2
subsys/bluetooth/shell/l2cap.c
View file

@ -175,7 +175,7 @@ static int l2cap_accept_policy(struct bt_conn *conn)
u8_t enc_key_size = bt_conn_enc_key_size(conn);
if (enc_key_size && enc_key_size < BT_ENC_KEY_SIZE_MAX) {
return -EKEYREJECTED;
return -EPERM;
}
} else if (l2cap_policy == L2CAP_POLICY_WHITELIST) {
for (i = 0; i < ARRAY_SIZE(l2cap_whitelist); i++) {