Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b26ca55 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Fix 128-bit UUID byte order for GATT-over-BR/EDR 

am: 65587bcf

* commit '65587bcf':
  Fix 128-bit UUID byte order for GATT-over-BR/EDR
parents 3a909267 65587bcf

system/stack/gatt/gatt_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ UINT32 gatt_add_sdp_record (tBT_UUID *p_uuid, UINT16 start_hdl, UINT16 end_hdl) 


        case LEN_UUID_128:

            UINT8_TO_BE_STREAM (p, (UUID_DESC_TYPE << 3) | SIZE_SIXTEEN_BYTES);

            ARRAY_TO_BE_STREAM (p, p_uuid->uu.uuid128, LEN_UUID_128);

            ARRAY_TO_BE_STREAM_REVERSE (p, p_uuid->uu.uuid128, LEN_UUID_128);

            SDP_AddAttribute (sdp_handle, ATTR_ID_SERVICE_CLASS_ID_LIST, DATA_ELE_SEQ_DESC_TYPE,

                              (UINT32) (p - buff), buff);

            break;

system/stack/include/bt_types.h

+1 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ typedef struct 
#define UINT16_TO_BE_STREAM(p, u16) {*(p)++ = (UINT8)((u16) >> 8); *(p)++ = (UINT8)(u16);}

#define UINT8_TO_BE_STREAM(p, u8)   {*(p)++ = (UINT8)(u8);}

#define ARRAY_TO_BE_STREAM(p, a, len) {register int ijk; for (ijk = 0; ijk < len; ijk++) *(p)++ = (UINT8) a[ijk];}

#define ARRAY_TO_BE_STREAM_REVERSE(p, a, len) {register int ijk; for (ijk = 0; ijk < len; ijk++) *(p)++ = (UINT8) a[len - ijk - 1];}



#define BE_STREAM_TO_UINT8(u8, p)   {u8 = (UINT8)(*(p)); (p) += 1;}

#define BE_STREAM_TO_UINT16(u16, p) {u16 = (UINT16)(((UINT16)(*(p)) << 8) + (UINT16)(*((p) + 1))); (p) += 2;}

system/stack/sdp/sdp_api.c

+8 −5
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ BOOLEAN SDP_FindServiceUUIDInRec(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) 
                    else if (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == LEN_UUID_128)

                    {

                        p_uuid->len = LEN_UUID_128;

                        memcpy(p_uuid->uu.uuid128, p_sattr->attr_value.v.array, LEN_UUID_128);

                        for (uint8_t i = 0; i != LEN_UUID_128; ++i)

                            p_uuid->uu.uuid128[i] = p_sattr->attr_value.v.array[LEN_UUID_128-i-1];

                    }

                    else if (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == LEN_UUID_32)

                    {
@@ -441,8 +442,9 @@ BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) 
                    /* only support 128 bits UUID for now */

                    if (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == 16)

                    {

                        p_uuid->len = 16;

                        memcpy(p_uuid->uu.uuid128, p_sattr->attr_value.v.array, MAX_UUID_SIZE);

                        p_uuid->len = LEN_UUID_128;

                        for (uint8_t i = 0; i != LEN_UUID_128; ++i)

                            p_uuid->uu.uuid128[i] = p_sattr->attr_value.v.array[LEN_UUID_128-i-1];

                    }

                    return(TRUE);

                }
@@ -455,8 +457,9 @@ BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) 
                /* only support 128 bits UUID for now */

                && (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) == 16))

            {

                p_uuid->len = 16;

                memcpy(p_uuid->uu.uuid128, p_attr->attr_value.v.array, MAX_UUID_SIZE);

                p_uuid->len = LEN_UUID_128;

                for (uint8_t i = 0; i != LEN_UUID_128; ++i)

                    p_uuid->uu.uuid128[i] = p_sattr->attr_value.v.array[LEN_UUID_128-i-1];

                return(TRUE);

            }

        }