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

Commit cdf1963f authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Add support for 32-bit UUIDs in EIR data 



This patch adds the necessary code for inserting a list of 32-bit UUIDs
into the EIR data.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 213202ed

net/bluetooth/mgmt.c

+34 −0
Original line number Diff line number Diff line
@@ -477,6 +477,39 @@ static u8 *create_uuid16_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len) 
	return ptr;

}



static u8 *create_uuid32_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)

{

	u8 *ptr = data, *uuids_start = NULL;

	struct bt_uuid *uuid;



	if (len < 6)

		return ptr;



	list_for_each_entry(uuid, &hdev->uuids, list) {

		if (uuid->size != 32)

			continue;



		if (!uuids_start) {

			uuids_start = ptr;

			uuids_start[0] = 1;

			uuids_start[1] = EIR_UUID32_ALL;

			ptr += 2;

		}



		/* Stop if not enough space to put next UUID */

		if ((ptr - data) + sizeof(u32) > len) {

			uuids_start[1] = EIR_UUID32_SOME;

			break;

		}



		memcpy(ptr, &uuid->uuid[12], sizeof(u32));

		ptr += sizeof(u32);

		uuids_start[0] += sizeof(u32);

	}



	return ptr;

}



static void create_eir(struct hci_dev *hdev, u8 *data)

{

	u8 *ptr = data;
@@ -521,6 +554,7 @@ static void create_eir(struct hci_dev *hdev, u8 *data) 
	}



	ptr = create_uuid16_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));

	ptr = create_uuid32_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));

}



static int update_eir(struct hci_dev *hdev)