* Re: [BLE] org.bluez.Device1.Connect() returns org.bluez.Error.NotAvailable
From: Anderson Lizardo @ 2012-12-12 10:58 UTC (permalink / raw)
To: Ting Chou, linux-bluetooth@vger.kernel.org
In-Reply-To: <20121212103614.GA7669@x220>
Hi Johan,
On Wed, Dec 12, 2012 at 6:36 AM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> I agree that Device.Connect should at least work on devices that have
> been discovered but on whom we haven't completed service discovery yet.
> This would be analogous to the old Adapter.CreateDevice and it'd allow
> us to implement proper support for devices not supporting SMP (i.e.
> devices you can't call Device.Pair on). What remains to be discussed is
> whether Device.Connect is useful for LE devices in some more extended
> sense. Maybe it could at least force calling device_set_auto_connect().
On that matter, I would suggest (although I didn't spent much time
thinking on the consequences) that Device.Connect should add device to
auto connect list, and Device.Disconnect should disconnect current
connection and remove device from autoconnect list.
For devices which have services implemented inside BlueZ (e.g. HTP),
I'm not sure this is a good idea, because these profiles explicitely
state on their spec what should happen in case of disconnection, so it
is better to have BlueZ handle this for them (IMHO).
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* RE: [BLE] org.bluez.Device1.Connect() returns org.bluez.Error.NotAvailable
From: Ting Chou @ 2012-12-12 11:30 UTC (permalink / raw)
To: Anderson Lizardo; +Cc: Johan Hedberg, linux-bluetooth@vger.kernel.org
In-Reply-To: <CAJdJm_Nb-W=ua7aUr7O578jJwLDGaC2-uC=vv0P2zdZOaXWUPg@mail.gmail.com>
Hi Anderson,
> -----Original Message-----
> From: Anderson Lizardo [mailto:anderson.lizardo@openbossa.org]
> Sent: Wednesday, December 12, 2012 6:53 PM
> To: Ting Chou
> Cc: Johan Hedberg; linux-bluetooth@vger.kernel.org
> Subject: Re: [BLE] org.bluez.Device1.Connect() returns
> org.bluez.Error.NotAvailable
>
> Hi Ting,
>
> On Wed, Dec 12, 2012 at 6:21 AM, Ting Chou <Ting.Chou@iasolution.net>
> wrote:
> > Do you mean once a LE device with internally supported profiles is
> > discovered, it will be connected automatically? Which means I cannot
> > connect manually, at the timing I prefer?
> >
> > Since with my BT 4.0 dongle, Adpater.StartDiscovery discover also LE
> > devices, I thought I should use Device.Connect to connect to the
> device.
>
> According to the General Connection Establishment procedure (GCEP, see
> Core spec page 1716 for details), the host shall start scanning and:
>
> "When the Host discovers a device to which the Host may attempt to
> connect, the Host shall stop the scanning, and initiate a connection
> using the direct con- nection establishment procedure."
>
> That's exactly what BlueZ does for LE devices. For paired devices whose
> profile is supported internally by BlueZ (e.g. a LE thermometer), the
> GCEP will keep trying to connect to them, where "connect" means using
> LE active/passive scan, followed by the procedure above.
>
Does this mean the "User selects a device to connect" in Figure 9.6 (Page 1715,
Flow chart for a device performing the general connection establishment
procedure) is not needed for supported devices?
> For unsupported devices, IIRC there will be not attempt to keep re-
> connecting to it (or even keep the connection up after service
> discovery). This should be addressed by the generic GATT API in
> attrib/client.c, but the current implementation has several limitations
> and is not implementing a consistent API, therefore it will probably be
> removed for first BlueZ 5.0 release, and a replacement (which should
> probably address reconnection for external/proprietary GATT services)
> will be implemented.
>
I'm not sure if I understand correctly. But do you mean the GCEP you mentioned
above is applied while "reconnecting" to a supported device?
Thanks,
Ting
^ permalink raw reply
* [PATCH BlueZ 01/11] obexd: Port bluetooth plugin to use external profile support
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This changes obexd to use ProfileManager.RegisterProfile
---
obexd/plugins/bluetooth.c | 696 ++++++++++++++--------------------------------
1 file changed, 212 insertions(+), 484 deletions(-)
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 1448d0e..fc88a1e 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -43,270 +43,33 @@
#include "transport.h"
#include "service.h"
#include "log.h"
+#include "uuid.h"
#define BT_RX_MTU 32767
#define BT_TX_MTU 32767
-#define TIMEOUT 60*1000 /* Timeout for user response (miliseconds) */
-
-struct pending_request {
- DBusPendingCall *call;
- struct bluetooth_service *service;
- char *adapter_path;
- char address[18];
- unsigned int watch;
- GIOChannel *io;
-};
-
-struct bluetooth_service {
+struct bluetooth_profile {
struct obex_server *server;
struct obex_service_driver *driver;
- uint32_t handle;
+ char *uuid;
+ char *path;
};
-struct adapter_any {
- char *path; /* Adapter ANY path */
- GSList *services; /* List of services to register records */
-};
+static GSList *profiles = NULL;
static DBusConnection *connection = NULL;
-static struct adapter_any *any = NULL;
-
-static void add_record_reply(DBusPendingCall *call, void *user_data)
-{
- struct bluetooth_service *service = user_data;
- DBusMessage *reply = dbus_pending_call_steal_reply(call);
- DBusError derr;
- uint32_t handle;
-
- dbus_error_init(&derr);
- if (dbus_set_error_from_message(&derr, reply)) {
- error("bluetooth: Replied with an error: %s, %s",
- derr.name, derr.message);
- dbus_error_free(&derr);
- handle = 0;
- } else {
- dbus_message_get_args(reply, NULL,
- DBUS_TYPE_UINT32, &handle,
- DBUS_TYPE_INVALID);
-
- service->handle = handle;
-
- DBG("Registered: %s, handle: 0x%x",
- service->driver->name, service->handle);
- }
-
- dbus_message_unref(reply);
-}
-
-static int add_record(const char *path, const char *xml,
- struct bluetooth_service *service)
-{
- DBusMessage *msg;
- DBusPendingCall *call;
- int ret = 0;
-
- msg = dbus_message_new_method_call("org.bluez", path,
- "org.bluez.Service", "AddRecord");
-
- dbus_message_append_args(msg, DBUS_TYPE_STRING, &xml,
- DBUS_TYPE_INVALID);
-
- if (dbus_connection_send_with_reply(connection,
- msg, &call, -1) == FALSE) {
- ret = -1;
- goto failed;
- }
-
- dbus_pending_call_set_notify(call, add_record_reply, service, NULL);
- dbus_pending_call_unref(call);
-
-failed:
- dbus_message_unref(msg);
- return ret;
-}
-
-static struct bluetooth_service *find_service(
- struct obex_service_driver *driver)
-{
- GSList *l;
-
- for (l = any->services; l; l = l->next) {
- struct bluetooth_service *service = l->data;
-
- if (service->driver == driver)
- return service;
- }
-
- return NULL;
-}
-
-static void register_record(struct obex_server *server)
-{
- const GSList *l;
-
- if (connection == NULL)
- return;
-
- for (l = server->drivers; l; l = l->next) {
- struct obex_service_driver *driver = l->data;
- struct bluetooth_service *service;
- char *xml;
-
- service = find_service(driver);
- if (service == NULL) {
- service = g_new0(struct bluetooth_service, 1);
- service->driver = driver;
- service->server = server;
- any->services = g_slist_append(any->services, service);
- }
-
- /* Service already has a record registered */
- if (service->handle != 0)
- continue;
-
- /* Adapter ANY is not available yet: Add record later */
- if (any->path == NULL)
- continue;
-
- if (driver->port != 0)
- xml = g_markup_printf_escaped(driver->record,
- driver->channel,
- driver->name,
- driver->port);
- else
- xml = g_markup_printf_escaped(driver->record,
- driver->channel,
- driver->name);
-
- add_record(any->path, xml, service);
- g_free(xml);
- }
-}
-
-static void find_adapter_any_reply(DBusPendingCall *call, void *user_data)
-{
- DBusMessage *reply = dbus_pending_call_steal_reply(call);
- const char *path;
- GSList *l;
- DBusError derr;
-
- dbus_error_init(&derr);
- if (dbus_set_error_from_message(&derr, reply)) {
- error("bluetooth: Replied with an error: %s, %s",
- derr.name, derr.message);
- dbus_error_free(&derr);
- goto done;
- }
-
- dbus_message_get_args(reply, NULL,
- DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID);
- any->path = g_strdup(path);
-
- for (l = any->services; l; l = l->next) {
- struct bluetooth_service *service = l->data;
- struct obex_service_driver *driver = service->driver;
- char *xml;
-
- if (driver->port != 0)
- xml = g_markup_printf_escaped(driver->record,
- driver->channel,
- driver->name,
- driver->port);
- else
- xml = g_markup_printf_escaped(driver->record,
- driver->channel,
- driver->name);
-
- add_record(any->path, xml, service);
- g_free(xml);
- }
-
-done:
- dbus_message_unref(reply);
-}
-
-static DBusPendingCall *find_adapter(const char *pattern,
- DBusPendingCallNotifyFunction function,
- void *user_data)
-{
- DBusMessage *msg;
- DBusPendingCall *call;
-
- DBG("FindAdapter(%s)", pattern);
-
- msg = dbus_message_new_method_call("org.bluez", "/",
- "org.bluez.Manager", "FindAdapter");
- if (!msg)
- return NULL;
-
- dbus_message_append_args(msg, DBUS_TYPE_STRING, &pattern,
- DBUS_TYPE_INVALID);
-
- if (!dbus_connection_send_with_reply(connection, msg, &call, -1)) {
- dbus_message_unref(msg);
- return NULL;
- }
-
- dbus_pending_call_set_notify(call, function, user_data, NULL);
-
- dbus_message_unref(msg);
-
- return call;
-}
-
-static void name_acquired(DBusConnection *conn, void *user_data)
-{
- DBusPendingCall *call;
-
- call = find_adapter("any", find_adapter_any_reply, NULL);
- if (call)
- dbus_pending_call_unref(call);
-}
-
-static void name_released(DBusConnection *conn, void *user_data)
-{
- GSList *l;
-
- /* reset handles so the services got register next time */
- for (l = any->services; l; l = l->next) {
- struct bluetooth_service *service = l->data;
-
- service->handle = 0;
- }
-
- g_free(any->path);
- any->path = NULL;
-
-}
-
-static void service_cancel(struct pending_request *pending)
-{
- DBusMessage *msg;
-
- msg = dbus_message_new_method_call("org.bluez",
- pending->adapter_path,
- "org.bluez.Service",
- "CancelAuthorization");
-
- g_dbus_send_message(connection, msg);
-}
-static void pending_request_free(struct pending_request *pending)
+static DBusMessage *profile_release(DBusConnection *conn, DBusMessage *msg,
+ void *data)
{
- if (pending->call)
- dbus_pending_call_unref(pending->call);
- g_io_channel_unref(pending->io);
- g_free(pending->adapter_path);
- g_free(pending);
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
static void connect_event(GIOChannel *io, GError *err, void *user_data)
{
int sk = g_io_channel_unix_get_fd(io);
- struct bluetooth_service *service = user_data;
- struct obex_server *server = service->server;
+ struct bluetooth_profile *profile = user_data;
+ struct obex_server *server = profile->server;
int type;
int omtu = BT_TX_MTU;
int imtu = BT_RX_MTU;
@@ -340,281 +103,257 @@ drop:
return;
}
-static void service_reply(DBusPendingCall *call, void *user_data)
+static DBusMessage *profile_new_connection(DBusConnection *conn,
+ DBusMessage *msg, void *data)
{
- struct pending_request *pending = user_data;
- GIOChannel *io = pending->io;
- struct bluetooth_service *service = pending->service;
- DBusMessage *reply = dbus_pending_call_steal_reply(call);
- DBusError derr;
- GError *err = NULL;
+ DBusMessageIter args;
+ const char *device;
+ int fd;
+ GIOChannel *io;
- dbus_error_init(&derr);
- if (dbus_set_error_from_message(&derr, reply)) {
- error("bluetooth: RequestAuthorization error: %s, %s",
- derr.name, derr.message);
+ dbus_message_iter_init(msg, &args);
- if (dbus_error_has_name(&derr, DBUS_ERROR_NO_REPLY))
- service_cancel(pending);
+ if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_OBJECT_PATH)
+ return g_dbus_create_error(msg,
+ "org.bluez.Error.InvalidArguments",
+ "Invalid arguments in method call");
- dbus_error_free(&derr);
- g_io_channel_shutdown(io, TRUE, NULL);
- goto done;
- }
+ dbus_message_iter_get_basic(&args, &device);
- DBG("RequestAuthorization succeeded");
+ dbus_message_iter_next(&args);
- if (!bt_io_accept(io, connect_event, service, NULL, &err)) {
- error("%s", err->message);
- g_error_free(err);
- g_io_channel_shutdown(io, TRUE, NULL);
- }
+ if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_UNIX_FD)
+ return g_dbus_create_error(msg,
+ "org.bluez.Error.InvalidArguments",
+ "Invalid arguments in method call");
-done:
- g_source_remove(pending->watch);
- pending_request_free(pending);
- dbus_message_unref(reply);
-}
+ dbus_message_iter_get_basic(&args, &fd);
-static gboolean service_error(GIOChannel *io, GIOCondition cond,
- void *user_data)
-{
- struct pending_request *pending = user_data;
+ io = g_io_channel_unix_new(fd);
+ if (io == NULL)
+ return g_dbus_create_error(msg,
+ "org.bluez.Error.InvalidArguments",
+ "Invalid arguments in method call");
- service_cancel(pending);
+ DBG("device %s", device);
- dbus_pending_call_cancel(pending->call);
+ connect_event(io, NULL, data);
- pending_request_free(pending);
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
- return FALSE;
+static DBusMessage *profile_request_disconnection(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static void find_adapter_reply(DBusPendingCall *call, void *user_data)
+static DBusMessage *profile_cancel(DBusConnection *conn,
+ DBusMessage *msg, void *data)
{
- struct pending_request *pending = user_data;
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static const GDBusMethodTable profile_methods[] = {
+ { GDBUS_METHOD("Release",
+ NULL, NULL,
+ profile_release) },
+ { GDBUS_METHOD("NewConnection",
+ GDBUS_ARGS({ "device", "o" }, { "fd", "h" },
+ { "options", "a{sv}" }), NULL,
+ profile_new_connection) },
+ { GDBUS_METHOD("RequestDisconnection",
+ GDBUS_ARGS({ "device", "o" }), NULL,
+ profile_request_disconnection) },
+ { GDBUS_METHOD("Cancel",
+ NULL, NULL,
+ profile_cancel) },
+ { }
+};
+
+static void register_profile_reply(DBusPendingCall *call, void *user_data)
+{
+ struct bluetooth_profile *profile = user_data;
DBusMessage *reply = dbus_pending_call_steal_reply(call);
- DBusMessage *msg;
- DBusPendingCall *pcall;
- const char *path, *paddr = pending->address;
DBusError derr;
+ GError *err = NULL;
dbus_error_init(&derr);
- if (dbus_set_error_from_message(&derr, reply)) {
- error("Replied with an error: %s, %s",
- derr.name, derr.message);
- dbus_error_free(&derr);
- goto failed;
+ if (!dbus_set_error_from_message(&derr, reply)) {
+ DBG("Profile %s registered", profile->path);
+ goto done;
}
- dbus_message_get_args(reply, NULL,
- DBUS_TYPE_OBJECT_PATH, &path,
- DBUS_TYPE_INVALID);
+ g_free(profile->path);
+ profile->path = NULL;
- DBG("FindAdapter -> %s", path);
- pending->adapter_path = g_strdup(path);
+ error("bluetooth: RequestProfile error: %s, %s", derr.name,
+ derr.message);
+ dbus_error_free(&derr);
+done:
dbus_message_unref(reply);
+}
- msg = dbus_message_new_method_call("org.bluez", path,
- "org.bluez.Service", "RequestAuthorization");
-
- dbus_message_append_args(msg, DBUS_TYPE_STRING, &paddr,
- DBUS_TYPE_UINT32, &pending->service->handle,
- DBUS_TYPE_INVALID);
-
- if (!dbus_connection_send_with_reply(connection,
- msg, &pcall, TIMEOUT)) {
- dbus_message_unref(msg);
- goto failed;
- }
+static void unregister_profile(struct bluetooth_profile *profile)
+{
+ g_dbus_unregister_interface(connection, profile->path,
+ "org.bluez.Profile1");
+ g_free(profile->path);
+ profile->path = NULL;
+}
- dbus_message_unref(msg);
+static void profile_free(void *data)
+{
+ struct bluetooth_profile *profile = data;
- DBG("RequestAuthorization(%s, %x)", paddr,
- pending->service->handle);
+ if (profile->path != NULL)
+ unregister_profile(profile);
- if (!dbus_pending_call_set_notify(pcall, service_reply, pending,
- NULL)) {
- dbus_pending_call_unref(pcall);
- goto failed;
- }
+ g_free(profile->uuid);
+ g_free(profile);
+}
- dbus_pending_call_unref(pending->call);
- pending->call = pcall;
+static void append_variant(DBusMessageIter *iter, int type, void *val)
+{
+ DBusMessageIter value;
+ char sig[2] = { type, '\0' };
- /* Catches errors before authorization response comes */
- pending->watch = g_io_add_watch(pending->io,
- G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- service_error, pending);
+ dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, sig, &value);
- return;
+ dbus_message_iter_append_basic(&value, type, val);
-failed:
- g_io_channel_shutdown(pending->io, TRUE, NULL);
- pending_request_free(pending);
+ dbus_message_iter_close_container(iter, &value);
}
-static int request_service_authorization(struct bluetooth_service *service,
- GIOChannel *io,
- const char *source,
- const char *address)
-{
- struct pending_request *pending;
- if (connection == NULL || any->path == NULL)
- return -1;
+void dict_append_entry(DBusMessageIter *dict,
+ const char *key, int type, void *val)
+{
+ DBusMessageIter entry;
- pending = g_new0(struct pending_request, 1);
- pending->call = find_adapter(source, find_adapter_reply, pending);
- if (!pending->call) {
- g_free(pending);
- return -ENOMEM;
+ if (type == DBUS_TYPE_STRING) {
+ const char *str = *((const char **) val);
+ if (str == NULL)
+ return;
}
- pending->service = service;
- pending->io = g_io_channel_ref(io);
- memcpy(pending->address, address, sizeof(pending->address));
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
- return 0;
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ append_variant(&entry, type, val);
+
+ dbus_message_iter_close_container(dict, &entry);
}
-static void confirm_connection(GIOChannel *io, const char *source,
- const char *address, void *user_data)
+static int register_profile(struct bluetooth_profile *profile)
{
+ DBusMessage *msg;
+ DBusMessageIter iter, opt;
+ DBusPendingCall *call;
+ dbus_bool_t auto_connect = FALSE;
+ int ret = 0;
- struct obex_service_driver *driver = user_data;
- struct bluetooth_service *service;
- GError *err = NULL;
+ profile->path = g_strconcat("/org/bluez/obex/", profile->uuid, NULL);
+ g_strdelimit(profile->path, "-", '_');
- service = find_service(driver);
- if (service == NULL) {
- error("bluetooth: Unable to find service");
- goto drop;
+ if (!g_dbus_register_interface(connection, profile->path,
+ "org.bluez.Profile1", profile_methods,
+ NULL, NULL,
+ profile, NULL)) {
+ error("D-Bus failed to register %s", profile->path);
+ g_free(profile->path);
+ profile->path = NULL;
+ return -1;
}
- if (driver->secure) {
- if (request_service_authorization(service, io, source,
- address) < 0)
- goto drop;
+ msg = dbus_message_new_method_call("org.bluez", "/org/bluez",
+ "org.bluez.ProfileManager1",
+ "RegisterProfile");
+
+ dbus_message_iter_init_append(msg, &iter);
+
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
+ &profile->path);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING,
+ &profile->uuid);
+ 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,
+ &opt);
+ dict_append_entry(&opt, "AutoConnect", DBUS_TYPE_BOOLEAN,
+ &auto_connect);
+ dbus_message_iter_close_container(&iter, &opt);
- return;
- }
-
- if (!bt_io_accept(io, connect_event, service, NULL, &err)) {
- error("%s", err->message);
- g_error_free(err);
- goto drop;
+ if (!dbus_connection_send_with_reply(connection, msg, &call, -1)) {
+ ret = -1;
+ unregister_profile(profile);
+ goto failed;
}
- return;
+ dbus_pending_call_set_notify(call, register_profile_reply, profile,
+ NULL);
+ dbus_pending_call_unref(call);
-drop:
- g_io_channel_shutdown(io, TRUE, NULL);
+failed:
+ dbus_message_unref(msg);
+ return ret;
}
-static void confirm_rfcomm(GIOChannel *io, void *user_data)
+static const char *service2uuid(uint16_t service)
{
- GError *err = NULL;
- char source[18];
- char address[18];
- uint8_t channel;
-
- bt_io_get(io, &err,
- BT_IO_OPT_SOURCE, source,
- BT_IO_OPT_DEST, address,
- BT_IO_OPT_CHANNEL, &channel,
- BT_IO_OPT_INVALID);
- if (err) {
- error("%s", err->message);
- g_error_free(err);
- g_io_channel_shutdown(io, TRUE, NULL);
- return;
+ switch (service) {
+ case OBEX_OPP:
+ return OBEX_OPP_UUID;
+ case OBEX_FTP:
+ return OBEX_FTP_UUID;
+ case OBEX_PBAP:
+ return OBEX_PSE_UUID;
}
- info("bluetooth: New connection from: %s, channel %u", address,
- channel);
-
- confirm_connection(io, source, address, user_data);
+ return NULL;
}
-static void confirm_l2cap(GIOChannel *io, void *user_data)
+static void name_acquired(DBusConnection *conn, void *user_data)
{
- GError *err = NULL;
- char source[18];
- char address[18];
- uint16_t psm;
-
- bt_io_get(io, &err,
- BT_IO_OPT_SOURCE, source,
- BT_IO_OPT_DEST, address,
- BT_IO_OPT_PSM, &psm,
- BT_IO_OPT_INVALID);
- if (err) {
- error("%s", err->message);
- g_error_free(err);
- g_io_channel_shutdown(io, TRUE, NULL);
- return;
- }
+ GSList *l;
- info("bluetooth: New connection from: %s, psm %u", address, psm);
+ DBG("org.bluez appeared");
- confirm_connection(io, source, address, user_data);
+ for (l = profiles; l; l = l->next) {
+ struct bluetooth_profile *profile = l->data;
+ const char *uuid;
+
+ if (profile->path != NULL)
+ continue;
+
+ if (register_profile(profile) < 0) {
+ error("bluetooth: Failed to register profile %s",
+ profile->path);
+ g_free(profile->path);
+ profile->path = NULL;
+ }
+ }
}
-static GSList *start(struct obex_server *server,
- struct obex_service_driver *service)
+static void name_released(DBusConnection *conn, void *user_data)
{
- BtIOSecLevel sec_level;
- GSList *l = NULL;
- GIOChannel *io;
- GError *err = NULL;
- uint16_t psm;
-
- if (service->secure == TRUE)
- sec_level = BT_IO_SEC_MEDIUM;
- else
- sec_level = BT_IO_SEC_LOW;
-
- io = bt_io_listen(NULL, confirm_rfcomm,
- service, NULL, &err,
- BT_IO_OPT_CHANNEL, service->channel,
- BT_IO_OPT_SEC_LEVEL, sec_level,
- BT_IO_OPT_INVALID);
- if (io == NULL) {
- error("bluetooth: unable to listen in channel %d: %s",
- service->channel, err->message);
- g_error_free(err);
- } else {
- l = g_slist_prepend(l, io);
- DBG("listening on channel %d", service->channel);
- }
+ GSList *l;
- if (service->port == 0)
- return l;
-
- psm = service->port == OBEX_PORT_RANDOM ? 0 : service->port;
-
- io = bt_io_listen(NULL, confirm_l2cap,
- service, NULL, &err,
- BT_IO_OPT_PSM, psm,
- BT_IO_OPT_MODE, BT_IO_MODE_ERTM,
- BT_IO_OPT_OMTU, BT_TX_MTU,
- BT_IO_OPT_IMTU, BT_RX_MTU,
- BT_IO_OPT_SEC_LEVEL, sec_level,
- BT_IO_OPT_INVALID);
- if (io == NULL) {
- error("bluetooth: unable to listen in psm %d: %s",
- service->port, err->message);
- g_error_free(err);
- service->port = 0;
- } else {
- l = g_slist_prepend(l, io);
- bt_io_get(io, &err, BT_IO_OPT_PSM, &service->port,
- BT_IO_OPT_INVALID);
- DBG("listening on psm %d", service->port);
- }
+ DBG("org.bluez disappered");
+
+ for (l = profiles; l; l = l->next) {
+ struct bluetooth_profile *profile = l->data;
+ const char *uuid;
- return l;
+ if (profile->path == NULL)
+ continue;
+
+ unregister_profile(profile);
+ }
}
static void *bluetooth_start(struct obex_server *server, int *err)
@@ -623,34 +362,29 @@ static void *bluetooth_start(struct obex_server *server, int *err)
const GSList *l;
for (l = server->drivers; l; l = l->next) {
- struct obex_service_driver *service = l->data;
- GSList *l;
+ struct obex_service_driver *driver = l->data;
+ struct bluetooth_profile *profile;
+ const char *uuid;
- l = start(server, service);
- if (l == NULL)
+ uuid = service2uuid(driver->service);
+ if (uuid == NULL)
continue;
- ios = g_slist_concat(ios, l);
- }
-
- register_record(server);
-
- return ios;
-}
+ profile = g_new0(struct bluetooth_profile, 1);
+ profile->driver = driver;
+ profile->server = server;
+ profile->uuid = g_strdup(uuid);
-static void stop(gpointer data)
-{
- GIOChannel *io = data;
+ profiles = g_slist_prepend(profiles, profile);
+ }
- g_io_channel_shutdown(io, TRUE, NULL);
- g_io_channel_unref(io);
+ return profiles;
}
static void bluetooth_stop(void *data)
{
- GSList *ios = data;
-
- g_slist_free_full(ios, stop);
+ g_slist_free_full(profiles, profile_free);
+ profiles = NULL;
}
static int bluetooth_getpeername(GIOChannel *io, char **name)
@@ -682,8 +416,6 @@ static unsigned int listener_id = 0;
static int bluetooth_init(void)
{
- any = g_new0(struct adapter_any, 1);
-
connection = g_dbus_setup_private(DBUS_BUS_SYSTEM, NULL, NULL);
if (connection == NULL)
return -EPERM;
@@ -698,11 +430,7 @@ static void bluetooth_exit(void)
{
g_dbus_remove_watch(connection, listener_id);
- if (any) {
- g_slist_free_full(any->services, g_free);
- g_free(any->path);
- g_free(any);
- }
+ g_slist_free_full(profiles, profile_free);
if (connection)
dbus_connection_unref(connection);
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 02/11] core: Add MAS record
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds MAS record to detault settings
---
src/profile.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/src/profile.c b/src/profile.c
index fba894c..a3dd372 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -395,6 +395,47 @@
</attribute> \
</record>"
+#define MAS_RECORD \
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
+ <record> \
+ <attribute id=\"0x0001\"> \
+ <sequence> \
+ <uuid value=\"0x1132\"/> \
+ </sequence> \
+ </attribute> \
+ <attribute id=\"0x0004\"> \
+ <sequence> \
+ <sequence> \
+ <uuid value=\"0x0100\"/> \
+ </sequence> \
+ <sequence> \
+ <uuid value=\"0x0003\"/> \
+ <uint8 value=\"0x%02x\"/> \
+ </sequence> \
+ <sequence> \
+ <uuid value=\"0x0008\"/> \
+ </sequence> \
+ </sequence> \
+ </attribute> \
+ <attribute id=\"0x0009\"> \
+ <sequence> \
+ <sequence> \
+ <uuid value=\"0x1134\"/> \
+ <uint16 value=\"0x%04x\" /> \
+ </sequence> \
+ </sequence> \
+ </attribute> \
+ <attribute id=\"0x0100\"> \
+ <text value=\"%s\"/> \
+ </attribute> \
+ <attribute id=\"0x0315\"> \
+ <uint8 value=\"0x00\"/> \
+ </attribute> \
+ <attribute id=\"0x0316\"> \
+ <uint8 value=\"0x0F\"/> \
+ </attribute> \
+ </record>"
+
#define GENERIC_RECORD \
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
<record> \
@@ -1570,6 +1611,13 @@ static char *get_pse_record(struct ext_profile *ext, struct ext_io *l2cap,
ext->name);
}
+static char *get_mas_record(struct ext_profile *ext, struct ext_io *l2cap,
+ struct ext_io *rfcomm)
+{
+ return g_strdup_printf(MAS_RECORD, rfcomm->chan, ext->version,
+ ext->name);
+}
+
static char *get_opp_record(struct ext_profile *ext, struct ext_io *l2cap,
struct ext_io *rfcomm)
{
@@ -1745,6 +1793,8 @@ static struct default_settings {
.uuid = OBEX_MAS_UUID,
.name = "Message Access",
.channel = MAS_DEFAULT_CHANNEL,
+ .get_record = get_mas_record,
+ .version = 0x0100
}, {
.uuid = OBEX_MNS_UUID,
.name = "Message Notification",
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 03/11] core: Add SYNC record
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds SYNC record to detault settings
---
src/profile.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/src/profile.c b/src/profile.c
index a3dd372..53d32b6 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -436,6 +436,46 @@
</attribute> \
</record>"
+#define SYNC_RECORD \
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
+ <record> \
+ <attribute id=\"0x0001\"> \
+ <sequence> \
+ <uuid value=\"0x1104\"/> \
+ </sequence> \
+ </attribute> \
+ <attribute id=\"0x0004\"> \
+ <sequence> \
+ <sequence> \
+ <uuid value=\"0x0100\"/> \
+ </sequence> \
+ <sequence> \
+ <uuid value=\"0x0003\"/> \
+ <uint8 value=\"0x%02x\"/> \
+ </sequence> \
+ <sequence> \
+ <uuid value=\"0x0008\"/> \
+ </sequence> \
+ </sequence> \
+ </attribute> \
+ <attribute id=\"0x0009\"> \
+ <sequence> \
+ <sequence> \
+ <uuid value=\"0x1104\"/> \
+ <uint16 value=\"0x%04x\" /> \
+ </sequence> \
+ </sequence> \
+ </attribute> \
+ <attribute id=\"0x0100\"> \
+ <text value=\"%s\"/> \
+ </attribute> \
+ <attribute id=\"0x0301\"> \
+ <sequence> \
+ <uint8 value=\"0x01\"/> \
+ </sequence> \
+ </attribute> \
+ </record>"
+
#define GENERIC_RECORD \
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
<record> \
@@ -1618,6 +1658,13 @@ static char *get_mas_record(struct ext_profile *ext, struct ext_io *l2cap,
ext->name);
}
+static char *get_sync_record(struct ext_profile *ext, struct ext_io *l2cap,
+ struct ext_io *rfcomm)
+{
+ return g_strdup_printf(SYNC_RECORD, rfcomm->chan, ext->version,
+ ext->name);
+}
+
static char *get_opp_record(struct ext_profile *ext, struct ext_io *l2cap,
struct ext_io *rfcomm)
{
@@ -1777,6 +1824,8 @@ static struct default_settings {
.uuid = OBEX_SYNC_UUID,
.name = "Synchronization",
.channel = SYNC_DEFAULT_CHANNEL,
+ .get_record = get_sync_record,
+ .version = 0x0100,
}, {
.uuid = OBEX_PSE_UUID,
.name = "Phone Book Access",
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 04/11] obexd: Enable support for MAS profile
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
obexd/plugins/bluetooth.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index fc88a1e..65bcad1 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -312,6 +312,8 @@ static const char *service2uuid(uint16_t service)
return OBEX_FTP_UUID;
case OBEX_PBAP:
return OBEX_PSE_UUID;
+ case OBEX_MAS:
+ return OBEX_MAS_UUID;
}
return NULL;
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 05/11] obexd: Enable support SYNC profile
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
obexd/plugins/bluetooth.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 65bcad1..8a9e190 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -312,6 +312,8 @@ static const char *service2uuid(uint16_t service)
return OBEX_FTP_UUID;
case OBEX_PBAP:
return OBEX_PSE_UUID;
+ case OBEX_IRMC:
+ return OBEX_SYNC_UUID;
case OBEX_MAS:
return OBEX_MAS_UUID;
}
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 06/11] obexd: Add support for custom records
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Services such as pcsuite and syncml use custom records not defined by
Bluetooth SIG so they have to be registered using ServiceRecord entry.
---
obexd/plugins/bluetooth.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 8a9e190..cbc42f3 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -253,6 +253,7 @@ static int register_profile(struct bluetooth_profile *profile)
DBusMessageIter iter, opt;
DBusPendingCall *call;
dbus_bool_t auto_connect = FALSE;
+ char *xml;
int ret = 0;
profile->path = g_strconcat("/org/bluez/obex/", profile->uuid, NULL);
@@ -286,6 +287,20 @@ static int register_profile(struct bluetooth_profile *profile)
&opt);
dict_append_entry(&opt, "AutoConnect", DBUS_TYPE_BOOLEAN,
&auto_connect);
+ if (profile->driver->record) {
+ if (profile->driver->port != 0)
+ xml = g_markup_printf_escaped(profile->driver->record,
+ profile->driver->channel,
+ profile->driver->name,
+ profile->driver->port);
+ else
+ xml = g_markup_printf_escaped(profile->driver->record,
+ profile->driver->channel,
+ profile->driver->name);
+ dict_append_entry(&opt, "ServiceRecord", DBUS_TYPE_STRING,
+ &xml);
+ g_free(xml);
+ }
dbus_message_iter_close_container(&iter, &opt);
if (!dbus_connection_send_with_reply(connection, msg, &call, -1)) {
@@ -314,6 +329,10 @@ static const char *service2uuid(uint16_t service)
return OBEX_PSE_UUID;
case OBEX_IRMC:
return OBEX_SYNC_UUID;
+ case OBEX_PCSUITE:
+ return "00005005-0000-1000-8000-0002ee000001";
+ case OBEX_SYNCEVOLUTION:
+ return "00000002-0000-1000-8000-0002ee000002";
case OBEX_MAS:
return OBEX_MAS_UUID;
}
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 07/11] opp: Remove record details
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Standart service records are already supported by bluetoothd
---
obexd/plugins/opp.c | 56 -----------------------------------------------------
1 file changed, 56 deletions(-)
diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index c7ddc63..faa4437 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -44,59 +44,6 @@
#define VCARD_TYPE "text/x-vcard"
#define VCARD_FILE CONFIGDIR "/vcard.vcf"
-#define OPP_CHANNEL 9
-#define OPP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
-<record> \
- <attribute id=\"0x0001\"> \
- <sequence> \
- <uuid value=\"0x1105\"/> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0004\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x0100\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0003\"/> \
- <uint8 value=\"%u\" name=\"channel\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0008\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0009\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x1105\"/> \
- <uint16 value=\"0x0102\" name=\"version\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0100\"> \
- <text value=\"%s\" name=\"name\"/> \
- </attribute> \
- \
- <attribute id=\"0x0303\"> \
- <sequence> \
- <uint8 value=\"0x01\"/> \
- <uint8 value=\"0x02\"/> \
- <uint8 value=\"0x03\"/> \
- <uint8 value=\"0x04\"/> \
- <uint8 value=\"0x05\"/> \
- <uint8 value=\"0x06\"/> \
- <uint8 value=\"0xff\"/> \
- </sequence> \
- </attribute> \
- <attribute id=\"0x0200\"> \
- <uint16 value=\"%u\" name=\"psm\"/> \
- </attribute> \
-</record>"
-
static void *opp_connect(struct obex_session *os, int *err)
{
manager_register_transfer(os);
@@ -219,9 +166,6 @@ static void opp_reset(struct obex_session *os, void *user_data)
static struct obex_service_driver driver = {
.name = "Object Push server",
.service = OBEX_OPP,
- .channel = OPP_CHANNEL,
- .port = OBEX_PORT_RANDOM,
- .record = OPP_RECORD,
.connect = opp_connect,
.progress = opp_progress,
.disconnect = opp_disconnect,
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 08/11] ftp: Remove record details
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Standart service records are already supported by bluetoothd
---
obexd/plugins/ftp.c | 45 ---------------------------------------------
1 file changed, 45 deletions(-)
diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index ff4b761..d53774d 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -53,47 +53,6 @@
#define LST_TYPE "x-obex/folder-listing"
#define CAP_TYPE "x-obex/capability"
-#define FTP_CHANNEL 10
-#define FTP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
-<record> \
- <attribute id=\"0x0001\"> \
- <sequence> \
- <uuid value=\"0x1106\"/> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0004\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x0100\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0003\"/> \
- <uint8 value=\"%u\" name=\"channel\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0008\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0009\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x1106\"/> \
- <uint16 value=\"0x0102\" name=\"version\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0100\"> \
- <text value=\"%s\" name=\"name\"/> \
- </attribute> \
- <attribute id=\"0x0200\"> \
- <uint16 value=\"%u\" name=\"psm\"/> \
- </attribute> \
-</record>"
-
static const uint8_t FTP_TARGET[TARGET_SIZE] = {
0xF9, 0xEC, 0x7B, 0xC4, 0x95, 0x3C, 0x11, 0xD2,
0x98, 0x4E, 0x52, 0x54, 0x00, 0xDC, 0x9E, 0x09 };
@@ -519,10 +478,6 @@ void ftp_disconnect(struct obex_session *os, void *user_data)
static struct obex_service_driver ftp = {
.name = "File Transfer server",
.service = OBEX_FTP,
- .channel = FTP_CHANNEL,
- .port = OBEX_PORT_RANDOM,
- .secure = TRUE,
- .record = FTP_RECORD,
.target = FTP_TARGET,
.target_size = TARGET_SIZE,
.connect = ftp_connect,
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 09/11] pbap: Remove record details
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Standart service records are already supported by bluetoothd
---
obexd/plugins/pbap.c | 46 ----------------------------------------------
1 file changed, 46 deletions(-)
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index 4d4f0b8..4740188 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -65,49 +65,6 @@
#define PHONEBOOKSIZE_TAG 0X08
#define NEWMISSEDCALLS_TAG 0X09
-#define PBAP_CHANNEL 15
-
-#define PBAP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
-<record> \
- <attribute id=\"0x0001\"> \
- <sequence> \
- <uuid value=\"0x112f\"/> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0004\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x0100\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0003\"/> \
- <uint8 value=\"%u\" name=\"channel\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0008\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0009\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x1130\"/> \
- <uint16 value=\"0x0100\" name=\"version\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0100\"> \
- <text value=\"%s\" name=\"name\"/> \
- </attribute> \
- \
- <attribute id=\"0x0314\"> \
- <uint8 value=\"0x01\"/> \
- </attribute> \
-</record>"
-
struct cache {
gboolean valid;
uint32_t index;
@@ -664,9 +621,6 @@ static int pbap_chkput(struct obex_session *os, void *user_data)
static struct obex_service_driver pbap = {
.name = "Phonebook Access server",
.service = OBEX_PBAP,
- .channel = PBAP_CHANNEL,
- .secure = TRUE,
- .record = PBAP_RECORD,
.target = PBAP_TARGET,
.target_size = TARGET_SIZE,
.connect = pbap_connect,
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 10/11] mas: Remove record details
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Standart service records are already supported by bluetoothd
---
obexd/plugins/mas.c | 51 ---------------------------------------------------
1 file changed, 51 deletions(-)
diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c
index 1b18059..3270edd 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -49,54 +49,6 @@
#define READ_STATUS_REQ 0
#define DELETE_STATUS_REQ 1
-/* Channel number according to bluez doc/assigned-numbers.txt */
-#define MAS_CHANNEL 16
-
-#define MAS_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
-<record> \
- <attribute id=\"0x0001\"> \
- <sequence> \
- <uuid value=\"0x1132\"/> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0004\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x0100\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0003\"/> \
- <uint8 value=\"%u\" name=\"channel\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0008\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0009\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x1134\"/> \
- <uint16 value=\"0x0100\" name=\"version\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0100\"> \
- <text value=\"%s\" name=\"name\"/> \
- </attribute> \
- \
- <attribute id=\"0x0315\"> \
- <uint8 value=\"0x00\"/> \
- </attribute> \
- \
- <attribute id=\"0x0316\"> \
- <uint8 value=\"0x0F\"/> \
- </attribute> \
-</record>"
-
#define XML_DECL "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
/* Building blocks for x-obex/folder-listing */
@@ -764,9 +716,6 @@ static int any_close(void *obj)
static struct obex_service_driver mas = {
.name = "Message Access server",
.service = OBEX_MAS,
- .channel = MAS_CHANNEL,
- .secure = TRUE,
- .record = MAS_RECORD,
.target = MAS_TARGET,
.target_size = TARGET_SIZE,
.connect = mas_connect,
--
1.7.11.7
^ permalink raw reply related
* [PATCH BlueZ 11/11] irmc: Remove record details
From: Luiz Augusto von Dentz @ 2012-12-12 11:52 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Standart service records are already supported by bluetoothd
---
obexd/plugins/irmc.c | 49 -------------------------------------------------
1 file changed, 49 deletions(-)
diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c
index c9c3521..d343977 100644
--- a/obexd/plugins/irmc.c
+++ b/obexd/plugins/irmc.c
@@ -46,52 +46,6 @@
#include "filesystem.h"
#include "manager.h"
-#define IRMC_CHANNEL 14
-
-#define IRMC_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
-<record> \
- <attribute id=\"0x0001\"> \
- <sequence> \
- <uuid value=\"0x1104\"/> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0004\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x0100\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0003\"/> \
- <uint8 value=\"%u\" name=\"channel\"/> \
- </sequence> \
- <sequence> \
- <uuid value=\"0x0008\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0009\"> \
- <sequence> \
- <sequence> \
- <uuid value=\"0x1104\"/> \
- <uint16 value=\"0x0100\" name=\"version\"/> \
- </sequence> \
- </sequence> \
- </attribute> \
- \
- <attribute id=\"0x0100\"> \
- <text value=\"%s\" name=\"name\"/> \
- </attribute> \
- \
- <attribute id=\"0x0301\"> \
- <sequence> \
- <uint8 value=\"0x01\"/> \
- </sequence> \
- </attribute> \
-</record>"
-
-
struct aparam_header {
uint8_t tag;
uint8_t len;
@@ -488,9 +442,6 @@ static struct obex_mime_type_driver irmc_driver = {
static struct obex_service_driver irmc = {
.name = "IRMC Sync server",
.service = OBEX_IRMC,
- .channel = IRMC_CHANNEL,
- .secure = TRUE,
- .record = IRMC_RECORD,
.target = IRMC_TARGET,
.target_size = IRMC_TARGET_SIZE,
.connect = irmc_connect,
--
1.7.11.7
^ permalink raw reply related
* Re: [PATCH BlueZ 01/11] obexd: Port bluetooth plugin to use external profile support
From: Johan Hedberg @ 2012-12-12 12:02 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
In-Reply-To: <1355313136-7891-1-git-send-email-luiz.dentz@gmail.com>
Hi Luiz,
On Wed, Dec 12, 2012, Luiz Augusto von Dentz wrote:
> This changes obexd to use ProfileManager.RegisterProfile
> ---
> obexd/plugins/bluetooth.c | 696 ++++++++++++++--------------------------------
> 1 file changed, 212 insertions(+), 484 deletions(-)
All patches in this set have been applied. I also removed the service
plugin in the same go as now all known users of it are gone.
Johan
^ permalink raw reply
* [PATCH BlueZ] obex-client: Remove calls to org.bluez.Manager and org.bluez.Adapter
From: Luiz Augusto von Dentz @ 2012-12-12 12:16 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
With BlueZ 5 this API no longer exist or have changed.
---
obexd/client/bluetooth.c | 199 +----------------------------------------------
1 file changed, 2 insertions(+), 197 deletions(-)
diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c
index 293eb8f..e453b68 100644
--- a/obexd/client/bluetooth.c
+++ b/obexd/client/bluetooth.c
@@ -41,11 +41,6 @@
#include "transport.h"
#include "bluetooth.h"
-#define BT_BUS_NAME "org.bluez"
-#define BT_PATH "/"
-#define BT_ADAPTER_IFACE "org.bluez.Adapter"
-#define BT_MANAGER_IFACE "org.bluez.Manager"
-
#define BT_RX_MTU 32767
#define BT_TX_MTU 32767
@@ -56,11 +51,8 @@ struct bluetooth_session {
bdaddr_t src;
bdaddr_t dst;
uint16_t port;
- DBusConnection *conn; /* system bus connection */
sdp_session_t *sdp;
GIOChannel *io;
- GSList *pending_calls;
- char *adapter;
char *service;
obc_transport_func func;
void *user_data;
@@ -73,66 +65,8 @@ static GQuark obc_bt_error_quark(void)
return g_quark_from_static_string("obc-bluetooth-error-quark");
}
-static int send_method_call(struct bluetooth_session *session,
- const char *path,
- const char *interface,
- const char *method,
- DBusPendingCallNotifyFunction cb,
- int type, ...)
-{
- DBusMessage *msg;
- DBusPendingCall *call;
- va_list args;
-
- msg = dbus_message_new_method_call(BT_BUS_NAME, path, interface,
- method);
- if (!msg) {
- error("Unable to allocate new D-Bus %s message", method);
- return -ENOMEM;
- }
-
- va_start(args, type);
-
- if (!dbus_message_append_args_valist(msg, type, args)) {
- dbus_message_unref(msg);
- va_end(args);
- return -EINVAL;
- }
-
- va_end(args);
-
- if (!cb) {
- g_dbus_send_message(session->conn, msg);
- return 0;
- }
-
- if (!dbus_connection_send_with_reply(session->conn, msg, &call, -1)) {
- error("Sending %s failed", method);
- dbus_message_unref(msg);
- return -EIO;
- }
-
- dbus_pending_call_set_notify(call, cb, session, NULL);
-
- session->pending_calls = g_slist_prepend(session->pending_calls, call);
-
- dbus_message_unref(msg);
-
- return 0;
-}
-
-static void finalize_call(DBusPendingCall *call)
-{
- if (!dbus_pending_call_get_completed(call))
- dbus_pending_call_cancel(call);
-
- dbus_pending_call_unref(call);
-}
-
static void session_destroy(struct bluetooth_session *session)
{
- GSList *l;
-
DBG("%p", session);
if (g_slist_find(sessions, session) == NULL)
@@ -140,21 +74,6 @@ static void session_destroy(struct bluetooth_session *session)
sessions = g_slist_remove(sessions, session);
- if (session->adapter)
- send_method_call(session, session->adapter, BT_ADAPTER_IFACE,
- "ReleaseSession", NULL,
- DBUS_TYPE_INVALID);
-
- l = session->pending_calls;
-
- while (l) {
- DBusPendingCall *call = l->data;
- l = l->next;
-
- session->pending_calls = g_slist_remove(session->pending_calls, call);
- finalize_call(call);
- }
-
if (session->io != NULL) {
g_io_channel_shutdown(session->io, TRUE, NULL);
g_io_channel_unref(session->io);
@@ -163,11 +82,7 @@ static void session_destroy(struct bluetooth_session *session)
if (session->sdp)
sdp_close(session->sdp);
- if (session->conn)
- dbus_connection_unref(session->conn);
-
g_free(session->service);
- g_free(session->adapter);
g_free(session);
}
@@ -458,111 +373,6 @@ static int session_connect(struct bluetooth_session *session)
return err;
}
-static void adapter_reply(DBusPendingCall *call, void *user_data)
-{
- struct bluetooth_session *session = user_data;
- DBusError err;
- DBusMessage *reply;
- GError *gerr = NULL;
-
- reply = dbus_pending_call_steal_reply(call);
-
- session->pending_calls = g_slist_remove(session->pending_calls, call);
- finalize_call(call);
-
- dbus_error_init(&err);
- if (dbus_set_error_from_message(&err, reply)) {
- error("manager replied with an error: %s, %s",
- err.name, err.message);
- dbus_error_free(&err);
-
- goto failed;
- }
-
- if (session_connect(session) == 0)
- goto proceed;
-
-failed:
- g_set_error(&gerr, OBC_BT_ERROR, -EINVAL,
- "Unable to request session");
- if (session->func)
- session->func(session->io, gerr, session->user_data);
- g_clear_error(&gerr);
-
- session_destroy(session);
-
-proceed:
- dbus_message_unref(reply);
-}
-
-static int request_session(struct bluetooth_session *session, const char *adapter)
-{
- session->adapter = g_strdup(adapter);
- return send_method_call(session, adapter, BT_ADAPTER_IFACE,
- "RequestSession", adapter_reply,
- DBUS_TYPE_INVALID);
-}
-
-static void manager_reply(DBusPendingCall *call, void *user_data)
-{
- struct bluetooth_session *session = user_data;
- DBusError err;
- DBusMessage *reply;
- char *adapter;
- GError *gerr = NULL;
-
- reply = dbus_pending_call_steal_reply(call);
-
- session->pending_calls = g_slist_remove(session->pending_calls, call);
- finalize_call(call);
-
- dbus_error_init(&err);
- if (dbus_set_error_from_message(&err, reply)) {
- error("manager replied with an error: %s, %s",
- err.name, err.message);
- dbus_error_free(&err);
-
- goto failed;
- }
-
- if (!dbus_message_get_args(reply, NULL,
- DBUS_TYPE_OBJECT_PATH, &adapter,
- DBUS_TYPE_INVALID))
- goto failed;
-
- DBG("adapter path %s", adapter);
-
- if (request_session(session, adapter) == 0)
- goto proceed;
-
-failed:
- g_set_error(&gerr, OBC_BT_ERROR, -EINVAL, "No adapter found");
- if (session->func)
- session->func(session->io, gerr, session->user_data);
- g_clear_error(&gerr);
-
- session_destroy(session);
-
-proceed:
- dbus_message_unref(reply);
-}
-
-static int find_adapter(struct bluetooth_session *session, const char *source)
-{
- if (source == NULL) {
- bacpy(&session->src, BDADDR_ANY);
- return send_method_call(session, BT_PATH, BT_MANAGER_IFACE,
- "DefaultAdapter", manager_reply,
- DBUS_TYPE_INVALID);
- }
-
- str2ba(source, &session->src);
- return send_method_call(session, BT_PATH, BT_MANAGER_IFACE,
- "FindAdapter", manager_reply,
- DBUS_TYPE_STRING, &source,
- DBUS_TYPE_INVALID);
-}
-
static guint bluetooth_connect(const char *source, const char *destination,
const char *service, uint16_t port,
obc_transport_func func, void *user_data)
@@ -584,16 +394,11 @@ static guint bluetooth_connect(const char *source, const char *destination,
session->port = port;
session->user_data = user_data;
- session->conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
- if (session->conn == NULL) {
- g_free(session);
- return 0;
- }
-
session->service = g_strdup(service);
str2ba(destination, &session->dst);
+ str2ba(source, &session->src);
- if (find_adapter(session, source) < 0) {
+ if (session_connect(session) < 0) {
g_free(session);
return 0;
}
--
1.7.11.7
^ permalink raw reply related
* Re: [BLE] org.bluez.Device1.Connect() returns org.bluez.Error.NotAvailable
From: Anderson Lizardo @ 2012-12-12 12:20 UTC (permalink / raw)
To: Ting Chou; +Cc: Johan Hedberg, linux-bluetooth@vger.kernel.org
In-Reply-To: <ADCBF04BB97EBF4AAE65663F8478B61CA99E65ABFC@Luna.iaSolution.net>
Hi Ting,
On Wed, Dec 12, 2012 at 7:30 AM, Ting Chou <Ting.Chou@iasolution.net> wrote:
> Hi Anderson,
>
>> -----Original Message-----
>> From: Anderson Lizardo [mailto:anderson.lizardo@openbossa.org]
>> Sent: Wednesday, December 12, 2012 6:53 PM
>> To: Ting Chou
>> Cc: Johan Hedberg; linux-bluetooth@vger.kernel.org
>> Subject: Re: [BLE] org.bluez.Device1.Connect() returns
>> org.bluez.Error.NotAvailable
>>
>> Hi Ting,
>>
>> On Wed, Dec 12, 2012 at 6:21 AM, Ting Chou <Ting.Chou@iasolution.net>
>> wrote:
>> > Do you mean once a LE device with internally supported profiles is
>> > discovered, it will be connected automatically? Which means I cannot
>> > connect manually, at the timing I prefer?
>> >
>> > Since with my BT 4.0 dongle, Adpater.StartDiscovery discover also LE
>> > devices, I thought I should use Device.Connect to connect to the
>> device.
>>
>> According to the General Connection Establishment procedure (GCEP, see
>> Core spec page 1716 for details), the host shall start scanning and:
>>
>> "When the Host discovers a device to which the Host may attempt to
>> connect, the Host shall stop the scanning, and initiate a connection
>> using the direct con- nection establishment procedure."
>>
>> That's exactly what BlueZ does for LE devices. For paired devices whose
>> profile is supported internally by BlueZ (e.g. a LE thermometer), the
>> GCEP will keep trying to connect to them, where "connect" means using
>> LE active/passive scan, followed by the procedure above.
>>
>
> Does this mean the "User selects a device to connect" in Figure 9.6 (Page 1715,
> Flow chart for a device performing the general connection establishment
> procedure) is not needed for supported devices?
This image is incorrect, and is fixed on ESR06 (see correct image on
page 29 of that document). There is no user interaction for GCEP.
>> For unsupported devices, IIRC there will be not attempt to keep re-
>> connecting to it (or even keep the connection up after service
>> discovery). This should be addressed by the generic GATT API in
>> attrib/client.c, but the current implementation has several limitations
>> and is not implementing a consistent API, therefore it will probably be
>> removed for first BlueZ 5.0 release, and a replacement (which should
>> probably address reconnection for external/proprietary GATT services)
>> will be implemented.
>>
>
> I'm not sure if I understand correctly. But do you mean the GCEP you mentioned
> above is applied while "reconnecting" to a supported device?
Yes, all GAP connection procedures are applicable for re-connection.
There is no "reconnection" procedure as per GAP (as far as I know).
But note that each GATT profile can specify reconnection procedures in
case of disconnection due to link loss (most of those that I read have
this). For instance, in HTP:
"5.2.4 Link Loss Reconnection Procedure
When a connection is terminated due to link loss, a Collector should attempt to
reconnect to the Thermometer using any of the GAP connection procedures with the
parameters in Table 5.2."
This is what BlueZ is doing for profiles implemented internally,
except that the parameters we use are not the ones recommended on the
profile specs (that could be implemented in future, but for now GCEP
uses fixed connection parameters).
Best Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* Re: [PATCH BlueZ] obex-client: Remove calls to org.bluez.Manager and org.bluez.Adapter
From: Johan Hedberg @ 2012-12-12 12:20 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
In-Reply-To: <1355314591-8773-1-git-send-email-luiz.dentz@gmail.com>
Hi Luiz,
On Wed, Dec 12, 2012, Luiz Augusto von Dentz wrote:
> With BlueZ 5 this API no longer exist or have changed.
> ---
> obexd/client/bluetooth.c | 199 +----------------------------------------------
> 1 file changed, 2 insertions(+), 197 deletions(-)
Applied. Thanks.
Johan
^ permalink raw reply
* Re: [PATCH 11/16] avctp: Convert register/unregister to accept btd_adapter
From: Anderson Lizardo @ 2012-12-12 12:52 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
In-Reply-To: <1355308088-9080-12-git-send-email-szymon.janc@tieto.com>
Hi Szymon,
On Wed, Dec 12, 2012 at 6:28 AM, Szymon Janc <szymon.janc@tieto.com> wrote:
> @@ -1129,13 +1129,18 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
>
> DBG("AVCTP: incoming connect from %s", address);
>
> - session = avctp_get_internal(&src, &dst);
> + device = adapter_find_device(manager_find_adapter(&src), address);
> + if (!device)
> + return;
> +
> + session = avctp_get_internal(device);
> if (session == NULL)
> return;
>
> - dev = manager_get_device(&src, &dst, FALSE);
> + dev = manager_get_device(&src, device_get_address(device), FALSE);
> if (!dev) {
> - dev = manager_get_device(&src, &dst, TRUE);
> + dev = manager_get_device(&src, device_get_address(device),
> + TRUE);
> if (!dev) {
> error("Unable to get audio device object for %s",
> address);
The snippet above looks strange. You already have the device, why call
manager_get_device() again? Looks like to me a bunch of this code can
be removed and the error message above could be moved to the if()
after adapter_find_device().
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* Re: [PATCH 11/16] avctp: Convert register/unregister to accept btd_adapter
From: Anderson Lizardo @ 2012-12-12 12:55 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
In-Reply-To: <CAJdJm_NryAHYHPXBTFfy7Z-p7r4peH5Lr6qQgKdV8-9zeMx-=w@mail.gmail.com>
Hi,
On Wed, Dec 12, 2012 at 8:52 AM, Anderson Lizardo
<anderson.lizardo@openbossa.org> wrote:
> Hi Szymon,
>
> On Wed, Dec 12, 2012 at 6:28 AM, Szymon Janc <szymon.janc@tieto.com> wrote:
>> @@ -1129,13 +1129,18 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
>>
>> DBG("AVCTP: incoming connect from %s", address);
>>
>> - session = avctp_get_internal(&src, &dst);
>> + device = adapter_find_device(manager_find_adapter(&src), address);
>> + if (!device)
>> + return;
>> +
>> + session = avctp_get_internal(device);
>> if (session == NULL)
>> return;
>>
>> - dev = manager_get_device(&src, &dst, FALSE);
>> + dev = manager_get_device(&src, device_get_address(device), FALSE);
>> if (!dev) {
>> - dev = manager_get_device(&src, &dst, TRUE);
>> + dev = manager_get_device(&src, device_get_address(device),
>> + TRUE);
>> if (!dev) {
>> error("Unable to get audio device object for %s",
>> address);
>
> The snippet above looks strange. You already have the device, why call
> manager_get_device() again? Looks like to me a bunch of this code can
> be removed and the error message above could be moved to the if()
> after adapter_find_device().
Ignore that, now I see "manager_get_device()" returns a audio device,
not btd_device :)
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* Re: [PATCH 11/16] avctp: Convert register/unregister to accept btd_adapter
From: Anderson Lizardo @ 2012-12-12 13:03 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
In-Reply-To: <CAJdJm_M6cors5nxsbx7RCAiSTQsMscYGhPFXWZmDstrEab5hQw@mail.gmail.com>
On Wed, Dec 12, 2012 at 8:55 AM, Anderson Lizardo
<anderson.lizardo@openbossa.org> wrote:
> Ignore that, now I see "manager_get_device()" returns a audio device,
> not btd_device :)
As a side note, it is unfortunate that profiles/audio/manager.c has
manager_get_device(), manager_find_device() etc. and src/manager.c has
manager_find_adapter() , manager_get_default_adapter() etc. It gets
confusing sometimes to follow code mixing these functions.
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* Re: [PATCH 11/16] avctp: Convert register/unregister to accept btd_adapter
From: Szymon Janc @ 2012-12-12 13:05 UTC (permalink / raw)
To: Anderson Lizardo; +Cc: linux-bluetooth@vger.kernel.org
In-Reply-To: <CAJdJm_MsHj8B3vSu3bHbstgYs0j7tYM9Dm16XK6p3jC1o0cHvw@mail.gmail.com>
On Wednesday 12 of December 2012 15:03:04 Anderson Lizardo wrote:
> On Wed, Dec 12, 2012 at 8:55 AM, Anderson Lizardo
Hi,
> <anderson.lizardo@openbossa.org> wrote:
> > Ignore that, now I see "manager_get_device()" returns a audio device,
> > not btd_device :)
>
> As a side note, it is unfortunate that profiles/audio/manager.c has
> manager_get_device(), manager_find_device() etc. and src/manager.c has
> manager_find_adapter() , manager_get_default_adapter() etc. It gets
> confusing sometimes to follow code mixing these functions.
This is cleared up a bit later on in this patch set.
>
> Regards,
>
--
BR
Szymon Janc
^ permalink raw reply
* Re: [PATCH 16/16] avctp: Remove double looking for audio device
From: Anderson Lizardo @ 2012-12-12 13:19 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
In-Reply-To: <1355308088-9080-17-git-send-email-szymon.janc@tieto.com>
Hi Szymon,
On Wed, Dec 12, 2012 at 6:28 AM, Szymon Janc <szymon.janc@tieto.com> wrote:
> There is no need to double call for manager_get_audio_device with
> toggled create flag. manager_get_audio_device with create set to true
> will only create new audio device if matching one was not found.
What's the difference between "manager_get_audio_device(device,
FALSE)" and "manager_find_device(device)" ? Also, would be better to
rename manager_find_device() to manager_find_audio_device()?
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* Re: [PATCH 16/16] avctp: Remove double looking for audio device
From: Szymon Janc @ 2012-12-12 13:24 UTC (permalink / raw)
To: Anderson Lizardo; +Cc: linux-bluetooth@vger.kernel.org
In-Reply-To: <CAJdJm_PqVbJTQKuqor7-2Dz+gRKTu+Bca7mSMW8PsFj8qW6itw@mail.gmail.com>
On Wednesday 12 of December 2012 15:19:44 Anderson Lizardo wrote:
> Hi Szymon,
Hi Anderson,
>
> On Wed, Dec 12, 2012 at 6:28 AM, Szymon Janc <szymon.janc@tieto.com> wrote:
> > There is no need to double call for manager_get_audio_device with
> > toggled create flag. manager_get_audio_device with create set to true
> > will only create new audio device if matching one was not found.
>
> What's the difference between "manager_get_audio_device(device,
> FALSE)" and "manager_find_device(device)" ? Also, would be better to
> rename manager_find_device() to manager_find_audio_device()?
No difference, please see patch 13/16, manager_find_device{s} are made
static there.
--
BR
Szymon Janc
^ permalink raw reply
* Re: [RFC 03/16] Bluetooth: extend state_change() call to report errors too
From: Anderson Lizardo @ 2012-12-12 13:25 UTC (permalink / raw)
To: Gustavo Padovan; +Cc: linux-bluetooth, Gustavo Padovan
In-Reply-To: <1355285624-25811-4-git-send-email-gustavo@padovan.org>
Hi Padovan,
On Wed, Dec 12, 2012 at 12:13 AM, Gustavo Padovan <gustavo@padovan.org> wrote:
> @@ -230,9 +230,7 @@ static void l2cap_state_change(struct l2cap_chan *chan, int state)
>
> static inline void __l2cap_chan_set_err(struct l2cap_chan *chan, int err)
> {
> - struct sock *sk = chan->sk;
> -
> - sk->sk_err = err;
> + chan->ops->state_change(chan, chan->state, 0);
Shouldn't it be "chan->ops->state_change(chan, chan->state, err);" here?
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
* Re: [RFC 04/16] Bluetooth: add l2cap_state_change_and_error()
From: Anderson Lizardo @ 2012-12-12 13:40 UTC (permalink / raw)
To: Gustavo Padovan; +Cc: linux-bluetooth, Gustavo Padovan
In-Reply-To: <1355285624-25811-5-git-send-email-gustavo@padovan.org>
Hi Gustavo,
On Wed, Dec 12, 2012 at 12:13 AM, Gustavo Padovan <gustavo@padovan.org> wrote:
> @@ -238,7 +244,7 @@ static inline void l2cap_chan_set_err(struct l2cap_chan *chan, int err)
> struct sock *sk = chan->sk;
>
> lock_sock(sk);
> - __l2cap_chan_set_err(chan, err);
> + chan->ops->state_change(chan, chan->state, 0);
Why "0" and not "err" ?
> release_sock(sk);
> }
>
Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox