[PATCH 0/2] Expose AdvertisingDataFlags in Device API

[PATCH 0/2] Expose AdvertisingDataFlags in Device API

[puthik]

From: Puthikorn Voravootivat <puthik@chromium.org>

The following patches expose AdvertisingDataFlags in Device API.
This is need by Android app on ChromeOS as Android normally
get Advertising data flag from Bluetooth adapter.

Puthikorn Voravootivat (2):
  doc/device-api: Add AdvertisingDataFlags
  core: Add implementation of AdvertisingDataFlags

 doc/device-api.txt |  4 ++++
 src/adapter.c      |  2 ++
 src/device.c       | 30 ++++++++++++++++++++++++++++++
 src/device.h       |  1 +
 4 files changed, 37 insertions(+)

-- 
2.8.0.rc3.226.g39d4020

[PATCH 1/2] doc/device-api: Add AdvertisingDataFlags

[puthik]

From: Puthikorn Voravootivat <puthik@chromium.org>

This exposed AdvertisingDataFlags to BlueZ Device API

Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
---
 doc/device-api.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/device-api.txt b/doc/device-api.txt
index f5cac49..3ed4e06 100644
--- a/doc/device-api.txt
+++ b/doc/device-api.txt
@@ -230,3 +230,7 @@ Properties	string Address [readonly]
 
 			Indicate whether or not service discovery has been
 			resolved.
+
+		uint8 AdvertisingDataFlags [readonly]
+
+			The Advertising Data Flags of the remote device.
-- 
2.8.0.rc3.226.g39d4020

Re: [PATCH 1/2] doc/device-api: Add AdvertisingDataFlags

[Marcel Holtmann]

Hi Puthikorn,

> This exposed AdvertisingDataFlags to BlueZ Device API
> 
> Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
> ---
> doc/device-api.txt | 4 ++++
> 1 file changed, 4 insertions(+)
> 
> diff --git a/doc/device-api.txt b/doc/device-api.txt
> index f5cac49..3ed4e06 100644
> --- a/doc/device-api.txt
> +++ b/doc/device-api.txt
> @@ -230,3 +230,7 @@ Properties	string Address [readonly]
> 
> 			Indicate whether or not service discovery has been
> 			resolved.
> +
> +		uint8 AdvertisingDataFlags [readonly]
> +
> +			The Advertising Data Flags of the remote device.

I prefer if we just call this AdvertisingFlags and strictly speaking this needs to be array{uint8}. The AD type is defined as variable length. It is not just an uint8. We could debate to go with uint32 here if that helps, but just a uint8 will lock us in and is not really future proof.

Regards

Marcel

[PATCH 2/2] core: Add implementation of AdvertisingDataFlags

[puthik]

From: Puthikorn Voravootivat <puthik@chromium.org>

This adds 'AdvertisingDataFlags' property to Device interface.

Bluetooth Core Supplementary Spec v6 Chapter 1.3 defines Bluetooth
Flags as one of the data in advertise data. BlueZ also correctly
parses this data but never exposes it to upper layer.

Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
---
 src/adapter.c |  2 ++
 src/device.c  | 30 ++++++++++++++++++++++++++++++
 src/device.h  |  1 +
 3 files changed, 33 insertions(+)

diff --git a/src/adapter.c b/src/adapter.c
index b096d48..1abb5c0 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -5552,6 +5552,8 @@ static void update_found_devices(struct btd_adapter *adapter,
 	if (eir_data.sd_list)
 		device_set_service_data(dev, eir_data.sd_list);
 
+	device_set_flags(dev, eir_data.flags);
+
 	eir_data_free(&eir_data);
 
 	/*
diff --git a/src/device.c b/src/device.c
index fb6104f..9be3e06 100644
--- a/src/device.c
+++ b/src/device.c
@@ -247,6 +247,8 @@ struct btd_device {
 
 	GIOChannel	*att_io;
 	guint		store_id;
+
+	uint8_t         flags;
 };
 
 static const uint16_t uuid_list[] = {
@@ -939,6 +941,17 @@ dev_property_get_svc_resolved(const GDBusPropertyTable *property,
 	return TRUE;
 }
 
+static gboolean
+dev_property_get_flags(const GDBusPropertyTable *property,
+					DBusMessageIter *iter, void *data)
+{
+	struct btd_device *device = data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &device->flags);
+
+	return TRUE;
+}
+
 static gboolean dev_property_get_trusted(const GDBusPropertyTable *property,
 					DBusMessageIter *iter, void *data)
 {
@@ -2534,6 +2547,7 @@ static const GDBusPropertyTable device_properties[] = {
 	{ "TxPower", "n", dev_property_get_tx_power, NULL,
 					dev_property_exists_tx_power },
 	{ "ServicesResolved", "b", dev_property_get_svc_resolved, NULL, NULL },
+	{ "AdvertisingDataFlags", "y", dev_property_get_flags },
 
 	{ }
 };
@@ -5221,6 +5235,22 @@ void device_set_tx_power(struct btd_device *device, int8_t tx_power)
 						DEVICE_INTERFACE, "TxPower");
 }
 
+void device_set_flags(struct btd_device *device, uint8_t flags)
+{
+	if (!device)
+		return;
+
+	DBG("flags %d", flags);
+
+	if (device->flags == flags)
+		return;
+
+	device->flags = flags;
+
+	g_dbus_emit_property_changed(dbus_conn, device->path,
+				DEVICE_INTERFACE, "AdvertisingDataFlags");
+}
+
 static gboolean start_discovery(gpointer user_data)
 {
 	struct btd_device *device = user_data;
diff --git a/src/device.h b/src/device.h
index 387f598..93a159a 100644
--- a/src/device.h
+++ b/src/device.h
@@ -97,6 +97,7 @@ void device_set_rssi_with_delta(struct btd_device *device, int8_t rssi,
 							int8_t delta_threshold);
 void device_set_rssi(struct btd_device *device, int8_t rssi);
 void device_set_tx_power(struct btd_device *device, int8_t tx_power);
+void device_set_flags(struct btd_device *device, uint8_t flags);
 bool btd_device_is_connected(struct btd_device *dev);
 uint8_t btd_device_get_bdaddr_type(struct btd_device *dev);
 bool device_is_retrying(struct btd_device *device);
-- 
2.8.0.rc3.226.g39d4020