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/fix_some_bluedroid_bugs_v5.1' into 'release/v5.1'

Browse Source 
Fixed some bluedroid bugs( backport v5.1)

See merge request espressif/esp-idf!24748
This commit is contained in:
Jiang Jiang Jian 2023-07-14 00:11:43 +08:00
commit aa5b7e0100
8 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/bt/host/bluedroid/bta/dm/bta_dm_act.c
View File

@ -982,10 +982,6 @@ static void bta_dm_process_remove_device(BD_ADDR bd_addr, tBT_TRANSPORT transpor
BTM_SecDeleteDevice(bd_addr, transport); BTM_SecDeleteDevice(bd_addr, transport);
#if (BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE)
/* remove all cached GATT information */
BTA_GATTC_Refresh(bd_addr, false);
#endif
if (bta_dm_cb.p_sec_cback) { if (bta_dm_cb.p_sec_cback) {
tBTA_DM_SEC sec_event; tBTA_DM_SEC sec_event;
bdcpy(sec_event.link_down.bd_addr, bd_addr); bdcpy(sec_event.link_down.bd_addr, bd_addr);
@ -1140,8 +1136,6 @@ void bta_dm_close_acl(tBTA_DM_MSG *p_data)
#if (BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE) #if (BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE)
/* need to remove all pending background connection if any */ /* need to remove all pending background connection if any */
BTA_GATTC_CancelOpen(0, p_remove_acl->bd_addr, FALSE); BTA_GATTC_CancelOpen(0, p_remove_acl->bd_addr, FALSE);
/* remove all cached GATT information */
BTA_GATTC_Refresh(p_remove_acl->bd_addr, false);
#endif #endif
} }
/* otherwise, no action needed */ /* otherwise, no action needed */
@ -3670,8 +3664,6 @@ void bta_dm_acl_change(tBTA_DM_MSG *p_data)
#if (BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE) #if (BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE)
/* need to remove all pending background connection */ /* need to remove all pending background connection */
BTA_GATTC_CancelOpen(0, p_bda, FALSE); BTA_GATTC_CancelOpen(0, p_bda, FALSE);
/* remove all cached GATT information */
BTA_GATTC_Refresh(p_bda, false);
#endif #endif
} }
@ -3849,8 +3841,6 @@ static BOOLEAN bta_dm_remove_sec_dev_entry(BD_ADDR remote_bd_addr)
#if (BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE) #if (BLE_INCLUDED == TRUE && GATTC_INCLUDED == TRUE)
/* need to remove all pending background connection */ /* need to remove all pending background connection */
BTA_GATTC_CancelOpen(0, remote_bd_addr, FALSE); BTA_GATTC_CancelOpen(0, remote_bd_addr, FALSE);
/* remove all cached GATT information */
BTA_GATTC_Refresh(remote_bd_addr, false);
#endif #endif
} }
return is_device_deleted; return is_device_deleted;

2
components/bt/host/bluedroid/bta/gatt/bta_gattc_act.c
View File

@ -823,8 +823,6 @@ void bta_gattc_close(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
bta_sys_conn_close( BTA_ID_GATTC , BTA_ALL_APP_ID, p_clcb->bda); bta_sys_conn_close( BTA_ID_GATTC , BTA_ALL_APP_ID, p_clcb->bda);
} }
bta_gattc_clcb_dealloc(p_clcb);
if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) { if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) {
cb_data.close.status = GATT_Disconnect(p_data->hdr.layer_specific); cb_data.close.status = GATT_Disconnect(p_data->hdr.layer_specific);
} else if (p_data->hdr.event == BTA_GATTC_INT_DISCONN_EVT) { } else if (p_data->hdr.event == BTA_GATTC_INT_DISCONN_EVT) {

10
components/bt/host/bluedroid/bta/gatt/bta_gattc_utils.c
View File

@ -322,6 +322,15 @@ void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB *p_clcb)
} }
} }
void bta_gattc_clcb_dealloc_by_conn_id(UINT16 conn_id)
{
tBTA_GATTC_CLCB *p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);
if (p_clcb) {
bta_gattc_clcb_dealloc(p_clcb);
}
}
/******************************************************************************* /*******************************************************************************
** **
** Function bta_gattc_find_srcb ** Function bta_gattc_find_srcb
@ -421,6 +430,7 @@ tBTA_GATTC_SERV *bta_gattc_srcb_alloc(BD_ADDR bda)
{ {
if (p_tcb->p_srvc_cache != NULL) { if (p_tcb->p_srvc_cache != NULL) {
list_free(p_tcb->p_srvc_cache); list_free(p_tcb->p_srvc_cache);
p_tcb->p_srvc_cache = NULL;
} }
osi_free(p_tcb->p_srvc_list); osi_free(p_tcb->p_srvc_list);
p_tcb->p_srvc_list = NULL; p_tcb->p_srvc_list = NULL;

2
components/bt/host/bluedroid/bta/include/bta/bta_gatt_api.h
View File

@ -1543,6 +1543,8 @@ extern void BTA_GATTS_Listen(tBTA_GATTS_IF server_if, BOOLEAN start,
BD_ADDR_PTR target_bda); BD_ADDR_PTR target_bda);
extern void bta_gattc_clcb_dealloc_by_conn_id(UINT16 conn_id);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
components/bt/host/bluedroid/btc/profile/std/gatt/btc_gattc.c
View File

@ -922,6 +922,8 @@ void btc_gattc_cb_handler(btc_msg_t *msg)
case BTA_GATTC_CLOSE_EVT: { case BTA_GATTC_CLOSE_EVT: {
tBTA_GATTC_CLOSE *close = &arg->close; tBTA_GATTC_CLOSE *close = &arg->close;
// Free gattc clcb in BTC task to avoid race condition
bta_gattc_clcb_dealloc_by_conn_id(close->conn_id);
gattc_if = close->client_if; gattc_if = close->client_if;
param.close.status = close->status; param.close.status = close->status;
param.close.conn_id = BTC_GATT_GET_CONN_ID(close->conn_id); param.close.conn_id = BTC_GATT_GET_CONN_ID(close->conn_id);

1
components/bt/host/bluedroid/stack/include/stack/l2c_api.h
View File

@ -1240,6 +1240,7 @@ extern BOOLEAN L2CA_CheckIsCongest(UINT16 fixed_cid, BD_ADDR addr);
#define L2CA_DECREASE_BTU_NUM 4 #define L2CA_DECREASE_BTU_NUM 4
#define L2CA_BUFF_INI 5 #define L2CA_BUFF_INI 5
#define L2CA_BUFF_DEINIT 6 #define L2CA_BUFF_DEINIT 6
#define L2CA_BUFF_FREE 7
typedef struct { typedef struct {
UINT16 conn_id; UINT16 conn_id;

6
components/bt/host/bluedroid/stack/l2cap/l2c_api.c
View File

@ -2386,6 +2386,12 @@ void l2ble_update_att_acl_pkt_num(UINT8 type, tl2c_buff_param_t *param)
buff_semaphore = NULL; buff_semaphore = NULL;
break; break;
} }
case L2CA_BUFF_FREE:{
xSemaphoreTake(buff_semaphore, portMAX_DELAY);
// Do nothing
xSemaphoreGive(buff_semaphore);
break;
}
default: default:
break; break;
} }

6
components/bt/host/bluedroid/stack/l2cap/l2c_utils.c
View File

@ -1676,6 +1676,12 @@ void l2cu_release_ccb (tL2C_CCB *p_ccb)
if (!p_ccb->in_use) { if (!p_ccb->in_use) {
return; return;
} }
#if BLE_INCLUDED == TRUE
if (p_lcb->transport == BT_TRANSPORT_LE) {
/* Take samephore to avoid race condition */
l2ble_update_att_acl_pkt_num(L2CA_BUFF_FREE, NULL);
}
#endif
#if (SDP_INCLUDED == TRUE) #if (SDP_INCLUDED == TRUE)
if (p_rcb && (p_rcb->psm != p_rcb->real_psm)) { if (p_rcb && (p_rcb->psm != p_rcb->real_psm)) {
btm_sec_clr_service_by_psm(p_rcb->psm); btm_sec_clr_service_by_psm(p_rcb->psm);