korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-15 16:03:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/gatt: Choose LE or BR/EDR based on last seen bearer

Browse Source 
This allows to connect both over LE and BR/EDR bearer.
This commit is contained in:
Szymon Janc 2014-07-10 16:30:34 +02:00
parent 7eb9cab6ab
commit 31a3c6c961
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
android/gatt.c
View File

@ -1702,6 +1702,49 @@ static void app_disconnect_devices(struct gatt_app *client)
}
}
static int connect_bredr(struct gatt_device *dev)
{
BtIOSecLevel sec_level;
GIOChannel *io;
GError *gerr = NULL;
char addr[18];
ba2str(&dev->bdaddr, addr);
/* There is one connection attempt going on */
if (dev->att_io) {
info("gatt: connection to dev %s is ongoing", addr);
return -EALREADY;
}
DBG("Connection attempt to: %s", addr);
sec_level = bt_device_is_bonded(&dev->bdaddr) ? BT_IO_SEC_MEDIUM :
BT_IO_SEC_LOW;
io = bt_io_connect(connect_cb, device_ref(dev), NULL, &gerr,
BT_IO_OPT_SOURCE_BDADDR, &adapter_addr,
BT_IO_OPT_SOURCE_TYPE, BDADDR_BREDR,
BT_IO_OPT_DEST_BDADDR, &dev->bdaddr,
BT_IO_OPT_DEST_TYPE, BDADDR_BREDR,
BT_IO_OPT_PSM, ATT_PSM,
BT_IO_OPT_SEC_LEVEL, sec_level,
BT_IO_OPT_INVALID);
if (!io) {
error("gatt: Failed bt_io_connect(%s): %s", addr,
gerr->message);
g_error_free(gerr);
return -EIO;
}
device_set_state(dev, DEVICE_CONNECT_READY);
/* Keep this, so we can cancel the connection */
dev->att_io = io;
return 0;
}
static bool trigger_connection(struct app_connection *connection)
{
switch (connection->device->state) {
@ -1715,6 +1758,11 @@ static bool trigger_connection(struct app_connection *connection)
break;
}
/* If device was last seen over BR/EDR connect over it */
if (bt_device_last_seen_bearer(&connection->device->bdaddr) ==
BDADDR_BREDR)
return connect_bredr(connection->device) == 0;
/* after state change trigger discovering */
if (!scanning && (connection->device->state == DEVICE_CONNECT_INIT))
if (!bt_le_discovery_start()) {