diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-01-14 13:41:22 +0200 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-01-15 14:52:44 +0200 |
commit | 0a6f949ff6f58e800cf16a7f439e42a4a548af14 (patch) | |
tree | cf85700c2c777e3414b02edc5e00365662db84c8 /android/a2dp.c | |
parent | c6fed41a02d30732e6a0797185ae7397d565b954 (diff) | |
download | bluez-0a6f949ff6f58e800cf16a7f439e42a4a548af14.tar.gz |
android/A2DP: Connect transport channel when initiator
This connects transport channel when initiator of open request.
Diffstat (limited to 'android/a2dp.c')
-rw-r--r-- | android/a2dp.c | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/android/a2dp.c b/android/a2dp.c index d89c828d8..35ffe46d2 100644 --- a/android/a2dp.c +++ b/android/a2dp.c @@ -141,6 +141,25 @@ static struct a2dp_device *a2dp_device_new(const bdaddr_t *dst) return dev; } +static bool a2dp_device_connect(struct a2dp_device *dev, BtIOConnect cb) +{ + GError *err = NULL; + + dev->io = bt_io_connect(cb, dev, NULL, &err, + BT_IO_OPT_SOURCE_BDADDR, &adapter_addr, + BT_IO_OPT_DEST_BDADDR, &dev->dst, + BT_IO_OPT_PSM, L2CAP_PSM_AVDTP, + BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, + BT_IO_OPT_INVALID); + if (err) { + error("%s", err->message); + g_error_free(err); + return false; + } + + return true; +} + static void bt_a2dp_notify_state(struct a2dp_device *dev, uint8_t state) { struct hal_ev_a2dp_conn_state ev; @@ -398,7 +417,6 @@ static void bt_a2dp_connect(const void *buf, uint16_t len) char addr[18]; bdaddr_t dst; GSList *l; - GError *err = NULL; DBG(""); @@ -411,15 +429,7 @@ static void bt_a2dp_connect(const void *buf, uint16_t len) } dev = a2dp_device_new(&dst); - dev->io = bt_io_connect(signaling_connect_cb, dev, NULL, &err, - BT_IO_OPT_SOURCE_BDADDR, &adapter_addr, - BT_IO_OPT_DEST_BDADDR, &dev->dst, - BT_IO_OPT_PSM, L2CAP_PSM_AVDTP, - BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, - BT_IO_OPT_INVALID); - if (err) { - error("%s", err->message); - g_error_free(err); + if (!a2dp_device_connect(dev, signaling_connect_cb)) { a2dp_device_free(dev); status = HAL_STATUS_FAILED; goto failed; @@ -529,6 +539,11 @@ static void transport_connect_cb(GIOChannel *chan, GError *err, } g_io_channel_set_close_on_unref(chan, FALSE); + + if (dev->io) { + g_io_channel_unref(dev->io); + dev->io = NULL; + } } static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data) @@ -930,12 +945,24 @@ static void sep_open_cfm(struct avdtp *session, struct avdtp_local_sep *sep, void *user_data) { struct a2dp_endpoint *endpoint = user_data; + struct a2dp_device *dev; DBG(""); - if (!err) - return; + if (err) + goto failed; + dev = find_device_by_session(session); + if (!dev) { + error("Unable to find device for session"); + goto failed; + } + + a2dp_device_connect(dev, transport_connect_cb); + + return; + +failed: setup_remove_by_id(endpoint->id); } |