feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_spp_initiator_connect_failed_v4.2' into 'release/v4.2'

Browse Source 
Component_bt/Fix SPP initiator can not free resource when connection is failed[backport 4.2]

See merge request espressif/esp-idf!17746
This commit is contained in:
Wang Meng Yang
2022-04-19 15:49:12 +08:00
parent 7cb3e99740 0c2c192013
commit d8105a565e
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/bt/host/bluedroid/btc/profile/std/spp/btc_spp.c
View File

@@ -352,6 +352,20 @@ static void *btc_spp_rfcomm_inter_cb(tBTA_JV_EVT event, tBTA_JV *p_data, void *u
} }
new_user_data = (void *)(uintptr_t)slot->id; new_user_data = (void *)(uintptr_t)slot->id;
break; break;
case BTA_JV_RFCOMM_CL_INIT_EVT:
slot = spp_find_slot_by_id(id);
if (!slot) {
BTC_TRACE_ERROR("%s unable to find RFCOMM slot, event:%d!", __func__, event);
p_data->rfc_cl_init.status = ESP_SPP_FAILURE;
break;
}
if (p_data->rfc_cl_init.status == BTA_JV_SUCCESS) {
slot->rfc_handle = p_data->rfc_cl_init.handle;
} else {
spp_free_slot(slot);
}
break;
case BTA_JV_RFCOMM_OPEN_EVT: case BTA_JV_RFCOMM_OPEN_EVT:
slot = spp_find_slot_by_id(id); slot = spp_find_slot_by_id(id);
if (!slot) { if (!slot) {
@@ -359,7 +373,7 @@ static void *btc_spp_rfcomm_inter_cb(tBTA_JV_EVT event, tBTA_JV *p_data, void *u
p_data->rfc_open.status = ESP_SPP_NO_CONNECTION; p_data->rfc_open.status = ESP_SPP_NO_CONNECTION;
break; break;
} }
slot->connected = TRUE; slot->connected = true;
slot->rfc_handle = p_data->rfc_open.handle; slot->rfc_handle = p_data->rfc_open.handle;
slot->rfc_port_handle = BTA_JvRfcommGetPortHdl(p_data->rfc_open.handle); slot->rfc_port_handle = BTA_JvRfcommGetPortHdl(p_data->rfc_open.handle);
BTA_JvSetPmProfile(p_data->rfc_open.handle, BTA_JV_PM_ID_1, BTA_JV_CONN_OPEN); BTA_JvSetPmProfile(p_data->rfc_open.handle, BTA_JV_PM_ID_1, BTA_JV_CONN_OPEN);
@@ -371,7 +385,7 @@ static void *btc_spp_rfcomm_inter_cb(tBTA_JV_EVT event, tBTA_JV *p_data, void *u
p_data->rfc_close.status = ESP_SPP_NO_CONNECTION; p_data->rfc_close.status = ESP_SPP_NO_CONNECTION;
break; break;
} }
if (slot->connected && p_data->rfc_close.port_status != PORT_LOCAL_CLOSED) { if (slot->rfc_handle && p_data->rfc_close.port_status != PORT_LOCAL_CLOSED) {
BTA_JvRfcommClose(slot->rfc_handle, NULL, (void *)slot->id); BTA_JvRfcommClose(slot->rfc_handle, NULL, (void *)slot->id);
} }
p_data->rfc_close.status = BTA_JV_SUCCESS; p_data->rfc_close.status = BTA_JV_SUCCESS;
@@ -1056,6 +1070,7 @@ void btc_spp_cb_handler(btc_msg_t *msg)
BT_HDR *p_buf; BT_HDR *p_buf;
serial = slot->serial; serial = slot->serial;
if ((p_buf = fixed_queue_try_peek_first(slot->tx.queue)) == NULL) { if ((p_buf = fixed_queue_try_peek_first(slot->tx.queue)) == NULL) {
osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
break; break;
} }
if (p_data->rfc_write.status == BTA_JV_SUCCESS) { if (p_data->rfc_write.status == BTA_JV_SUCCESS) {