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

fix(bt/bluedroid): Fix BLE robost cashing config

Browse Source
This commit is contained in:
zhanghaipeng 2023-12-05 15:19:21 +08:00
parent bc2389029c
commit 3241fd237b
6 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/bt/host/bluedroid/Kconfig.in
View File

@ -222,7 +222,10 @@ config BT_GATTS_ROBUST_CACHING_ENABLED
depends on BT_GATTS_ENABLE depends on BT_GATTS_ENABLE
default n default n
help help
This option enable gatt robust caching feature on server This option enables the GATT robust caching feature on the server.
if turned on, the Client Supported Features characteristic, Database Hash characteristic,
and Server Supported Features characteristic will be included in the GAP SERVICE.
config BT_GATTS_DEVICE_NAME_WRITABLE config BT_GATTS_DEVICE_NAME_WRITABLE
bool "Allow to write device name by GATT clients" bool "Allow to write device name by GATT clients"

9
components/bt/host/bluedroid/stack/gatt/gatt_api.c
View File

@ -122,6 +122,7 @@ BOOLEAN GATTS_NVRegister (const tGATT_APPL_INFO *p_cb_info)
return status; return status;
} }
#if GATTS_ROBUST_CACHING_ENABLED
static void gatt_update_for_database_change(void) static void gatt_update_for_database_change(void)
{ {
UINT8 i; UINT8 i;
@ -135,7 +136,7 @@ static void gatt_update_for_database_change(void)
} }
} }
} }
#endif /* GATTS_ROBUST_CACHING_ENABLED */
/******************************************************************************* /*******************************************************************************
** **
** Function GATTS_CreateService ** Function GATTS_CreateService
@ -414,7 +415,9 @@ BOOLEAN GATTS_DeleteService (tGATT_IF gatt_if, tBT_UUID *p_svc_uuid, UINT16 svc_
GATT_TRACE_DEBUG ("Delete a new service changed item - the service has not yet started"); GATT_TRACE_DEBUG ("Delete a new service changed item - the service has not yet started");
osi_free(fixed_queue_try_remove_from_queue(gatt_cb.pending_new_srv_start_q, p_buf)); osi_free(fixed_queue_try_remove_from_queue(gatt_cb.pending_new_srv_start_q, p_buf));
} else { } else {
#if GATTS_ROBUST_CACHING_ENABLED
gatt_update_for_database_change(); gatt_update_for_database_change();
#endif /* GATTS_ROBUST_CACHING_ENABLED */
if (gatt_cb.srv_chg_mode == GATTS_SEND_SERVICE_CHANGE_AUTO) { if (gatt_cb.srv_chg_mode == GATTS_SEND_SERVICE_CHANGE_AUTO) {
gatt_proc_srv_chg(); gatt_proc_srv_chg();
} }
@ -527,7 +530,11 @@ tGATT_STATUS GATTS_StartService (tGATT_IF gatt_if, UINT16 service_handle,
if ( (p_buf = gatt_sr_is_new_srv_chg(&p_list->asgn_range.app_uuid128, if ( (p_buf = gatt_sr_is_new_srv_chg(&p_list->asgn_range.app_uuid128,
&p_list->asgn_range.svc_uuid, &p_list->asgn_range.svc_uuid,
p_list->asgn_range.svc_inst)) != NULL) { p_list->asgn_range.svc_inst)) != NULL) {
#if GATTS_ROBUST_CACHING_ENABLED
gatt_update_for_database_change(); gatt_update_for_database_change();
#endif /* GATTS_ROBUST_CACHING_ENABLED */
if (gatt_cb.srv_chg_mode == GATTS_SEND_SERVICE_CHANGE_AUTO) { if (gatt_cb.srv_chg_mode == GATTS_SEND_SERVICE_CHANGE_AUTO) {
gatt_proc_srv_chg(); gatt_proc_srv_chg();
} }

35
components/bt/host/bluedroid/stack/gatt/gatt_attr.c
View File

@ -40,7 +40,13 @@
#define BLE_GATT_CL_SUPP_FEAT_BITMASK 0x07 #define BLE_GATT_CL_SUPP_FEAT_BITMASK 0x07
#define GATTP_MAX_NUM_INC_SVR 0 #define GATTP_MAX_NUM_INC_SVR 0
#if GATTS_ROBUST_CACHING_ENABLED
#define GATTP_MAX_CHAR_NUM 5 #define GATTP_MAX_CHAR_NUM 5
#else
#define GATTP_MAX_CHAR_NUM 2
#endif /* GATTS_ROBUST_CACHING_ENABLED */
#define GATTP_MAX_ATTR_NUM (GATTP_MAX_CHAR_NUM * 2 + GATTP_MAX_NUM_INC_SVR + 1) #define GATTP_MAX_ATTR_NUM (GATTP_MAX_CHAR_NUM * 2 + GATTP_MAX_NUM_INC_SVR + 1)
#define GATTP_MAX_CHAR_VALUE_SIZE 50 #define GATTP_MAX_CHAR_VALUE_SIZE 50
@ -196,14 +202,15 @@ tGATT_STATUS gatt_proc_read (UINT16 conn_id, tGATTS_REQ_TYPE type, tGATT_READ_RE
GATT_TRACE_DEBUG("%s handle %x", __func__, p_data->handle); GATT_TRACE_DEBUG("%s handle %x", __func__, p_data->handle);
UINT8 tcb_idx = GATT_GET_TCB_IDX(conn_id);
tGATT_TCB *tcb = gatt_get_tcb_by_idx(tcb_idx);
if (p_data->is_long) { if (p_data->is_long) {
p_rsp->attr_value.offset = p_data->offset; p_rsp->attr_value.offset = p_data->offset;
} }
p_rsp->attr_value.handle = p_data->handle; p_rsp->attr_value.handle = p_data->handle;
#if GATTS_ROBUST_CACHING_ENABLED
UINT8 tcb_idx = GATT_GET_TCB_IDX(conn_id);
tGATT_TCB *tcb = gatt_get_tcb_by_idx(tcb_idx);
/* handle request for reading client supported features */ /* handle request for reading client supported features */
if (p_data->handle == gatt_cb.handle_of_cl_supported_feat) { if (p_data->handle == gatt_cb.handle_of_cl_supported_feat) {
@ -229,7 +236,7 @@ tGATT_STATUS gatt_proc_read (UINT16 conn_id, tGATTS_REQ_TYPE type, tGATT_READ_RE
memcpy(p_rsp->attr_value.value, &gatt_cb.gatt_sr_supported_feat_mask, 1); memcpy(p_rsp->attr_value.value, &gatt_cb.gatt_sr_supported_feat_mask, 1);
return GATT_SUCCESS; return GATT_SUCCESS;
} }
#endif /* GATTS_ROBUST_CACHING_ENABLED */
/* handle request for reading service changed des and the others */ /* handle request for reading service changed des and the others */
status = GATTS_GetAttributeValue(p_data->handle, &len, &value); status = GATTS_GetAttributeValue(p_data->handle, &len, &value);
if(status == GATT_SUCCESS && len > 0 && value) { if(status == GATT_SUCCESS && len > 0 && value) {
@ -241,7 +248,7 @@ tGATT_STATUS gatt_proc_read (UINT16 conn_id, tGATTS_REQ_TYPE type, tGATT_READ_RE
} }
return status; return status;
} }
#if GATTS_ROBUST_CACHING_ENABLED
static tGATT_STATUS gatt_sr_write_cl_supp_feat(UINT16 conn_id, tGATT_WRITE_REQ *p_data) static tGATT_STATUS gatt_sr_write_cl_supp_feat(UINT16 conn_id, tGATT_WRITE_REQ *p_data)
{ {
UINT8 val_new; UINT8 val_new;
@ -286,7 +293,7 @@ static tGATT_STATUS gatt_sr_write_cl_supp_feat(UINT16 conn_id, tGATT_WRITE_REQ *
#endif #endif
return GATT_SUCCESS; return GATT_SUCCESS;
} }
#endif /* GATTS_ROBUST_CACHING_ENABLED */
/****************************************************************************** /******************************************************************************
** **
** Function gatt_proc_write_req ** Function gatt_proc_write_req
@ -301,7 +308,7 @@ tGATT_STATUS gatt_proc_write_req(UINT16 conn_id, tGATTS_REQ_TYPE type, tGATT_WRI
if(p_data->len > GATT_MAX_ATTR_LEN) { if(p_data->len > GATT_MAX_ATTR_LEN) {
p_data->len = GATT_MAX_ATTR_LEN; p_data->len = GATT_MAX_ATTR_LEN;
} }
#if GATTS_ROBUST_CACHING_ENABLED
if (p_data->handle == gatt_cb.handle_of_h_r) { if (p_data->handle == gatt_cb.handle_of_h_r) {
return GATT_WRITE_NOT_PERMIT; return GATT_WRITE_NOT_PERMIT;
} }
@ -317,7 +324,7 @@ tGATT_STATUS gatt_proc_write_req(UINT16 conn_id, tGATTS_REQ_TYPE type, tGATT_WRI
if (p_data->handle == gatt_cb.handle_of_sr_supported_feat) { if (p_data->handle == gatt_cb.handle_of_sr_supported_feat) {
return GATT_WRITE_NOT_PERMIT; return GATT_WRITE_NOT_PERMIT;
} }
#endif /* GATTS_ROBUST_CACHING_ENABLED */
return GATTS_SetAttributeValue(p_data->handle, return GATTS_SetAttributeValue(p_data->handle,
p_data->len, p_data->len,
p_data->value); p_data->value);
@ -470,7 +477,7 @@ void gatt_profile_db_init (void)
}; };
GATTS_AddCharDescriptor (service_handle, GATT_PERM_READ | GATT_PERM_WRITE , &descr_uuid, &attr_val, NULL); GATTS_AddCharDescriptor (service_handle, GATT_PERM_READ | GATT_PERM_WRITE , &descr_uuid, &attr_val, NULL);
#if GATTS_ROBUST_CACHING_ENABLED
/* add Client Supported Features characteristic */ /* add Client Supported Features characteristic */
uuid.uu.uuid16 = GATT_UUID_CLIENT_SUP_FEAT; uuid.uu.uuid16 = GATT_UUID_CLIENT_SUP_FEAT;
gatt_cb.handle_of_cl_supported_feat = GATTS_AddCharacteristic(service_handle, &uuid, GATT_PERM_READ | GATT_PERM_WRITE, gatt_cb.handle_of_cl_supported_feat = GATTS_AddCharacteristic(service_handle, &uuid, GATT_PERM_READ | GATT_PERM_WRITE,
@ -483,7 +490,7 @@ void gatt_profile_db_init (void)
/* add Server Supported Features characteristic */ /* add Server Supported Features characteristic */
uuid.uu.uuid16 = GATT_UUID_SERVER_SUP_FEAT; uuid.uu.uuid16 = GATT_UUID_SERVER_SUP_FEAT;
gatt_cb.handle_of_sr_supported_feat = GATTS_AddCharacteristic(service_handle, &uuid, GATT_PERM_READ, GATT_CHAR_PROP_BIT_READ, NULL, NULL); gatt_cb.handle_of_sr_supported_feat = GATTS_AddCharacteristic(service_handle, &uuid, GATT_PERM_READ, GATT_CHAR_PROP_BIT_READ, NULL, NULL);
#endif /* GATTS_ROBUST_CACHING_ENABLED */
/* start service */ /* start service */
status = GATTS_StartService (gatt_cb.gatt_if, service_handle, GATTP_TRANSPORT_SUPPORTED ); status = GATTS_StartService (gatt_cb.gatt_if, service_handle, GATTP_TRANSPORT_SUPPORTED );
@ -689,6 +696,7 @@ void GATT_ConfigServiceChangeCCC (BD_ADDR remote_bda, BOOLEAN enable, tBT_TRANSP
gatt_cl_start_config_ccc(p_clcb); gatt_cl_start_config_ccc(p_clcb);
} }
#if GATTS_ROBUST_CACHING_ENABLED
/******************************************************************************* /*******************************************************************************
** **
** Function gatt_sr_is_cl_robust_caching_supported ** Function gatt_sr_is_cl_robust_caching_supported
@ -700,14 +708,8 @@ void GATT_ConfigServiceChangeCCC (BD_ADDR remote_bda, BOOLEAN enable, tBT_TRANSP
*******************************************************************************/ *******************************************************************************/
static BOOLEAN gatt_sr_is_cl_robust_caching_supported(tGATT_TCB *p_tcb) static BOOLEAN gatt_sr_is_cl_robust_caching_supported(tGATT_TCB *p_tcb)
{ {
// Server robust caching not enabled
if (!GATTS_ROBUST_CACHING_ENABLED) {
return FALSE;
}
return (p_tcb->cl_supp_feat & BLE_GATT_CL_SUPP_FEAT_ROBUST_CACHING_BITMASK); return (p_tcb->cl_supp_feat & BLE_GATT_CL_SUPP_FEAT_ROBUST_CACHING_BITMASK);
} }
/******************************************************************************* /*******************************************************************************
** **
** Function gatt_sr_is_cl_change_aware ** Function gatt_sr_is_cl_change_aware
@ -791,4 +793,5 @@ void gatt_sr_update_cl_status(tGATT_TCB *p_tcb, BOOLEAN chg_aware)
GATT_TRACE_DEBUG("%s status %d", __func__, chg_aware); GATT_TRACE_DEBUG("%s status %d", __func__, chg_aware);
} }
#endif /* GATTS_ROBUST_CACHING_ENABLED */
#endif /* BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE */ #endif /* BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE */

8
components/bt/host/bluedroid/stack/gatt/gatt_sr.c
View File

@ -1681,9 +1681,10 @@ static BOOLEAN gatts_proc_ind_ack(tGATT_TCB *p_tcb, UINT16 ack_handle)
gatts_proc_srv_chg_ind_ack(p_tcb); gatts_proc_srv_chg_ind_ack(p_tcb);
/* there is no need to inform the application since srv chg is handled internally by GATT */ /* there is no need to inform the application since srv chg is handled internally by GATT */
continue_processing = FALSE; continue_processing = FALSE;
#if GATTS_ROBUST_CACHING_ENABLED
/* after receiving ack of svc_chg_ind, reset client status */ /* after receiving ack of svc_chg_ind, reset client status */
gatt_sr_update_cl_status(p_tcb, true); gatt_sr_update_cl_status(p_tcb, true);
#endif /* GATTS_ROBUST_CACHING_ENABLED */
} }
gatts_chk_pending_ind(p_tcb); gatts_chk_pending_ind(p_tcb);
@ -1730,6 +1731,7 @@ void gatts_process_value_conf(tGATT_TCB *p_tcb, UINT8 op_code)
} }
} }
#if GATTS_ROBUST_CACHING_ENABLED
static BOOLEAN gatts_handle_db_out_of_sync(tGATT_TCB *p_tcb, UINT8 op_code, static BOOLEAN gatts_handle_db_out_of_sync(tGATT_TCB *p_tcb, UINT8 op_code,
UINT16 len, UINT8 *p_data) UINT16 len, UINT8 *p_data)
{ {
@ -1809,6 +1811,7 @@ static BOOLEAN gatts_handle_db_out_of_sync(tGATT_TCB *p_tcb, UINT8 op_code,
return should_ignore; return should_ignore;
} }
#endif /* GATTS_ROBUST_CACHING_ENABLED */
/******************************************************************************* /*******************************************************************************
** **
** Function gatt_server_handle_client_req ** Function gatt_server_handle_client_req
@ -1840,11 +1843,12 @@ void gatt_server_handle_client_req (tGATT_TCB *p_tcb, UINT8 op_code,
} }
/* otherwise, ignore the pkt */ /* otherwise, ignore the pkt */
} else { } else {
#if GATTS_ROBUST_CACHING_ENABLED
// handle database out of sync // handle database out of sync
if (gatts_handle_db_out_of_sync(p_tcb, op_code, len, p_data)) { if (gatts_handle_db_out_of_sync(p_tcb, op_code, len, p_data)) {
return; return;
} }
#endif /* GATTS_ROBUST_CACHING_ENABLED */
switch (op_code) { switch (op_code) {
case GATT_REQ_READ_BY_GRP_TYPE: /* discover primary services */ case GATT_REQ_READ_BY_GRP_TYPE: /* discover primary services */
case GATT_REQ_FIND_TYPE_VALUE: /* discover service by UUID */ case GATT_REQ_FIND_TYPE_VALUE: /* discover service by UUID */

4
components/bt/host/bluedroid/stack/gatt/gatt_utils.c
View File

@ -1090,9 +1090,9 @@ tGATT_TCB *gatt_allocate_tcb_by_bdaddr(BD_ADDR bda, tBT_TRANSPORT transport)
p_tcb->transport = transport; p_tcb->transport = transport;
} }
memcpy(p_tcb->peer_bda, bda, BD_ADDR_LEN); memcpy(p_tcb->peer_bda, bda, BD_ADDR_LEN);
#if (GATTS_INCLUDED == TRUE) #if GATTS_ROBUST_CACHING_ENABLED
gatt_sr_init_cl_status(p_tcb); gatt_sr_init_cl_status(p_tcb);
#endif ///GATTS_INCLUDED == TRUE #endif /* GATTS_ROBUST_CACHING_ENABLED */
} }
return p_tcb; return p_tcb;
} }

2
components/bt/host/bluedroid/stack/gatt/include/gatt_int.h
View File

@ -539,6 +539,7 @@ typedef struct {
tGATT_PROFILE_CLCB profile_clcb[GATT_MAX_APPS]; tGATT_PROFILE_CLCB profile_clcb[GATT_MAX_APPS];
#endif ///GATTS_INCLUDED == TRUE #endif ///GATTS_INCLUDED == TRUE
UINT16 handle_of_h_r; /* Handle of the handles reused characteristic value */ UINT16 handle_of_h_r; /* Handle of the handles reused characteristic value */
#if GATTS_ROBUST_CACHING_ENABLED
UINT16 handle_of_database_hash; UINT16 handle_of_database_hash;
UINT16 handle_of_cl_supported_feat; UINT16 handle_of_cl_supported_feat;
UINT16 handle_of_sr_supported_feat; UINT16 handle_of_sr_supported_feat;
@ -546,6 +547,7 @@ typedef struct {
UINT8 gatt_sr_supported_feat_mask; UINT8 gatt_sr_supported_feat_mask;
UINT8 gatt_cl_supported_feat_mask; UINT8 gatt_cl_supported_feat_mask;
#endif
tGATT_APPL_INFO cb_info; tGATT_APPL_INFO cb_info;