alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/a2dp_can_not_connect_after_ble_connected' into 'master'

Browse Source 
bugfix/fix the issue that bt can not connect after ble connected

Closes IDFGH-4754 and AUD-4085

See merge request espressif/esp-idf!18542
This commit is contained in:
Jiang Jiang Jian 2022-09-28 15:46:06 +08:00
commit dbdd8ee1a5
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/host/bluedroid/stack/btm/btm_acl.c
View File

@ -347,10 +347,6 @@ void btm_acl_created (BD_ADDR bda, DEV_CLASS dc, UINT8 bdn[BTM_MAX_REM_BD_NAME_L
btm_establish_continue (p); btm_establish_continue (p);
return; return;
} }
} else {
/* If remote features indicated secure connection (SC) mode, check the remote feautres again*/
/* this is to prevent from BIAS attack where attacker can downgrade SC mode*/
btm_read_remote_features (p->hci_handle);
} }
} }

2
components/bt/host/bluedroid/stack/btm/btm_sec.c
View File

@ -4024,7 +4024,9 @@ void btm_sec_auth_complete (UINT16 handle, UINT8 status)
return; return;
} }
if (!(p_dev_rec->sm4 & BTM_SM4_UPGRADE)) {
p_dev_rec->sec_flags |= BTM_SEC_AUTHENTICATED; p_dev_rec->sec_flags |= BTM_SEC_AUTHENTICATED;
}
if (p_dev_rec->pin_code_length >= 16 || if (p_dev_rec->pin_code_length >= 16 ||
p_dev_rec->link_key_type == BTM_LKEY_TYPE_AUTH_COMB || p_dev_rec->link_key_type == BTM_LKEY_TYPE_AUTH_COMB ||

3
components/bt/host/bluedroid/stack/l2cap/l2c_link.c
View File

@ -87,7 +87,8 @@ BOOLEAN l2c_link_hci_conn_req (BD_ADDR bd_addr)
if (p_lcb_cur->in_use) { if (p_lcb_cur->in_use) {
no_links = FALSE; no_links = FALSE;
p_lcb->link_role = HCI_ROLE_MASTER; // p_lcb->link_role = HCI_ROLE_MASTER;
p_lcb->link_role = HCI_ROLE_SLAVE;
break; break;
} }
} }