[PATCH BlueZ 0/5] Add Get/Set Property for Link Loss

[PATCH BlueZ 0/5] Add Get/Set Property for Link Loss

[Claudio Takahasi]

Dependency: "[PATCH] Proximity Monitor implementation (for testing)"
sent from Anderson Lizardo. Small conflict in proximity/manager.c

The following patches implement Get/SetProperty for LinkLossAlertLevel
in the Proximity Monitor. Contains D-Bus methods/signals implementation
without remote comunication, alert level characteristic value is not
being written yet.

Bruna Moreira (1):
  Add load/store functions for Alert Level

Sheldon Demario (4):
  Add set Link Loss Alert Level
  Add get Link Loss Alert Level
  Emit a signal when Link Loss Alert Level changes
  Use device object path on Proximity Monitor

 proximity/manager.c |   11 +---
 proximity/monitor.c |  190 ++++++++++++++++++++++++++++++++++++++++++++++-----
 proximity/monitor.h |    4 +-
 3 files changed, 177 insertions(+), 28 deletions(-)

-- 
1.7.6

[PATCH BlueZ 1/5] Add set Link Loss Alert Level

[Claudio Takahasi]

From: Sheldon Demario <sheldon.demario@openbossa.org>

Add LinkLossAlertLevel property for SetProperty method in Proximity
Monitor. Allowed values are: none, mild and high.
---
 proximity/monitor.c |   68 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/proximity/monitor.c b/proximity/monitor.c
index 4928c7a..50594f7 100644
--- a/proximity/monitor.c
+++ b/proximity/monitor.c
@@ -28,6 +28,7 @@
 
 #include <gdbus.h>
 
+#include "error.h"
 #include "log.h"
 
 #include "monitor.h"
@@ -35,6 +36,28 @@
 #define PROXIMITY_INTERFACE "org.bluez.Proximity"
 #define PROXIMITY_PATH "/org/bluez/proximity"
 
+struct monitor {
+	char *linklosslevel;		/* Link Loss Alert Level */
+};
+
+static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
+						const char *level, void *data)
+{
+	struct monitor *monitor = data;
+
+	if (!g_str_equal("none", level) && !g_str_equal("mild", level) &&
+			!g_str_equal("high", level))
+		return btd_error_invalid_args(msg);
+
+	if (g_strcmp0(monitor->linklosslevel, level) == 0)
+		return dbus_message_new_method_return(msg);
+
+	g_free(monitor->linklosslevel);
+	monitor->linklosslevel = g_strdup(level);
+
+	return dbus_message_new_method_return(msg);
+}
+
 static DBusMessage *get_properties(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
@@ -44,7 +67,34 @@ static DBusMessage *get_properties(DBusConnection *conn,
 static DBusMessage *set_property(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	return dbus_message_new_method_return(msg);
+	const char *property;
+	DBusMessageIter iter;
+	DBusMessageIter sub;
+	const char *level;
+
+	if (!dbus_message_iter_init(msg, &iter))
+		return btd_error_invalid_args(msg);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+		return btd_error_invalid_args(msg);
+
+	dbus_message_iter_get_basic(&iter, &property);
+	dbus_message_iter_next(&iter);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+		return btd_error_invalid_args(msg);
+	dbus_message_iter_recurse(&iter, &sub);
+
+	if (g_str_equal("LinkLossAlertLevel", property)) {
+		if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING)
+			return btd_error_invalid_args(msg);
+
+		dbus_message_iter_get_basic(&sub, &level);
+
+		return set_link_loss_alert(conn, msg, level, data);
+	}
+
+	return btd_error_invalid_args(msg);
 }
 
 static GDBusMethodTable monitor_methods[] = {
@@ -59,14 +109,24 @@ static GDBusSignalTable monitor_signals[] = {
 	{ }
 };
 
+static void monitor_destroy(gpointer user_data)
+{
+	struct monitor *monitor = user_data;
+
+	g_free(monitor->linklosslevel);
+	g_free(monitor);
+}
+
 int monitor_register(DBusConnection *conn)
 {
+	struct monitor *monitor;
 	int ret = -1;
 
+	monitor = g_new0(struct monitor, 1);
 	if (g_dbus_register_interface(conn, PROXIMITY_PATH,
-					PROXIMITY_INTERFACE,
-					monitor_methods, monitor_signals,
-					NULL, NULL, NULL) == TRUE) {
+				PROXIMITY_INTERFACE,
+				monitor_methods, monitor_signals,
+				NULL, monitor, monitor_destroy) == TRUE) {
 		DBG("Registered interface %s on path %s", PROXIMITY_INTERFACE,
 							PROXIMITY_PATH);
 		ret = 0;
-- 
1.7.6

[PATCH BlueZ 2/5] Add get Link Loss Alert Level

[Claudio Takahasi]

From: Sheldon Demario <sheldon.demario@openbossa.org>

---
 proximity/monitor.c |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/proximity/monitor.c b/proximity/monitor.c
index 50594f7..7ec1b4c 100644
--- a/proximity/monitor.c
+++ b/proximity/monitor.c
@@ -26,8 +26,10 @@
 #include <config.h>
 #endif
 
+#include <stdint.h>
 #include <gdbus.h>
 
+#include "dbus-common.h"
 #include "error.h"
 #include "log.h"
 
@@ -61,7 +63,28 @@ static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 static DBusMessage *get_properties(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	return dbus_message_new_method_return(msg);
+	struct monitor *monitor = data;
+	DBusMessageIter iter;
+	DBusMessageIter dict;
+	DBusMessage *reply;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	dbus_message_iter_init_append(reply, &iter);
+
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+			DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+			DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+			DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+	dict_append_entry(&dict, "LinkLossAlertLevel",
+			DBUS_TYPE_STRING, &monitor->linklosslevel);
+
+	dbus_message_iter_close_container(&iter, &dict);
+
+	return reply;
 }
 
 static DBusMessage *set_property(DBusConnection *conn,
-- 
1.7.6

[PATCH BlueZ 3/5] Add load/store functions for Alert Level

[Claudio Takahasi]

From: Bruna Moreira <bruna.moreira@openbossa.org>

The Alert Level Characteristic must be persistent across connections.
New functions to load/store the alert level value were created.
---
 proximity/monitor.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 1 deletions(-)

diff --git a/proximity/monitor.c b/proximity/monitor.c
index 7ec1b4c..3b2a96e 100644
--- a/proximity/monitor.c
+++ b/proximity/monitor.c
@@ -26,14 +26,22 @@
 #include <config.h>
 #endif
 
-#include <stdint.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <gdbus.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#include <bluetooth/bluetooth.h>
 
 #include "dbus-common.h"
 #include "error.h"
 #include "log.h"
 
 #include "monitor.h"
+#include "textfile.h"
 
 #define PROXIMITY_INTERFACE "org.bluez.Proximity"
 #define PROXIMITY_PATH "/org/bluez/proximity"
@@ -42,10 +50,50 @@ struct monitor {
 	char *linklosslevel;		/* Link Loss Alert Level */
 };
 
+static inline int create_filename(char *buf, size_t size,
+				const bdaddr_t *bdaddr, const char *name)
+{
+	char addr[18];
+
+	ba2str(bdaddr, addr);
+
+	return create_name(buf, size, STORAGEDIR, addr, name);
+}
+
+static int write_proximity_config(bdaddr_t *sba, bdaddr_t *dba,
+					const char *alert, const char *level)
+{
+	char filename[PATH_MAX + 1], addr[18], key[38];
+
+	create_filename(filename, PATH_MAX, sba, "proximity");
+
+	create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+
+	ba2str(dba, addr);
+
+	snprintf(key, sizeof(key), "%17s#%s", addr, alert);
+
+	return textfile_put(filename, key, level);
+}
+
+static char *read_proximity_config(bdaddr_t *sba, bdaddr_t *dba,
+							const char *alert)
+{
+	char filename[PATH_MAX + 1], addr[18], key[38];
+
+	create_filename(filename, PATH_MAX, sba, "proximity");
+
+	ba2str(dba, addr);
+	snprintf(key, sizeof(key), "%17s#%s", addr, alert);
+
+	return textfile_caseget(filename, key);
+}
+
 static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 						const char *level, void *data)
 {
 	struct monitor *monitor = data;
+	bdaddr_t sba, dba;
 
 	if (!g_str_equal("none", level) && !g_str_equal("mild", level) &&
 			!g_str_equal("high", level))
@@ -57,6 +105,11 @@ static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 	g_free(monitor->linklosslevel);
 	monitor->linklosslevel = g_strdup(level);
 
+	/* FIXME: using hardcoded values */
+	bacpy(&sba, BDADDR_ANY);
+	bacpy(&dba, BDADDR_ALL);
+	write_proximity_config(&sba, &dba, "LinkLossAlertLevel", level);
+
 	return dbus_message_new_method_return(msg);
 }
 
@@ -143,9 +196,19 @@ static void monitor_destroy(gpointer user_data)
 int monitor_register(DBusConnection *conn)
 {
 	struct monitor *monitor;
+	bdaddr_t sba, dba;
+	char *level;
 	int ret = -1;
 
+	/* FIXME: using hardcoded values */
+	bacpy(&sba, BDADDR_ANY);
+	bacpy(&dba, BDADDR_ALL);
+
+	level = read_proximity_config(&sba, &dba, "LinkLossAlertLevel");
+
 	monitor = g_new0(struct monitor, 1);
+	monitor->linklosslevel = (level ? : g_strdup("none"));
+
 	if (g_dbus_register_interface(conn, PROXIMITY_PATH,
 				PROXIMITY_INTERFACE,
 				monitor_methods, monitor_signals,
-- 
1.7.6

[PATCH BlueZ 4/5] Emit a signal when Link Loss Alert Level changes

[Claudio Takahasi]

From: Sheldon Demario <sheldon.demario@openbossa.org>

There is only one instance of the Alert level in the Link Loss service.
Signal is emitted to notify other local clients that the alert level
has changed. Necessary if the proximity monitor wants to notify the user
and the application responsible for alerting is another application.
---
 proximity/monitor.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/proximity/monitor.c b/proximity/monitor.c
index 3b2a96e..8bcd4a3 100644
--- a/proximity/monitor.c
+++ b/proximity/monitor.c
@@ -110,6 +110,10 @@ static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 	bacpy(&dba, BDADDR_ALL);
 	write_proximity_config(&sba, &dba, "LinkLossAlertLevel", level);
 
+	emit_property_changed(conn, PROXIMITY_PATH,
+				PROXIMITY_INTERFACE, "LinkLossAlertLevel",
+				DBUS_TYPE_STRING, &monitor->linklosslevel);
+
 	return dbus_message_new_method_return(msg);
 }
 
-- 
1.7.6

[PATCH BlueZ 5/5] Use device object path on Proximity Monitor

[Claudio Takahasi]

From: Sheldon Demario <sheldon.demario@openbossa.org>

---
 proximity/manager.c |   11 ++---------
 proximity/monitor.c |   48 +++++++++++++++++++++++++++---------------------
 proximity/monitor.h |    4 ++--
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/proximity/manager.c b/proximity/manager.c
index f49d066..8d0aee1 100644
--- a/proximity/manager.c
+++ b/proximity/manager.c
@@ -41,11 +41,12 @@ static DBusConnection *connection = NULL;
 
 static int attio_device_probe(struct btd_device *device, GSList *uuids)
 {
-	return 0;
+	return monitor_register(connection, device);
 }
 
 static void attio_device_remove(struct btd_device *device)
 {
+	monitor_unregister(connection, device);
 }
 
 static struct btd_device_driver monitor_driver = {
@@ -67,20 +68,12 @@ int proximity_manager_init(DBusConnection *conn)
 
 	connection = dbus_connection_ref(conn);
 
-	ret = monitor_register(connection);
-
-	if (ret < 0) {
-		dbus_connection_unref(connection);
-		return ret;
-	}
-
 	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/monitor.c b/proximity/monitor.c
index 8bcd4a3..8465f92 100644
--- a/proximity/monitor.c
+++ b/proximity/monitor.c
@@ -37,16 +37,17 @@
 #include <bluetooth/bluetooth.h>
 
 #include "dbus-common.h"
+#include "adapter.h"
+#include "device.h"
 #include "error.h"
 #include "log.h"
-
 #include "monitor.h"
 #include "textfile.h"
 
 #define PROXIMITY_INTERFACE "org.bluez.Proximity"
-#define PROXIMITY_PATH "/org/bluez/proximity"
 
 struct monitor {
+	struct btd_device *device;
 	char *linklosslevel;		/* Link Loss Alert Level */
 };
 
@@ -93,6 +94,8 @@ static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 						const char *level, void *data)
 {
 	struct monitor *monitor = data;
+	struct btd_device *device = monitor->device;
+	const char *path = device_get_path(device);
 	bdaddr_t sba, dba;
 
 	if (!g_str_equal("none", level) && !g_str_equal("mild", level) &&
@@ -105,12 +108,12 @@ static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 	g_free(monitor->linklosslevel);
 	monitor->linklosslevel = g_strdup(level);
 
-	/* FIXME: using hardcoded values */
-	bacpy(&sba, BDADDR_ANY);
-	bacpy(&dba, BDADDR_ALL);
+	adapter_get_address(device_get_adapter(device), &sba);
+	device_get_address(device, &dba);
+
 	write_proximity_config(&sba, &dba, "LinkLossAlertLevel", level);
 
-	emit_property_changed(conn, PROXIMITY_PATH,
+	emit_property_changed(conn, path,
 				PROXIMITY_INTERFACE, "LinkLossAlertLevel",
 				DBUS_TYPE_STRING, &monitor->linklosslevel);
 
@@ -193,42 +196,45 @@ static void monitor_destroy(gpointer user_data)
 {
 	struct monitor *monitor = user_data;
 
+	btd_device_unref(monitor->device);
 	g_free(monitor->linklosslevel);
 	g_free(monitor);
 }
 
-int monitor_register(DBusConnection *conn)
+int monitor_register(DBusConnection *conn, struct btd_device *device)
 {
+	const char *path = device_get_path(device);
 	struct monitor *monitor;
 	bdaddr_t sba, dba;
 	char *level;
-	int ret = -1;
 
-	/* FIXME: using hardcoded values */
-	bacpy(&sba, BDADDR_ANY);
-	bacpy(&dba, BDADDR_ALL);
+	adapter_get_address(device_get_adapter(device), &sba);
+	device_get_address(device, &dba);
 
 	level = read_proximity_config(&sba, &dba, "LinkLossAlertLevel");
 
 	monitor = g_new0(struct monitor, 1);
+	monitor->device = btd_device_ref(device);
 	monitor->linklosslevel = (level ? : g_strdup("none"));
 
-	if (g_dbus_register_interface(conn, PROXIMITY_PATH,
+	if (g_dbus_register_interface(conn, path,
 				PROXIMITY_INTERFACE,
 				monitor_methods, monitor_signals,
-				NULL, monitor, monitor_destroy) == TRUE) {
-		DBG("Registered interface %s on path %s", PROXIMITY_INTERFACE,
-							PROXIMITY_PATH);
-		ret = 0;
-
+				NULL, monitor, monitor_destroy) == FALSE) {
+		error("D-Bus failed to register %s interface",
+						PROXIMITY_INTERFACE);
+		monitor_destroy(monitor);
+		return -1;
 	}
 
-	error("D-Bus failed to register %s interface", PROXIMITY_INTERFACE);
+	DBG("Registered interface %s on path %s", PROXIMITY_INTERFACE, path);
 
-	return ret;
+	return 0;
 }
 
-void monitor_unregister(DBusConnection *conn)
+void monitor_unregister(DBusConnection *conn, struct btd_device *device)
 {
-	g_dbus_unregister_interface(conn, PROXIMITY_PATH, PROXIMITY_INTERFACE);
+	const char *path = device_get_path(device);
+
+	g_dbus_unregister_interface(conn, path, PROXIMITY_INTERFACE);
 }
diff --git a/proximity/monitor.h b/proximity/monitor.h
index d4913ac..5c6ebf6 100644
--- a/proximity/monitor.h
+++ b/proximity/monitor.h
@@ -22,5 +22,5 @@
  *
  */
 
-int monitor_register(DBusConnection *conn);
-void monitor_unregister(DBusConnection *conn);
+int monitor_register(DBusConnection *conn, struct btd_device *device);
+void monitor_unregister(DBusConnection *conn, struct btd_device *device);
-- 
1.7.6

Re: [PATCH BlueZ 0/5] Add Get/Set Property for Link Loss

[Anderson Lizardo]

Hi,

On Tue, Jul 26, 2011 at 1:53 PM, Claudio Takahasi
<claudio.takahasi@openbossa.org> wrote:
> Dependency: "[PATCH] Proximity Monitor implementation (for testing)"
> sent from Anderson Lizardo. Small conflict in proximity/manager.c

Actually, my series was for Proximity Reporter. But the conflict note
still holds.  proximity/manager.c has entry points for both Monitor
and Reporter, thus the dependency.

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

Re: [PATCH BlueZ 0/5] Add Get/Set Property for Link Loss

[Johan Hedberg]

Hi,

On Tue, Jul 26, 2011, Claudio Takahasi wrote:
> Dependency: "[PATCH] Proximity Monitor implementation (for testing)"
> sent from Anderson Lizardo. Small conflict in proximity/manager.c
> 
> The following patches implement Get/SetProperty for LinkLossAlertLevel
> in the Proximity Monitor. Contains D-Bus methods/signals implementation
> without remote comunication, alert level characteristic value is not
> being written yet.
> 
> Bruna Moreira (1):
>   Add load/store functions for Alert Level
> 
> Sheldon Demario (4):
>   Add set Link Loss Alert Level
>   Add get Link Loss Alert Level
>   Emit a signal when Link Loss Alert Level changes
>   Use device object path on Proximity Monitor
> 
>  proximity/manager.c |   11 +---
>  proximity/monitor.c |  190 ++++++++++++++++++++++++++++++++++++++++++++++-----
>  proximity/monitor.h |    4 +-
>  3 files changed, 177 insertions(+), 28 deletions(-)

This patch-set has also been applied. Thanks.

Johan