[PATCH] Proximity Monitor implementation (for testing)

[PATCH] Proximity Monitor implementation (for testing)

[Anderson Lizardo]

This series implements a basic Proximity Monitor for testing purposes. It lacks
a number of features, but is already useful for testing our current Proximity
Monitor implementation.

Note: when applying these patches, make sure it is applied *after* Proximity
Monitor ones, otherwise it will conflict on the Makefile.am changes.

Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil

[PATCH BlueZ 1/5] Add Proximity Reporter skeleton

[Anderson Lizardo]

From: Claudio Takahasi <claudio.takahasi@openbossa.org>

---
 Makefile.am          |    3 ++-
 proximity/manager.c  |    4 +++-
 proximity/reporter.c |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 proximity/reporter.h |   26 ++++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 proximity/reporter.c
 create mode 100644 proximity/reporter.h

diff --git a/Makefile.am b/Makefile.am
index f61c9a8..0783666 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,7 +194,8 @@ if PROXIMITYPLUGIN
 builtin_modules += proximity
 builtin_sources += proximity/main.c \
 			proximity/manager.h proximity/manager.c \
-			proximity/monitor.h proximity/monitor.c
+			proximity/monitor.h proximity/monitor.c \
+			proximity/reporter.h proximity/reporter.c
 endif
 
 if SERVICEPLUGIN
diff --git a/proximity/manager.c b/proximity/manager.c
index 4b07108..f49d066 100644
--- a/proximity/manager.c
+++ b/proximity/manager.c
@@ -32,6 +32,7 @@
 #include "adapter.h"
 #include "device.h"
 #include "monitor.h"
+#include "reporter.h"
 #include "manager.h"
 
 #define LINK_LOSS_UUID "00001803-0000-1000-8000-00805f9b34fb"
@@ -73,11 +74,12 @@ int proximity_manager_init(DBusConnection *conn)
 		return ret;
 	}
 
-	return 0;
+	return reporter_init();
 }
 
 void proximity_manager_exit(void)
 {
+	reporter_exit();
 	monitor_unregister(connection);
 	btd_unregister_device_driver(&monitor_driver);
 	dbus_connection_unref(connection);
diff --git a/proximity/reporter.c b/proximity/reporter.c
new file mode 100644
index 0000000..e8fd368
--- /dev/null
+++ b/proximity/reporter.c
@@ -0,0 +1,47 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2011  Nokia Corporation
+ *  Copyright (C) 2011  Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "log.h"
+
+#include "reporter.h"
+
+int reporter_init(void)
+{
+	/*
+	 * TODO: Create/Update Proximity Reporter Characteristics
+	 * for Link Loss, Path Loss and Immediate Alert Services.
+	 */
+
+	DBG("Proximity Reporter");
+
+	return 0;
+}
+
+void reporter_exit(void)
+{
+}
diff --git a/proximity/reporter.h b/proximity/reporter.h
new file mode 100644
index 0000000..ea6b83d
--- /dev/null
+++ b/proximity/reporter.h
@@ -0,0 +1,26 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2011  Nokia Corporation
+ *  Copyright (C) 2011  Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+int reporter_init(void);
+void reporter_exit(void);
-- 
1.7.0.4

[PATCH BlueZ 2/5] Register primary service for Link Loss service

[Anderson Lizardo]

---
 proximity/reporter.c |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 55 insertions(+), 1 deletions(-)

diff --git a/proximity/reporter.c b/proximity/reporter.c
index e8fd368..94c930b 100644
--- a/proximity/reporter.c
+++ b/proximity/reporter.c
@@ -26,19 +26,73 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
+#include <bluetooth/uuid.h>
+
 #include "log.h"
 
+#include "att.h"
+#include "gattrib.h"
+#include "attrib-server.h"
 #include "reporter.h"
 
+#define LINK_LOSS_SVC_UUID		0x1803
+#define ALERT_LEVEL_CHR_UUID		0x2A06
+
+enum {
+	NO_ALERT = 0x00,
+	MILD_ALERT = 0x01,
+	HIGH_ALERT = 0x02,
+};
+
+static void register_link_loss(void)
+{
+	uint16_t start_handle, h;
+	const int svc_size = 3;
+	uint8_t atval[256];
+	bt_uuid_t uuid;
+
+	start_handle = attrib_db_find_avail(svc_size);
+	if (start_handle == 0) {
+		error("Not enough free handles to register service");
+		return;
+	}
+
+	DBG("start_handle=0x%04x", start_handle);
+
+	h = start_handle;
+
+	/* Primary service definition */
+	bt_uuid16_create(&uuid, GATT_PRIM_SVC_UUID);
+	att_put_u16(LINK_LOSS_SVC_UUID, &atval[0]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 2);
+
+	/* Alert level characteristic */
+	bt_uuid16_create(&uuid, GATT_CHARAC_UUID);
+	atval[0] = ATT_CHAR_PROPER_READ | ATT_CHAR_PROPER_WRITE;
+	att_put_u16(h + 1, &atval[1]);
+	att_put_u16(ALERT_LEVEL_CHR_UUID, &atval[3]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 5);
+
+	/* Alert level value */
+	bt_uuid16_create(&uuid, ALERT_LEVEL_CHR_UUID);
+	att_put_u8(NO_ALERT, &atval[0]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NONE, atval, 1);
+
+	g_assert(h - start_handle == svc_size);
+}
+
 int reporter_init(void)
 {
 	/*
 	 * TODO: Create/Update Proximity Reporter Characteristics
-	 * for Link Loss, Path Loss and Immediate Alert Services.
+	 * for Path Loss and Immediate Alert Services.
 	 */
 
 	DBG("Proximity Reporter");
 
+	register_link_loss();
+
 	return 0;
 }
 
-- 
1.7.0.4

[PATCH BlueZ 3/5] Register primary service for Tx Power service

[Anderson Lizardo]

---
 proximity/reporter.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/proximity/reporter.c b/proximity/reporter.c
index 94c930b..1e0a5f5 100644
--- a/proximity/reporter.c
+++ b/proximity/reporter.c
@@ -37,7 +37,9 @@
 #include "reporter.h"
 
 #define LINK_LOSS_SVC_UUID		0x1803
+#define TX_POWER_SVC_UUID		0x1804
 #define ALERT_LEVEL_CHR_UUID		0x2A06
+#define POWER_LEVEL_CHR_UUID		0x2A07
 
 enum {
 	NO_ALERT = 0x00,
@@ -45,6 +47,8 @@ enum {
 	HIGH_ALERT = 0x02,
 };
 
+static uint16_t tx_power_handle;
+
 static void register_link_loss(void)
 {
 	uint16_t start_handle, h;
@@ -82,6 +86,50 @@ static void register_link_loss(void)
 	g_assert(h - start_handle == svc_size);
 }
 
+static void register_tx_power(void)
+{
+	uint16_t start_handle, h;
+	const int svc_size = 4;
+	uint8_t atval[256];
+	bt_uuid_t uuid;
+
+	start_handle = attrib_db_find_avail(svc_size);
+	if (start_handle == 0) {
+		error("Not enough free handles to register service");
+		return;
+	}
+
+	DBG("start_handle=0x%04x", start_handle);
+
+	h = start_handle;
+
+	/* Primary service definition */
+	bt_uuid16_create(&uuid, GATT_PRIM_SVC_UUID);
+	att_put_u16(TX_POWER_SVC_UUID, &atval[0]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 2);
+
+	/* Power level characteristic */
+	bt_uuid16_create(&uuid, GATT_CHARAC_UUID);
+	atval[0] = ATT_CHAR_PROPER_READ | ATT_CHAR_PROPER_NOTIFY;
+	att_put_u16(h + 1, &atval[1]);
+	att_put_u16(POWER_LEVEL_CHR_UUID, &atval[3]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 5);
+
+	/* Power level value */
+	bt_uuid16_create(&uuid, POWER_LEVEL_CHR_UUID);
+	att_put_u8(0x00, &atval[0]);
+	tx_power_handle = h;
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 1);
+
+	/* Client characteristic configuration */
+	bt_uuid16_create(&uuid, GATT_CLIENT_CHARAC_CFG_UUID);
+	atval[0] = 0x00;
+	atval[1] = 0x00;
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NONE, atval, 2);
+
+	g_assert(h - start_handle == svc_size);
+}
+
 int reporter_init(void)
 {
 	/*
@@ -92,6 +140,7 @@ int reporter_init(void)
 	DBG("Proximity Reporter");
 
 	register_link_loss();
+	register_tx_power();
 
 	return 0;
 }
-- 
1.7.0.4

[PATCH BlueZ 4/5] Register primary service for Immediate Alert

[Anderson Lizardo]

---
 proximity/reporter.c |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/proximity/reporter.c b/proximity/reporter.c
index 1e0a5f5..fe18442 100644
--- a/proximity/reporter.c
+++ b/proximity/reporter.c
@@ -36,6 +36,7 @@
 #include "attrib-server.h"
 #include "reporter.h"
 
+#define IMMEDIATE_ALERT_SVC_UUID	0x1802
 #define LINK_LOSS_SVC_UUID		0x1803
 #define TX_POWER_SVC_UUID		0x1804
 #define ALERT_LEVEL_CHR_UUID		0x2A06
@@ -130,6 +131,43 @@ static void register_tx_power(void)
 	g_assert(h - start_handle == svc_size);
 }
 
+static void register_immediate_alert(void)
+{
+	uint16_t start_handle, h;
+	const int svc_size = 3;
+	uint8_t atval[256];
+	bt_uuid_t uuid;
+
+	start_handle = attrib_db_find_avail(svc_size);
+	if (start_handle == 0) {
+		error("Not enough free handles to register service");
+		return;
+	}
+
+	DBG("start_handle=0x%04x", start_handle);
+
+	h = start_handle;
+
+	/* Primary service definition */
+	bt_uuid16_create(&uuid, GATT_PRIM_SVC_UUID);
+	att_put_u16(IMMEDIATE_ALERT_SVC_UUID, &atval[0]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 2);
+
+	/* Alert level characteristic */
+	bt_uuid16_create(&uuid, GATT_CHARAC_UUID);
+	atval[0] = ATT_CHAR_PROPER_READ | ATT_CHAR_PROPER_WRITE;
+	att_put_u16(h + 1, &atval[1]);
+	att_put_u16(ALERT_LEVEL_CHR_UUID, &atval[3]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 5);
+
+	/* Alert level value */
+	bt_uuid16_create(&uuid, ALERT_LEVEL_CHR_UUID);
+	att_put_u8(NO_ALERT, &atval[0]);
+	attrib_db_add(h++, &uuid, ATT_NONE, ATT_NONE, atval, 1);
+
+	g_assert(h - start_handle == svc_size);
+}
+
 int reporter_init(void)
 {
 	/*
@@ -141,6 +179,7 @@ int reporter_init(void)
 
 	register_link_loss();
 	register_tx_power();
+	register_immediate_alert();
 
 	return 0;
 }
-- 
1.7.0.4

[PATCH BlueZ 5/5] Check if attrib server is enabled for Proximity

[Anderson Lizardo]

From: Claudio Takahasi <claudio.takahasi@openbossa.org>

Before registering Proximity services(Link Loss, Immediate alert and
TX Power), "AttributeServer" option value needs to be verified.
---
 proximity/reporter.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/proximity/reporter.c b/proximity/reporter.c
index fe18442..77a7dcd 100644
--- a/proximity/reporter.c
+++ b/proximity/reporter.c
@@ -31,6 +31,7 @@
 
 #include "log.h"
 
+#include "hcid.h"
 #include "att.h"
 #include "gattrib.h"
 #include "attrib-server.h"
@@ -170,10 +171,10 @@ static void register_immediate_alert(void)
 
 int reporter_init(void)
 {
-	/*
-	 * TODO: Create/Update Proximity Reporter Characteristics
-	 * for Path Loss and Immediate Alert Services.
-	 */
+	if (!main_opts.attrib_server) {
+		DBG("Attribute server is disabled");
+		return -1;
+	}
 
 	DBG("Proximity Reporter");
 
-- 
1.7.0.4

Re: [PATCH BlueZ 4/5] Register primary service for Immediate Alert

[mike tsai]

Hi Anderson,

>
> +static void register_immediate_alert(void)
> +{
> +       uint16_t start_handle, h;
> +       const int svc_size = 3;
> +       uint8_t atval[256];
> +       bt_uuid_t uuid;
> +
> +       start_handle = attrib_db_find_avail(svc_size);
> +       if (start_handle == 0) {
> +               error("Not enough free handles to register service");
> +               return;
> +       }
> +
> +       DBG("start_handle=0x%04x", start_handle);
> +
> +       h = start_handle;
> +
> +       /* Primary service definition */
> +       bt_uuid16_create(&uuid, GATT_PRIM_SVC_UUID);
> +       att_put_u16(IMMEDIATE_ALERT_SVC_UUID, &atval[0]);
> +       attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 2);
> +
> +       /* Alert level characteristic */
> +       bt_uuid16_create(&uuid, GATT_CHARAC_UUID);
> +       atval[0] = ATT_CHAR_PROPER_READ | ATT_CHAR_PROPER_WRITE;
> +       att_put_u16(h + 1, &atval[1]);
> +       att_put_u16(ALERT_LEVEL_CHR_UUID, &atval[3]);
> +       attrib_db_add(h++, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 5);
> +
> +       /* Alert level value */
> +       bt_uuid16_create(&uuid, ALERT_LEVEL_CHR_UUID);
> +       att_put_u8(NO_ALERT, &atval[0]);
> +       attrib_db_add(h++, &uuid, ATT_NONE, ATT_NONE, atval, 1);
> +
> +       g_assert(h - start_handle == svc_size);
> +}
> +
[MT] a couple things here, first, should the attrib_db_add function
allow input parameters  "wgardrite_cb" and "read_cb"?
        second, should this function register a write_cb for immediate
alert characteristic? so if the client writes a value to this
characteristic, the write_cb can be called?  And I think a signal will
be sent to application that has registered with immediate alert
service?

Regards,

Mike

Re: [PATCH BlueZ 4/5] Register primary service for Immediate Alert

[Anderson Lizardo]

Hi Mike,

On Tue, Jul 26, 2011 at 9:08 PM, mike tsai <mikeyhtsai@gmail.com> wrote:
> [MT] a couple things here, first, should the attrib_db_add function
> allow input parameters  "wgardrite_cb" and "read_cb"?

Currently, you can register read/write callbacks by assigning the
return value of attrib_db_add() (struct attribute *) to a variable and
then assigning its ->write_cb and ->read_cb. e.g.

struct attribute *a = attrib_db_add(...);
a->read_cb = <some_function>;
a->write_cb = <another_function>;

But we are designing a new data structure for representing attributes,
which should mainly simplify the way we currently handle Client
Characteristic Configuration on the attribute server, attribute
storage and read/write callbacks. Currently, our database is just a
single GSList of "struct attribute", with no way to represent
relationship between attributes. This "flat" architecture has made
code which handles semantics for client characteristic configuration
too complex.

We should send a proposal (RFC) some point between this and next week.

>        second, should this function register a write_cb for immediate
> alert characteristic? so if the client writes a value to this
> characteristic, the write_cb can be called?  And I think a signal will
> be sent to application that has registered with immediate alert
> service?

In a full Proximity Reporter implementation, yes. But note that this
first version is solely for testing our Proximity Monitor. Those
interested on implementing a full monitor can of course extend/improve
it further :). Patches are welcome.

Regards,
-- 
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil

Re: [PATCH] Proximity Monitor implementation (for testing)

[Johan Hedberg]

Hi,

On Mon, Jul 25, 2011, Anderson Lizardo wrote:
> This series implements a basic Proximity Monitor for testing purposes.
> It lacks a number of features, but is already useful for testing our
> current Proximity Monitor implementation.

This patch-set has been applied. Thanks.

Johan