kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/a2dp_can_not_connect_after_ble_connected_v5.0' into 'release/v5.0'
fixed the issue iOS devices cannot initiate connection (v5.0) See merge request espressif/esp-idf!20403pull/10970/head
commit
7bd5af7f1e
|
@ -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);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4024,7 +4024,9 @@ void btm_sec_auth_complete (UINT16 handle, UINT8 status)
|
|||
return;
|
||||
}
|
||||
|
||||
p_dev_rec->sec_flags |= BTM_SEC_AUTHENTICATED;
|
||||
if (!(p_dev_rec->sm4 & BTM_SM4_UPGRADE)) {
|
||||
p_dev_rec->sec_flags |= BTM_SEC_AUTHENTICATED;
|
||||
}
|
||||
|
||||
if (p_dev_rec->pin_code_length >= 16 ||
|
||||
p_dev_rec->link_key_type == BTM_LKEY_TYPE_AUTH_COMB ||
|
||||
|
|
|
@ -87,7 +87,8 @@ BOOLEAN l2c_link_hci_conn_req (BD_ADDR bd_addr)
|
|||
|
||||
if (p_lcb_cur->in_use) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue