From: Bartosz Szatkowski <bulislaw@linux.com>
To: linux-bluetooth@vger.kernel.org
Cc: Bartosz Szatkowski <bulislaw@linux.com>
Subject: [PATCH BlueZ 1/3] Add SetRemoteProperties method for OOB COD setting
Date: Thu, 11 Aug 2011 13:14:55 +0200 [thread overview]
Message-ID: <1313061297-16884-1-git-send-email-bulislaw@linux.com> (raw)
Add method for suppling class of device through OOB mechanism, to be
available at pairing phase. At this point it may be presented to the
user, by agent, in confirmation request (or whatever).
---
doc/oob-api.txt | 13 ++++
plugins/dbusoob.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 183 insertions(+), 0 deletions(-)
diff --git a/doc/oob-api.txt b/doc/oob-api.txt
index d838712..0324758 100644
--- a/doc/oob-api.txt
+++ b/doc/oob-api.txt
@@ -36,3 +36,16 @@ Methods array{byte} hash, array{byte} randomizer ReadLocalData()
Possible errors: org.bluez.Error.Failed
org.bluez.Error.InvalidArguments
+
+ void SetRemoteProperties(string address, dict data)
+
+ This method set new properties for device with specified
+ address, to be used when device is created.
+ On success DeviceFound signal will be emitted.
+
+ Currently supported keys:
+
+ Class uint32
+
+ Possible errors: org.bluez.Error.Failed
+ org.bluez.Error.InvalidArguments
diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c
index 2c03780..ca0c635 100644
--- a/plugins/dbusoob.c
+++ b/plugins/dbusoob.c
@@ -43,6 +43,7 @@
#include "event.h"
#include "error.h"
#include "oob.h"
+#include "storage.h"
#define OOB_INTERFACE "org.bluez.OutOfBand"
@@ -51,6 +52,13 @@ struct oob_request {
DBusMessage *msg;
};
+struct oob_remote_parameters {
+ bdaddr_t local;
+ bdaddr_t peer;
+ const char *address;
+ uint32_t class;
+};
+
static GSList *oob_requests = NULL;
static DBusConnection *connection = NULL;
@@ -153,6 +161,167 @@ static DBusMessage *add_remote_data(DBusConnection *conn, DBusMessage *msg,
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
+static void emit_device_found(const char *path,
+ struct oob_remote_parameters *params)
+{
+ DBusMessage *signal;
+ DBusMessageIter iter, dict;
+
+ signal = dbus_message_new_signal(path, ADAPTER_INTERFACE,
+ "DeviceFound");
+ if (signal == NULL) {
+ error("Unable to allocate new %s.DeviceFound signal",
+ ADAPTER_INTERFACE);
+ return;
+ }
+
+ dbus_message_iter_init_append(signal, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING,
+ ¶ms->address);
+
+ 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);
+
+ if (params->class != 0)
+ dict_append_entry(&dict, "Class", DBUS_TYPE_UINT32,
+ ¶ms->class);
+
+ dbus_message_iter_close_container(&iter, &dict);
+
+ g_dbus_send_message(connection, signal);
+}
+
+static DBusMessage *parse_class(DBusMessageIter *value,
+ struct oob_remote_parameters *params, DBusMessage *msg)
+{
+ if (dbus_message_iter_get_arg_type(value) != DBUS_TYPE_UINT32)
+ return btd_error_invalid_args(msg);
+
+ dbus_message_iter_get_basic(value, ¶ms->class);
+
+ return NULL;
+}
+
+static gboolean set_class(struct oob_remote_parameters *params)
+{
+ if (params->class == 0)
+ return FALSE;
+
+ if (write_remote_class(¶ms->local, ¶ms->peer,
+ params->class) < 0) {
+ error("Setting device class failed");
+
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static DBusMessage *parse_property(const char *property,
+ DBusMessageIter *value, DBusMessage *msg,
+ struct oob_remote_parameters *params)
+{
+ if (g_str_equal("Class", property))
+ return parse_class(value, params, msg);
+
+ return NULL;
+}
+
+static void set_properties(struct btd_adapter *adapter, DBusMessage *msg,
+ struct oob_remote_parameters *params)
+{
+ gboolean device_found = FALSE;
+
+ if (set_class(params))
+ device_found = TRUE;
+
+ if (device_found)
+ emit_device_found(adapter_get_path(adapter), params);
+}
+
+static DBusMessage *set_remote_properties(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct btd_adapter *adapter = data;
+ DBusMessageIter iter_msg, iter_dict, iter_entry, iter_variant;
+ struct oob_remote_parameters *params;
+ char *addr;
+ DBusMessage *result;
+
+ if (!dbus_message_iter_init(msg, &iter_msg))
+ return btd_error_invalid_args(msg);
+
+ if (dbus_message_iter_get_arg_type(&iter_msg) != DBUS_TYPE_STRING)
+ return btd_error_invalid_args(msg);
+
+ dbus_message_iter_get_basic(&iter_msg, &addr);
+
+ if (bachk(addr))
+ return btd_error_invalid_args(msg);
+
+ dbus_message_iter_get_basic(&iter_msg, &addr);
+ dbus_message_iter_next(&iter_msg);
+
+ if (dbus_message_iter_get_arg_type(&iter_msg) != DBUS_TYPE_ARRAY)
+ return btd_error_invalid_args(msg);
+
+ params = g_new0(struct oob_remote_parameters, 1);
+
+ params->address = addr;
+ adapter_get_address(adapter, ¶ms->local);
+ str2ba(addr, ¶ms->peer);
+
+ dbus_message_iter_recurse(&iter_msg, &iter_dict);
+
+ for (; dbus_message_iter_get_arg_type(&iter_dict) != DBUS_TYPE_INVALID;
+ dbus_message_iter_next(&iter_dict)) {
+ char *property;
+
+ if (dbus_message_iter_get_arg_type(&iter_dict) !=
+ DBUS_TYPE_DICT_ENTRY) {
+ result = btd_error_invalid_args(msg);
+
+ goto done;
+ }
+
+ dbus_message_iter_recurse(&iter_dict, &iter_entry);
+
+ if (dbus_message_iter_get_arg_type(&iter_entry) !=
+ DBUS_TYPE_STRING) {
+ result = btd_error_invalid_args(msg);
+
+ goto done;
+ }
+
+ dbus_message_iter_get_basic(&iter_entry, &property);
+ dbus_message_iter_next(&iter_entry);
+
+ if (dbus_message_iter_get_arg_type(&iter_entry) !=
+ DBUS_TYPE_VARIANT) {
+ result = btd_error_invalid_args(msg);
+
+ goto done;
+ }
+
+ dbus_message_iter_recurse(&iter_entry, &iter_variant);
+
+ result = parse_property(property, &iter_variant, msg, params);
+ if (result != NULL)
+ goto done;
+ }
+
+ set_properties(adapter, msg, params);
+
+ result = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+
+done:
+ g_free(params);
+
+ return result;
+}
+
static DBusMessage *remove_remote_data(DBusConnection *conn, DBusMessage *msg,
void *data)
{
@@ -177,6 +346,7 @@ static DBusMessage *remove_remote_data(DBusConnection *conn, DBusMessage *msg,
static GDBusMethodTable oob_methods[] = {
{"AddRemoteData", "sayay", "", add_remote_data},
+ {"SetRemoteProperties", "sa{sv}", "", set_remote_properties},
{"RemoveRemoteData", "s", "", remove_remote_data},
{"ReadLocalData", "", "ayay", read_local_data,
G_DBUS_METHOD_FLAG_ASYNC},
--
1.7.4.1
next reply other threads:[~2011-08-11 11:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-11 11:14 Bartosz Szatkowski [this message]
2011-08-11 11:14 ` [PATCH BlueZ 2/3] Add support for OOB data in SetRemoteProperties Bartosz Szatkowski
2011-08-11 11:14 ` [PATCH BlueZ 3/3] Add support for name in OOB SetRemoteProperties Bartosz Szatkowski
2011-08-11 16:51 ` [PATCH BlueZ 1/3] Add SetRemoteProperties method for OOB COD setting Vinicius Costa Gomes
2011-08-11 19:16 ` Bartosz Szatkowski
2011-08-12 7:15 ` [PATCH " Bartosz Szatkowski
2011-08-22 7:22 ` Johan Hedberg
2011-08-22 8:12 ` Bartosz Szatkowski
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=1313061297-16884-1-git-send-email-bulislaw@linux.com \
--to=bulislaw@linux.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.