michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: BR/EDR: Refactor internals of 'Cancel' authentication API

Browse source 
For better code readability use 'switch-case' statement selecting valid
authentication cancel method. Adds also legacy pairing (pre-SSP) as first
item in valid paring method set.

Change-Id: I4d9c5178526cd5210b844878360d12b58b99a24f
Signed-off-by: Arkadiusz Lichwa <arkadiusz.lichwa@tieto.com>
This commit is contained in:
Arkadiusz Lichwa 2016-03-21 14:01:19 +01:00 • committed by Johan Hedberg
commit 435ccd3e81
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
net/bluetooth/conn.c
View file

@ -65,6 +65,7 @@ static struct bt_conn_cb *callback_list;
#if defined(CONFIG_BLUETOOTH_BREDR)
enum pairing_method {
LEGACY, /* Legacy (pre-SSP) pairing */
JUST_WORKS, /* JustWorks pairing */
PASSKEY_INPUT, /* Passkey Entry input */
PASSKEY_DISPLAY, /* Passkey Entry display */
@ -1510,20 +1511,20 @@ int bt_conn_auth_cancel(struct bt_conn *conn)
return -EPERM;
}
if (conn->br.pairing_method == PASSKEY_CONFIRM) {
switch (conn->br.pairing_method) {
case JUST_WORKS:
case PASSKEY_CONFIRM:
return ssp_confirm_neg_reply(conn);
}
if (conn->br.pairing_method == PASSKEY_INPUT) {
case PASSKEY_INPUT:
return ssp_passkey_neg_reply(conn);
}
if (conn->br.pairing_method == PASSKEY_DISPLAY) {
case PASSKEY_DISPLAY:
return bt_conn_disconnect(conn,
BT_HCI_ERR_AUTHENTICATION_FAIL);
}
case LEGACY:
return pin_code_neg_reply(&conn->br.dst);
default:
break;
}
}
#endif /* CONFIG_BLUETOOTH_BREDR */