Merge branch 'bugfix/sdp_get_uuid_error_v5.2' into 'release/v5.2'

fix(bt/bluedroid): fixed issues introduced by byte alignment(v5.2)

See merge request espressif/esp-idf!35252

components/bt/host/bluedroid/btc/core/btc_util.c

@@ -349,7 +349,7 @@ esp_bt_status_t btc_hci_to_esp_status(uint8_t hci_status)
     return esp_status;
 }
 
-esp_bt_status_t btc_btm_status_to_esp_status (uint8_t btm_status)
+esp_bt_status_t btc_btm_status_to_esp_status(uint8_t btm_status)
 {
     esp_bt_status_t esp_status = ESP_BT_STATUS_FAIL;
     switch(btm_status) {
@@ -392,7 +392,7 @@ esp_bt_status_t btc_btm_status_to_esp_status (uint8_t btm_status)
     return esp_status;
 }
 
-esp_bt_status_t btc_bta_status_to_esp_status (uint8_t bta_status)
+esp_bt_status_t btc_bta_status_to_esp_status(uint8_t bta_status)
 {
     esp_bt_status_t esp_status = ESP_BT_STATUS_FAIL;
     switch(bta_status){
@@ -424,3 +424,36 @@ esp_bt_status_t btc_bta_status_to_esp_status (uint8_t bta_status)
 
     return esp_status;
 }
+
+void bta_to_btc_uuid(esp_bt_uuid_t *p_dest, tBT_UUID *p_src)
+{
+    p_dest->len = p_src->len;
+    if (p_src->len == LEN_UUID_16) {
+        p_dest->uuid.uuid16 = p_src->uu.uuid16;
+    } else if (p_src->len == LEN_UUID_32) {
+        p_dest->uuid.uuid32 = p_src->uu.uuid32;
+    } else if (p_src->len == LEN_UUID_128) {
+        memcpy(&p_dest->uuid.uuid128, p_src->uu.uuid128, p_dest->len);
+    } else if (p_src->len == 0) {
+        /* do nothing for now, there's some scenario will input 0
+           such as, receive notify, the descriptor may be 0 */
+    } else {
+        BTC_TRACE_ERROR("%s UUID len is invalid %d\n", __func__, p_src->len);
+    }
+}
+
+void btc_to_bta_uuid(tBT_UUID *p_dest, esp_bt_uuid_t *p_src)
+{
+    p_dest->len = p_src->len;
+    if (p_src->len == LEN_UUID_16) {
+        p_dest->uu.uuid16 = p_src->uuid.uuid16;
+    } else if (p_src->len == LEN_UUID_32) {
+        p_dest->uu.uuid32 = p_src->uuid.uuid32;
+    } else if (p_src->len == LEN_UUID_128) {
+        memcpy(&p_dest->uu.uuid128, p_src->uuid.uuid128, p_dest->len);
+    } else if (p_src->len == 0) {
+        /* do nothing for now, there's some scenario will input 0 */
+    } else {
+        BTC_TRACE_ERROR("%s UUID len is invalid %d\n", __func__, p_src->len);
+    }
+}

components/bt/host/bluedroid/btc/include/btc/btc_util.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -57,8 +57,11 @@ void uuid128_be_to_esp_uuid(esp_bt_uuid_t *u, uint8_t* uuid128);
 void uuid_to_string_legacy(bt_uuid_t *p_uuid, char *str);
 
 esp_bt_status_t btc_hci_to_esp_status(uint8_t hci_status);
-esp_bt_status_t btc_btm_status_to_esp_status (uint8_t btm_status);
+esp_bt_status_t btc_btm_status_to_esp_status(uint8_t btm_status);
-esp_bt_status_t btc_bta_status_to_esp_status (uint8_t bta_status);
+esp_bt_status_t btc_bta_status_to_esp_status(uint8_t bta_status);
+
+void bta_to_btc_uuid(esp_bt_uuid_t *p_dest, tBT_UUID *p_src);
+void btc_to_bta_uuid(tBT_UUID *p_dest, esp_bt_uuid_t *p_src);
 
 #ifdef __cplusplus
 }

components/bt/host/bluedroid/btc/profile/std/gatt/btc_gatt_util.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -82,23 +82,6 @@ void btc128_to_bta_uuid(tBT_UUID *p_dest, uint8_t *p_src)
 /*******************************************************************************
  * BTC -> BTA conversion functions
  *******************************************************************************/
-
-void btc_to_bta_uuid(tBT_UUID *p_dest, esp_bt_uuid_t *p_src)
-{
-    p_dest->len = p_src->len;
-    if (p_src->len == LEN_UUID_16) {
-        p_dest->uu.uuid16 = p_src->uuid.uuid16;
-    } else if (p_src->len == LEN_UUID_32) {
-        p_dest->uu.uuid32 = p_src->uuid.uuid32;
-    } else if (p_src->len == LEN_UUID_128) {
-        memcpy(&p_dest->uu.uuid128, p_src->uuid.uuid128, p_dest->len);
-    } else if (p_src->len == 0) {
-        /* do nothing for now, there's some scenario will input 0 */
-    } else {
-        BTC_TRACE_ERROR("%s UUID len is invalid %d\n", __func__, p_src->len);
-    }
-}
-
 void btc_to_bta_gatt_id(tBTA_GATT_ID *p_dest, esp_gatt_id_t *p_src)
 {
     p_dest->inst_id = p_src->inst_id;
@@ -115,23 +98,6 @@ void btc_to_bta_srvc_id(tBTA_GATT_SRVC_ID *p_dest, esp_gatt_srvc_id_t *p_src)
 /*******************************************************************************
  * BTA -> BTC conversion functions
  *******************************************************************************/
-void bta_to_btc_uuid(esp_bt_uuid_t *p_dest, tBT_UUID *p_src)
-{
-    p_dest->len = p_src->len;
-    if (p_src->len == LEN_UUID_16) {
-        p_dest->uuid.uuid16 = p_src->uu.uuid16;
-    } else if (p_src->len == LEN_UUID_32) {
-        p_dest->uuid.uuid32 = p_src->uu.uuid32;
-    } else if (p_src->len == LEN_UUID_128) {
-        memcpy(&p_dest->uuid.uuid128, p_src->uu.uuid128, p_dest->len);
-    } else if (p_src->len == 0) {
-        /* do nothing for now, there's some scenario will input 0
-           such as, receive notify, the descriptor may be 0 */
-    } else {
-        BTC_TRACE_ERROR("%s UUID len is invalid %d\n", __func__, p_src->len);
-    }
-}
-
 void bta_to_btc_gatt_id(esp_gatt_id_t *p_dest, tBTA_GATT_ID *p_src)
 {
     p_dest->inst_id = p_src->inst_id;

components/bt/host/bluedroid/btc/profile/std/include/btc_gatt_util.h

@@ -9,6 +9,7 @@
 
 #include "stack/bt_types.h"
 #include "bta/bta_gatt_api.h"
+#include "btc/btc_util.h"
 #include "esp_bt_defs.h"
 #include "esp_gatt_defs.h"
 #include "esp_gattc_api.h"
@@ -18,12 +19,10 @@
 #define BTC_GATT_GET_GATT_IF(conn_id)  ((uint8_t)(conn_id))
 
 void btc128_to_bta_uuid(tBT_UUID *p_dest, uint8_t *p_src);
-void btc_to_bta_uuid(tBT_UUID *p_dest, esp_bt_uuid_t *p_src);
 void btc_to_bta_gatt_id(tBTA_GATT_ID *p_dest, esp_gatt_id_t *p_src);
 void btc_to_bta_srvc_id(tBTA_GATT_SRVC_ID *p_dest, esp_gatt_srvc_id_t *p_src);
 void btc_to_bta_response(tBTA_GATTS_RSP *rsp_struct, esp_gatt_rsp_t *p_rsp);
 
-void bta_to_btc_uuid(esp_bt_uuid_t *p_dest, tBT_UUID *p_src);
 void bta_to_btc_gatt_id(esp_gatt_id_t *p_dest, tBTA_GATT_ID *p_src);
 void bta_to_btc_srvc_id(esp_gatt_srvc_id_t *p_dest, tBTA_GATT_SRVC_ID *p_src);
 

components/bt/host/bluedroid/btc/profile/std/sdp/btc_sdp.c

@@ -9,6 +9,7 @@
 #include "btc_sdp.h"
 #include "btc/btc_manage.h"
 #include "btc/btc_task.h"
+#include "btc/btc_util.h"
 #include "bta/bta_sdp_api.h"
 #include "bta/bta_sys.h"
 #include "bta/utl.h"
@@ -1307,7 +1308,7 @@ void btc_sdp_cb_handler(btc_msg_t *msg)
 
         param.search.status = p_data->sdp_search_comp.status;
         memcpy(param.search.remote_addr, p_data->sdp_search_comp.remote_addr, sizeof(BD_ADDR));
-        memcpy(&param.search.sdp_uuid, &p_data->sdp_search_comp.uuid, sizeof(tSDP_UUID));
+        bta_to_btc_uuid(&param.search.sdp_uuid, &p_data->sdp_search_comp.uuid);
         param.search.record_count = p_data->sdp_search_comp.record_count;
         param.search.records = (esp_bluetooth_sdp_record_t *)p_data->sdp_search_comp.records;
         btc_sdp_cb_to_app(ESP_SDP_SEARCH_COMP_EVT, &param);