bluetooth: Add profile register / unregister

Adds utility API to handle BlueZ 5 RegisterProfile and UnregisterProfile
methods.

diff --git a/Makefile.am b/Makefile.am
index 072b3860c7981653920db77936f8175bea44e861..1fc452066909a65b6b4fd711e064a314b0a5b88f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -435,7 +435,7 @@ builtin_cflags += @BLUEZ_CFLAGS@
 builtin_libadd += @BLUEZ_LIBS@
 else
 builtin_modules += bluez5
-builtin_sources += plugins/bluez5.c
+builtin_sources += plugins/bluez5.c plugins/bluez5.h
 
 builtin_modules += hfp_bluez5
 builtin_sources += plugins/hfp_hf_bluez5.c

diff --git a/plugins/bluez5.c b/plugins/bluez5.c
index 335331c9d085f5e40916194a6b7fac667cdea45c..84ba47d78f74465b228227ff6520098e46fdfb29 100644 (file)
--- a/plugins/bluez5.c
+++ b/plugins/bluez5.c
@@ -23,11 +23,123 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
 #include <glib.h>
 
 #define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/dbus.h>
 #include <ofono/plugin.h>
 #include <ofono/log.h>
 
+#include <gdbus/gdbus.h>
+#include "bluez5.h"
+
+#define BLUEZ_PROFILE_MGMT_INTERFACE   BLUEZ_SERVICE ".ProfileManager1"
+
+static void profile_register_cb(DBusPendingCall *call, gpointer user_data)
+{
+       DBusMessage *reply;
+       DBusError derr;
+
+       reply = dbus_pending_call_steal_reply(call);
+
+       dbus_error_init(&derr);
+
+       if (dbus_set_error_from_message(&derr, reply)) {
+               ofono_error("RegisterProfile() replied an error: %s, %s",
+                                               derr.name, derr.message);
+               dbus_error_free(&derr);
+               goto done;
+       }
+
+       DBG("");
+
+done:
+       dbus_message_unref(reply);
+}
+
+static void unregister_profile_cb(DBusPendingCall *call, gpointer user_data)
+{
+       DBusMessage *reply;
+       DBusError derr;
+
+       reply = dbus_pending_call_steal_reply(call);
+
+       dbus_error_init(&derr);
+
+       if (dbus_set_error_from_message(&derr, reply)) {
+               ofono_error("UnregisterProfile() replied an error: %s, %s",
+                                               derr.name, derr.message);
+               dbus_error_free(&derr);
+               goto done;
+       }
+
+       DBG("");
+
+done:
+       dbus_message_unref(reply);
+}
+
+int bluetooth_register_profile(DBusConnection *conn, const char *uuid,
+                                       const char *name, const char *object)
+{
+       DBusMessageIter iter, dict;
+       DBusPendingCall *c;
+       DBusMessage *msg;
+
+       DBG("Bluetooth: Registering %s (%s) profile", uuid, name);
+
+       msg = dbus_message_new_method_call(BLUEZ_SERVICE, "/org/bluez",
+                       BLUEZ_PROFILE_MGMT_INTERFACE, "RegisterProfile");
+
+       dbus_message_iter_init_append(msg, &iter);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, &object);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &uuid);
+
+       dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &dict);
+       ofono_dbus_dict_append(&dict, "Name", DBUS_TYPE_STRING, &name);
+
+       dbus_message_iter_close_container(&iter, &dict);
+
+       if (!dbus_connection_send_with_reply(conn, msg, &c, -1)) {
+               ofono_error("Sending RegisterProfile failed");
+               dbus_message_unref(msg);
+               return -EIO;
+       }
+
+       dbus_pending_call_set_notify(c, profile_register_cb, NULL, NULL);
+       dbus_pending_call_unref(c);
+
+       dbus_message_unref(msg);
+
+       return 0;
+}
+
+void bluetooth_unregister_profile(DBusConnection *conn, const char *object)
+{
+       DBusMessageIter iter;
+       DBusPendingCall *c;
+       DBusMessage *msg;
+
+       DBG("Bluetooth: Unregistering profile %s", object);
+
+       msg = dbus_message_new_method_call(BLUEZ_SERVICE, "/org/bluez",
+                       BLUEZ_PROFILE_MGMT_INTERFACE, "UnregisterProfile");
+
+       dbus_message_iter_init_append(msg, &iter);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, &object);
+
+       if (!dbus_connection_send_with_reply(conn, msg, &c, -1)) {
+               ofono_error("Sending RegisterProfile failed");
+               dbus_message_unref(msg);
+               return;
+       }
+
+       dbus_pending_call_set_notify(c, unregister_profile_cb, NULL, NULL);
+       dbus_pending_call_unref(c);
+
+       dbus_message_unref(msg);
+}
+
 OFONO_PLUGIN_DEFINE(bluez5, "BlueZ 5 Utils Plugin", VERSION,
                        OFONO_PLUGIN_PRIORITY_DEFAULT, NULL, NULL)

diff --git a/plugins/bluez5.h b/plugins/bluez5.h
new file mode 100644 (file)
index 0000000..99bf896
--- /dev/null
+++ b/plugins/bluez5.h
@@ -0,0 +1,29 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2013  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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
+ *
+ */
+
+#define        BLUEZ_SERVICE "org.bluez"
+
+#define HFP_HS_UUID    "0000111e-0000-1000-8000-00805f9b34fb"
+
+int bluetooth_register_profile(DBusConnection *conn, const char *uuid,
+                                       const char *name, const char *object);
+
+void bluetooth_unregister_profile(DBusConnection *conn, const char *object);