Hi Claudio,
On Wed, 2010-12-15 at 16:54 -0300, Claudio Takahasi wrote:
> From: Sheldon Demario <sheldon.demario@xxxxxxxxxxxxx>
>
> CreatePairedDevice implements now the same behaviour of CreateDevice,
> triggering Discover All Primary Services when needed. SMP negotiation
> starts when the link is established. LE capable kernel is required to
> test this method properly.
What is your plan for handling single mode LE (remote) devices which
have privacy enabled (random addresses). This impacts connection
establishment, and SM pairing, as the remote device's addr type must
be known at that time, and handled differently.
>
> Limitation: For dual mode devices, Discover All Primary Services is not
> being executed after SDP search if GATT record is found.
> ---
> src/adapter.c | 46 ++++++++++++++++++++++++---
> src/device.c | 89 +++++++++++++++++++++++++++-------------------------
> src/device.h | 7 +++-
> src/glib-helper.c | 5 ++-
> src/glib-helper.h | 3 ++
> 5 files changed, 98 insertions(+), 52 deletions(-)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index 2ff59a0..c1fddce 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -1611,7 +1611,11 @@ static DBusMessage *create_device(DBusConnection *conn,
> return reply;
> }
>
> - err = device_browse(device, conn, msg, NULL, FALSE);
> + if (type != DEVICE_TYPE_LE)
> + err = device_browse_sdp(device, conn, msg, NULL, FALSE);
> + else
> + err = device_browse_primary(device, conn, msg, BT_IO_SEC_LOW);
> +
> if (err < 0) {
> adapter_remove_device(conn, adapter, device, TRUE);
> return btd_error_failed(msg, strerror(-err));
> @@ -1642,6 +1646,8 @@ static DBusMessage *create_paired_device(DBusConnection *conn,
> struct btd_device *device;
> const gchar *address, *agent_path, *capability, *sender;
> uint8_t cap;
> + device_type_t type;
> + int err;
>
> if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &address,
> DBUS_TYPE_OBJECT_PATH, &agent_path,
> @@ -1666,12 +1672,40 @@ static DBusMessage *create_paired_device(DBusConnection *conn,
> if (cap == IO_CAPABILITY_INVALID)
> return btd_error_invalid_args(msg);
>
> - device = adapter_get_device(conn, adapter, address);
> - if (!device)
> - return btd_error_failed(msg,
> - "Unable to create a new device object");
> + device = adapter_find_device(adapter, address);
> + if (!device) {
> + struct remote_dev_info *dev, match;
> +
> + memset(&match, 0, sizeof(struct remote_dev_info));
> + str2ba(address, &match.bdaddr);
> + match.name_status = NAME_ANY;
> +
> + dev = adapter_search_found_devices(adapter, &match);
> + if (dev && dev->flags)
> + type = flags2type(dev->flags);
> + else
> + type = DEVICE_TYPE_BREDR;
> +
> + if (type == DEVICE_TYPE_LE &&
> + !event_is_connectable(dev->evt_type))
> + return btd_error_failed(msg,
> + "Device is not connectable");
> +
> + device = adapter_create_device(conn, adapter, address, type);
> + if (!device)
> + return NULL;
> + } else
> + type = device_get_type(device);
> +
> + if (type != DEVICE_TYPE_LE)
> + return device_create_bonding(device, conn, msg,
> + agent_path, cap);
>
> - return device_create_bonding(device, conn, msg, agent_path, cap);
> + err = device_browse_primary(device, conn, msg, BT_IO_SEC_HIGH);
> + if (err < 0)
> + return btd_error_failed(msg, strerror(-err));
> +
> + return NULL;
> }
>
> static gint device_path_cmp(struct btd_device *device, const gchar *path)
> diff --git a/src/device.c b/src/device.c
> index d20a6d4..cf3b146 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -586,7 +586,7 @@ static DBusMessage *discover_services(DBusConnection *conn,
> return btd_error_invalid_args(msg);
>
> if (strlen(pattern) == 0) {
> - err = device_browse(device, conn, msg, NULL, FALSE);
> + err = device_browse_sdp(device, conn, msg, NULL, FALSE);
> if (err < 0)
> goto fail;
> } else {
> @@ -597,7 +597,7 @@ static DBusMessage *discover_services(DBusConnection *conn,
>
> sdp_uuid128_to_uuid(&uuid);
>
> - err = device_browse(device, conn, msg, &uuid, FALSE);
> + err = device_browse_sdp(device, conn, msg, &uuid, FALSE);
> if (err < 0)
> goto fail;
> }
> @@ -988,6 +988,11 @@ void device_get_name(struct btd_device *device, char *name, size_t len)
> strncpy(name, device->name, len);
> }
>
> +device_type_t device_get_type(struct btd_device *device)
> +{
> + return device->type;
> +}
> +
> void device_remove_bonding(struct btd_device *device)
> {
> char filename[PATH_MAX + 1];
> @@ -1540,41 +1545,62 @@ done:
> browse_request_free(req);
> }
>
> -static struct browse_req *browse_primary(struct btd_device *device, int *err)
> +int device_browse_primary(struct btd_device *device, DBusConnection *conn,
> + DBusMessage *msg, BtIOSecLevel sec_level)
> {
> struct btd_adapter *adapter = device->adapter;
> struct browse_req *req;
> bdaddr_t src;
> - int ret;
> + int err;
> +
> + if (device->browse)
> + return -EBUSY;
>
> req = g_new0(struct browse_req, 1);
> req->device = btd_device_ref(device);
>
> adapter_get_address(adapter, &src);
>
> - ret = bt_discover_primary(&src, &device->bdaddr, -1, primary_cb, req,
> - NULL);
> -
> - if (ret < 0) {
> + err = bt_discover_primary(&src, &device->bdaddr, -1, primary_cb, req,
> + sec_level, NULL);
> + if (err < 0) {
> browse_request_free(req);
> - if (err)
> - *err = ret;
> + return err;
> + }
>
> - return NULL;
> + if (conn == NULL)
> + conn = get_dbus_connection();
> +
> + req->conn = dbus_connection_ref(conn);
> + device->browse = req;
> +
> + if (msg) {
> + const char *sender = dbus_message_get_sender(msg);
> +
> + req->msg = dbus_message_ref(msg);
> + /* Track the request owner to cancel it
> + * automatically if the owner exits */
> + req->listener_id = g_dbus_add_disconnect_watch(conn,
> + sender,
> + discover_services_req_exit,
> + req, NULL);
> }
>
> - return req;
> + return err;
> }
>
> -static struct browse_req *browse_sdp(struct btd_device *device, uuid_t *search,
> - gboolean reverse, int *err)
> +int device_browse_sdp(struct btd_device *device, DBusConnection *conn,
> + DBusMessage *msg, uuid_t *search, gboolean reverse)
> {
> struct btd_adapter *adapter = device->adapter;
> struct browse_req *req;
> bt_callback_t cb;
> bdaddr_t src;
> uuid_t uuid;
> - int ret;
> + int err;
> +
> + if (device->browse)
> + return -EBUSY;
>
> adapter_get_address(adapter, &src);
>
> @@ -1589,34 +1615,11 @@ static struct browse_req *browse_sdp(struct btd_device *device, uuid_t *search,
> cb = browse_cb;
> }
>
> - ret = bt_search_service(&src, &device->bdaddr, &uuid, cb, req, NULL);
> - if (ret < 0) {
> + err = bt_search_service(&src, &device->bdaddr, &uuid, cb, req, NULL);
> + if (err < 0) {
> browse_request_free(req);
> - if (err)
> - *err = ret;
> -
> - return NULL;
> - }
> -
> - return req;
> -}
> -
> -int device_browse(struct btd_device *device, DBusConnection *conn,
> - DBusMessage *msg, uuid_t *search, gboolean reverse)
> -{
> - struct browse_req *req;
> - int err = 0;
> -
> - if (device->browse)
> - return -EBUSY;
> -
> - if (device->type == DEVICE_TYPE_LE)
> - req = browse_primary(device, &err);
> - else
> - req = browse_sdp(device, search, reverse, &err);
> -
> - if (req == NULL)
> return err;
> + }
>
> if (conn == NULL)
> conn = get_dbus_connection();
> @@ -1719,7 +1722,7 @@ static gboolean start_discovery(gpointer user_data)
> {
> struct btd_device *device = user_data;
>
> - device_browse(device, NULL, NULL, NULL, TRUE);
> + device_browse_sdp(device, NULL, NULL, NULL, TRUE);
>
> device->discov_timer = 0;
>
> @@ -2051,7 +2054,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t status)
> device->discov_timer = 0;
> }
>
> - device_browse(device, bonding->conn, bonding->msg,
> + device_browse_sdp(device, bonding->conn, bonding->msg,
> NULL, FALSE);
>
> bonding_request_free(bonding);
> diff --git a/src/device.h b/src/device.h
> index 784e931..cafa529 100644
> --- a/src/device.h
> +++ b/src/device.h
> @@ -24,6 +24,8 @@
>
> #define DEVICE_INTERFACE "org.bluez.Device"
>
> +#include "btio.h"
> +
> struct btd_device;
>
> typedef enum {
> @@ -46,9 +48,12 @@ struct btd_device *device_create(DBusConnection *conn,
> const gchar *address, device_type_t type);
> void device_set_name(struct btd_device *device, const char *name);
> void device_get_name(struct btd_device *device, char *name, size_t len);
> +device_type_t device_get_type(struct btd_device *device);
> void device_remove(struct btd_device *device, gboolean remove_stored);
> gint device_address_cmp(struct btd_device *device, const gchar *address);
> -int device_browse(struct btd_device *device, DBusConnection *conn,
> +int device_browse_primary(struct btd_device *device, DBusConnection *conn,
> + DBusMessage *msg, BtIOSecLevel sec_level);
> +int device_browse_sdp(struct btd_device *device, DBusConnection *conn,
> DBusMessage *msg, uuid_t *search, gboolean reverse);
> void device_probe_drivers(struct btd_device *device, GSList *profiles);
> const sdp_record_t *btd_device_get_record(struct btd_device *device,
> diff --git a/src/glib-helper.c b/src/glib-helper.c
> index 6505249..edc46d8 100644
> --- a/src/glib-helper.c
> +++ b/src/glib-helper.c
> @@ -520,6 +520,7 @@ static void connect_cb(GIOChannel *io, GError *gerr, gpointer user_data)
>
> int bt_discover_primary(const bdaddr_t *src, const bdaddr_t *dst, int psm,
> bt_primary_t cb, void *user_data,
> + BtIOSecLevel sec_level,
> bt_destroy_t destroy)
> {
> struct gattrib_context *ctxt;
> @@ -541,14 +542,14 @@ int bt_discover_primary(const bdaddr_t *src, const bdaddr_t *dst, int psm,
> BT_IO_OPT_SOURCE_BDADDR, src,
> BT_IO_OPT_DEST_BDADDR, dst,
> BT_IO_OPT_CID, GATT_CID,
> - BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
> + BT_IO_OPT_SEC_LEVEL, sec_level,
> BT_IO_OPT_INVALID);
> else
> io = bt_io_connect(BT_IO_L2CAP, connect_cb, ctxt, NULL, &gerr,
> BT_IO_OPT_SOURCE_BDADDR, src,
> BT_IO_OPT_DEST_BDADDR, dst,
> BT_IO_OPT_PSM, psm,
> - BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
> + BT_IO_OPT_SEC_LEVEL, sec_level,
> BT_IO_OPT_INVALID);
>
> if (io == NULL) {
> diff --git a/src/glib-helper.h b/src/glib-helper.h
> index 5bb20a6..a16de6c 100644
> --- a/src/glib-helper.h
> +++ b/src/glib-helper.h
> @@ -21,6 +21,8 @@
> *
> */
>
> +#include "btio.h"
> +
> typedef void (*bt_callback_t) (sdp_list_t *recs, int err, gpointer user_data);
> typedef void (*bt_primary_t) (GSList *l, int err, gpointer user_data);
> typedef void (*bt_destroy_t) (gpointer user_data);
> @@ -35,6 +37,7 @@ int bt_cancel_discovery(const bdaddr_t *src, const bdaddr_t *dst);
>
> int bt_discover_primary(const bdaddr_t *src, const bdaddr_t *dst, int psm,
> bt_primary_t cb, void *user_data,
> + BtIOSecLevel sec_level,
> bt_destroy_t destroy);
>
> gchar *bt_uuid2string(uuid_t *uuid);
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
