mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-18 14:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

gatt_client: emit connected if (shared) classic bearer already exists

Browse Source
This commit is contained in:
Matthias Ringwald 2023-07-04 18:43:58 +02:00
parent 1c7a19fe74
commit 74daebdebc
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ble/gatt_client.c
View File

@ -2996,6 +2996,14 @@ static void gatt_client_classic_sdp_start(void * context){
sdp_client_query_uuid16(gatt_client_classic_sdp_handler, gatt_client_classic_active_sdp_query->addr, ORG_BLUETOOTH_SERVICE_GENERIC_ATTRIBUTE); sdp_client_query_uuid16(gatt_client_classic_sdp_handler, gatt_client_classic_active_sdp_query->addr, ORG_BLUETOOTH_SERVICE_GENERIC_ATTRIBUTE);
} }
static void gatt_client_classic_emit_connected(void * context){
gatt_client_t * gatt_client = (gatt_client_t *) context;
gatt_client->gatt_client_state = P_READY;
hci_connection_t * hci_connection = hci_connection_for_handle(gatt_client->con_handle);
btstack_assert(hci_connection != NULL);
gatt_client_emit_connected(gatt_client->callback, ERROR_CODE_SUCCESS, hci_connection->address, gatt_client->con_handle);
}
uint8_t gatt_client_classic_connect(btstack_packet_handler_t callback, bd_addr_t addr){ uint8_t gatt_client_classic_connect(btstack_packet_handler_t callback, bd_addr_t addr){
gatt_client_t * gatt_client = gatt_client_get_context_for_classic_addr(addr); gatt_client_t * gatt_client = gatt_client_get_context_for_classic_addr(addr);
if (gatt_client != NULL){ if (gatt_client != NULL){
@ -3012,15 +3020,31 @@ uint8_t gatt_client_classic_connect(btstack_packet_handler_t callback, bd_addr_t
gatt_client->mtu = ATT_DEFAULT_MTU; gatt_client->mtu = ATT_DEFAULT_MTU;
gatt_client->security_level = LEVEL_0; gatt_client->security_level = LEVEL_0;
gatt_client->mtu_state = MTU_AUTO_EXCHANGE_DISABLED; gatt_client->mtu_state = MTU_AUTO_EXCHANGE_DISABLED;
gatt_client->gatt_client_state = P_W2_SDP_QUERY;
gatt_client->sdp_query_request.callback = &gatt_client_classic_sdp_start;
gatt_client->sdp_query_request.context = gatt_client;
gatt_client->callback = callback; gatt_client->callback = callback;
#ifdef ENABLE_GATT_OVER_EATT #ifdef ENABLE_GATT_OVER_EATT
gatt_client->eatt_state = GATT_CLIENT_EATT_IDLE; gatt_client->eatt_state = GATT_CLIENT_EATT_IDLE;
#endif #endif
btstack_linked_list_add(&gatt_client_connections, (btstack_linked_item_t*)gatt_client); btstack_linked_list_add(&gatt_client_connections, (btstack_linked_item_t*)gatt_client);
sdp_client_register_query_callback(&gatt_client->sdp_query_request);
// schedule emitted event if already connected, otherwise
bool already_connected = false;
hci_connection_t * hci_connection = hci_connection_for_bd_addr_and_type(addr, BD_ADDR_TYPE_ACL);
if (hci_connection != NULL){
if (hci_connection->att_server.l2cap_cid != 0){
already_connected = true;
}
}
gatt_client->sdp_query_request.context = gatt_client;
if (already_connected){
gatt_client->con_handle = hci_connection->con_handle;
gatt_client->sdp_query_request.callback = &gatt_client_classic_emit_connected;
gatt_client->gatt_client_state = P_W2_EMIT_CONNECTED;
btstack_run_loop_execute_on_main_thread(&gatt_client->sdp_query_request);
} else {
gatt_client->sdp_query_request.callback = &gatt_client_classic_sdp_start;
gatt_client->gatt_client_state = P_W2_SDP_QUERY;
sdp_client_register_query_callback(&gatt_client->sdp_query_request);
}
return ERROR_CODE_SUCCESS; return ERROR_CODE_SUCCESS;
} }

1
src/ble/gatt_client.h
View File

@ -137,6 +137,7 @@ typedef enum {
P_W2_SDP_QUERY, P_W2_SDP_QUERY,
P_W4_SDP_QUERY, P_W4_SDP_QUERY,
P_W4_L2CAP_CONNECTION, P_W4_L2CAP_CONNECTION,
P_W2_EMIT_CONNECTED,
} gatt_client_state_t; } gatt_client_state_t;