linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 9/9 v3] Bluetooth: Add support for 128-bit UUIDs in EIR data
Date: Sat, 26 Jan 2013 12:08:44 +0200	[thread overview]
Message-ID: <1359194924-3151-10-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1359194924-3151-1-git-send-email-johan.hedberg@gmail.com>

From: Johan Hedberg <johan.hedberg@intel.com>

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

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
 net/bluetooth/mgmt.c |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4ebcfee..f5be685 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -510,6 +510,39 @@ static u8 *create_uuid32_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)
 	return ptr;
 }
 
+static u8 *create_uuid128_list(struct hci_dev *hdev, u8 *data, ptrdiff_t len)
+{
+	u8 *ptr = data, *uuids_start = NULL;
+	struct bt_uuid *uuid;
+
+	if (len < 18)
+		return ptr;
+
+	list_for_each_entry(uuid, &hdev->uuids, list) {
+		if (uuid->type != BT_UUID128)
+			continue;
+
+		if (!uuids_start) {
+			uuids_start = ptr;
+			uuids_start[0] = 1;
+			uuids_start[1] = EIR_UUID128_ALL;
+			ptr += 2;
+		}
+
+		/* Stop if not enough space to put next UUID */
+		if ((ptr - data) + 16 > len) {
+			uuids_start[1] = EIR_UUID128_SOME;
+			break;
+		}
+
+		memcpy(ptr, uuid->uuid, 16);
+		ptr += 16;
+		uuids_start[0] += 16;
+	}
+
+	return ptr;
+}
+
 static void create_eir(struct hci_dev *hdev, u8 *data)
 {
 	u8 *ptr = data;
@@ -555,6 +588,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));
+	ptr = create_uuid128_list(hdev, ptr, HCI_MAX_EIR_LENGTH - (ptr - data));
 }
 
 static int update_eir(struct hci_dev *hdev)
-- 
1.7.10.4


  parent reply	other threads:[~2013-01-26 10:08 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-26 10:08 [PATCH 0/9 v3] Bluetooth: Add 32 and 128 bit EIR UUID support Johan Hedberg
2013-01-26 10:08 ` [PATCH 1/9 v3] Bluetooth: Store UUIDs in the same order that they were added Johan Hedberg
2013-01-26 17:03   ` Marcel Holtmann
2013-01-26 10:08 ` [PATCH 2/9 v3] Bluetooth: Simplify UUIDs clearing code Johan Hedberg
2013-01-26 17:03   ` Marcel Holtmann
2013-01-26 10:08 ` [PATCH 3/9 v3] Bluetooth: Keep track of UUID type upon addition Johan Hedberg
2013-01-26 17:07   ` Marcel Holtmann
2013-01-26 10:08 ` [PATCH 4/9 v3] Bluetooth: Simplify UUID removal code Johan Hedberg
2013-01-26 17:09   ` Marcel Holtmann
2013-01-26 10:08 ` [PATCH 5/9 v3] Bluetooth: Simplify UUID16 list generation for EIR Johan Hedberg
2013-01-26 17:11   ` Marcel Holtmann
2013-01-26 10:08 ` [PATCH 6/9 v3] Bluetooth: Remove useless eir_len variable from EIR creation Johan Hedberg
2013-01-26 17:12   ` Marcel Holtmann
2013-01-26 10:08 ` [PATCH 7/9 v3] Bluetooth: Refactor UUID-16 list generation into its own function Johan Hedberg
2013-01-26 17:13   ` Marcel Holtmann
2013-01-26 10:08 ` [PATCH 8/9 v3] Bluetooth: Add support for 32-bit UUIDs in EIR data Johan Hedberg
2013-01-26 17:14   ` Marcel Holtmann
2013-01-26 10:08 ` Johan Hedberg [this message]
2013-01-26 17:15   ` [PATCH 9/9 v3] Bluetooth: Add support for 128-bit " Marcel Holtmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359194924-3151-10-git-send-email-johan.hedberg@gmail.com \
    --to=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).