}
}
-void btif_to_bta_gatt_id(tBTA_GATT_ID *p_dest, btgatt_gatt_id_t *p_src)
-{
- p_dest->inst_id = p_src->inst_id;
- btif_to_bta_uuid(&p_dest->uuid, &p_src->uuid);
-}
-
-void btif_to_bta_srvc_id(tBTA_GATT_SRVC_ID *p_dest, btgatt_srvc_id_t *p_src)
-{
- p_dest->id.inst_id = p_src->id.inst_id;
- btif_to_bta_uuid(&p_dest->id.uuid, &p_src->id.uuid);
- p_dest->is_primary = p_src->is_primary;
-}
-
void btif_to_bta_response(tBTA_GATTS_RSP *p_dest, btgatt_response_t* p_src)
{
p_dest->attr_value.auth_req = p_src->attr_value.auth_req;
}
}
-void bta_to_btif_gatt_id(btgatt_gatt_id_t *p_dest, tBTA_GATT_ID *p_src)
-{
- p_dest->inst_id = p_src->inst_id;
- bta_to_btif_uuid(&p_dest->uuid, &p_src->uuid);
-}
-
-void bta_to_btif_srvc_id(btgatt_srvc_id_t *p_dest, tBTA_GATT_SRVC_ID *p_src)
-{
- p_dest->id.inst_id = p_src->id.inst_id;
- bta_to_btif_uuid(&p_dest->id.uuid, &p_src->id.uuid);
- p_dest->is_primary = p_src->is_primary;
-}
-
/*******************************************************************************
* Utility functions
*******************************************************************************/
uint16_t set_read_value(btgatt_read_params_t *p_dest, tBTA_GATTC_READ *p_src)
{
- uint16_t descr_type = 0;
uint16_t len = 0;
p_dest->status = p_src->status;
- bta_to_btif_srvc_id(&p_dest->srvc_id, &p_src->srvc_id);
- bta_to_btif_gatt_id(&p_dest->char_id, &p_src->char_id);
- bta_to_btif_gatt_id(&p_dest->descr_id, &p_src->descr_type);
+ p_dest->handle = p_src->handle;
- descr_type = get_uuid16(&p_src->descr_type.uuid);
-
- switch (descr_type)
+ if (( p_src->status == BTA_GATT_OK ) &&(p_src->p_value != NULL))
{
- case GATT_UUID_CHAR_AGG_FORMAT:
- /* not supported */
- p_dest->value_type = GATTC_READ_VALUE_TYPE_AGG_FORMAT;
- break;
-
- default:
- if (( p_src->status == BTA_GATT_OK ) &&(p_src->p_value != NULL))
- {
- LOG_INFO(LOG_TAG, "%s unformat.len = %d ", __FUNCTION__, p_src->p_value->unformat.len);
- p_dest->value.len = p_src->p_value->unformat.len;
- if ( p_src->p_value->unformat.len > 0 && p_src->p_value->unformat.p_value != NULL )
- {
- memcpy(p_dest->value.value, p_src->p_value->unformat.p_value,
- p_src->p_value->unformat.len);
- }
- len += p_src->p_value->unformat.len;
- }
- else
- {
- p_dest->value.len = 0;
- }
-
- p_dest->value_type = GATTC_READ_VALUE_TYPE_VALUE;
- break;
+ LOG_INFO(LOG_TAG, "%s len = %d ", __FUNCTION__, p_src->p_value->len);
+ p_dest->value.len = p_src->p_value->len;
+ if ( p_src->p_value->len > 0 && p_src->p_value->p_value != NULL )
+ memcpy(p_dest->value.value, p_src->p_value->p_value,
+ p_src->p_value->len);
+
+ len += p_src->p_value->len;
+ } else {
+ p_dest->value.len = 0;
}
+ p_dest->value_type = GATTC_READ_VALUE_TYPE_VALUE;
return len;
}
* Encrypted link map handling
*******************************************************************************/
-static void btif_gatt_set_encryption_cb (BD_ADDR bd_addr, tBTA_TRANSPORT transport, tBTA_STATUS result);
-
+#if (!defined(BLE_DELAY_REQUEST_ENC) || (BLE_DELAY_REQUEST_ENC == FALSE))
static BOOLEAN btif_gatt_is_link_encrypted (BD_ADDR bd_addr)
{
if (bd_addr == NULL)
BTIF_TRACE_WARNING("%s() - Encryption failed (%d)", __FUNCTION__, result);
}
}
+#endif
void btif_gatt_check_encrypted_link (BD_ADDR bd_addr, tBTA_GATT_TRANSPORT transport_link)
{
+#if (!defined(BLE_DELAY_REQUEST_ENC) || (BLE_DELAY_REQUEST_ENC == FALSE))
char buf[100];
bt_bdaddr_t bda;
bdcpy(bda.address, bd_addr);
-#if (!defined(BLE_DELAY_REQUEST_ENC) || (BLE_DELAY_REQUEST_ENC == FALSE))
if ((btif_storage_get_ble_bonding_key(&bda, BTIF_DM_LE_KEY_PENC,
buf, sizeof(tBTM_LE_PENC_KEYS)) == BT_STATUS_SUCCESS)
&& !btif_gatt_is_link_encrypted(bd_addr))
BTA_DmSetEncryption(bd_addr,transport_link,
&btif_gatt_set_encryption_cb, BTM_BLE_SEC_ENCRYPT);
}
+#else
+ UNUSED(bd_addr);
+ UNUSED(transport_link);
#endif
}
if (p_src->adv_pkt_len > 0)
{
- p_dest->p_adv_pkt_data = osi_getbuf(p_src->adv_pkt_len);
+ p_dest->p_adv_pkt_data = osi_malloc(p_src->adv_pkt_len);
memcpy(p_dest->p_adv_pkt_data, p_src->p_adv_pkt_data,
p_src->adv_pkt_len);
- osi_freebuf(p_src->p_adv_pkt_data);
+ osi_free_and_reset((void **)&p_src->p_adv_pkt_data);
}
if (p_src->scan_rsp_len > 0)
{
- p_dest->p_scan_rsp_data = osi_getbuf(p_src->scan_rsp_len);
+ p_dest->p_scan_rsp_data = osi_malloc(p_src->scan_rsp_len);
memcpy(p_dest->p_scan_rsp_data, p_src->p_scan_rsp_data,
p_src->scan_rsp_len);
- osi_freebuf(p_src->p_scan_rsp_data);
+ osi_free_and_reset((void **)&p_src->p_scan_rsp_data);
}
}