michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Move reset_pairing call to bt_conn_security_changed

Browse source 
Move call to reset_pairing to bt_conn_security_changed, since this
should always be done at the same time, and should be done in the same
order for all calls. For auth_complete this was reset after the
callbacks, which is inconsistent with the other events.

Also call it even if not connected anymore, the disconnection complete
event will be delivered after this event. Callback should alway be
called if security was initiated.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-08-03 12:25:43 +02:00 • committed by Carles Cufí
commit 487d2be749
2 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/bluetooth/host/conn.c
View file

@ -1071,11 +1071,26 @@ uint8_t bt_conn_enc_key_size(struct bt_conn *conn)
return 0;
}
static void reset_pairing(struct bt_conn *conn)
{
#if defined(CONFIG_BT_BREDR)
if (conn->type == BT_CONN_TYPE_BR) {
atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING);
atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING_INITIATOR);
atomic_clear_bit(conn->flags, BT_CONN_BR_LEGACY_SECURE);
}
#endif /* CONFIG_BT_BREDR */
/* Reset required security level to current operational */
conn->required_sec_level = conn->sec_level;
}
void bt_conn_security_changed(struct bt_conn *conn, uint8_t hci_err,
enum bt_security_err err)
{
struct bt_conn_cb *cb;
reset_pairing(conn);
bt_l2cap_security_changed(conn, hci_err);
for (cb = callback_list; cb; cb = cb->_next) {

33
subsys/bluetooth/host/hci_core.c
View file

@ -2714,20 +2714,6 @@ static enum bt_security_err security_err_get(uint8_t hci_err)
return BT_SECURITY_ERR_UNSPECIFIED;
}
}
static void reset_pairing(struct bt_conn *conn)
{
#if defined(CONFIG_BT_BREDR)
if (conn->type == BT_CONN_TYPE_BR) {
atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING);
atomic_clear_bit(conn->flags, BT_CONN_BR_PAIRING_INITIATOR);
atomic_clear_bit(conn->flags, BT_CONN_BR_LEGACY_SECURE);
}
#endif /* CONFIG_BT_BREDR */
/* Reset required security level to current operational */
conn->required_sec_level = conn->sec_level;
}
#endif /* defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR) */
#if defined(CONFIG_BT_BREDR)
@ -3693,15 +3679,12 @@ static void auth_complete(struct net_buf *buf)
}
if (evt->status) {
if (conn->state == BT_CONN_CONNECTED) {
/*
* Inform layers above HCI about non-zero authentication
* status to make them able cleanup pending jobs.
*/
bt_conn_security_changed(conn, evt->status,
security_err_get(evt->status));
}
reset_pairing(conn);
/*
* Inform layers above HCI about non-zero authentication
* status to make them able cleanup pending jobs.
*/
bt_conn_security_changed(conn, evt->status,
security_err_get(evt->status));
} else {
link_encr(handle);
}
@ -4147,7 +4130,6 @@ static void hci_encrypt_change(struct net_buf *buf)
}
if (evt->status) {
reset_pairing(conn);
bt_conn_security_changed(conn, evt->status,
security_err_get(evt->status));
bt_conn_unref(conn);
@ -4191,7 +4173,6 @@ static void hci_encrypt_change(struct net_buf *buf)
}
}
#endif /* CONFIG_BT_BREDR */
reset_pairing(conn);
bt_conn_security_changed(conn, evt->status, BT_SECURITY_ERR_SUCCESS);
@ -4215,7 +4196,6 @@ static void hci_encrypt_key_refresh_complete(struct net_buf *buf)
}
if (evt->status) {
reset_pairing(conn);
bt_conn_security_changed(conn, evt->status,
security_err_get(evt->status));
bt_conn_unref(conn);
@ -4243,7 +4223,6 @@ static void hci_encrypt_key_refresh_complete(struct net_buf *buf)
}
#endif /* CONFIG_BT_BREDR */
reset_pairing(conn);
bt_conn_security_changed(conn, evt->status, BT_SECURITY_ERR_SUCCESS);
bt_conn_unref(conn);
}