diff options
| author | Andre Guedes <andre.guedes@openbossa.org> | 2012-02-08 17:35:46 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-09 12:52:12 +0200 |
| commit | f56b47dcb74ae0d21e0c2b4372d76fbd2cd561b1 (patch) | |
| tree | e0937628e6b416c7c4f9e036655c0537761858e0 /src | |
| parent | c58b40a24352d277216570756946f37313686798 (diff) | |
| download | bluez-f56b47dcb74ae0d21e0c2b4372d76fbd2cd561b1.tar.gz | |
device: Use att_io in device_browse_primary
In order to have the same approach as att_connect function,
device_browse_primary function should save the reference to GIOChannel
at device->att_io. This way, we can properly shut it down if the browse
request is canceled during the connection attempt.
Diffstat (limited to 'src')
| -rw-r--r-- | src/device.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/device.c b/src/device.c index bd25a27e8..9f0bfa307 100644 --- a/src/device.c +++ b/src/device.c @@ -179,11 +179,6 @@ static void browse_request_free(struct browse_req *req, gboolean shutdown) g_dbus_remove_watch(req->conn, req->listener_id); if (req->attrib) g_attrib_unref(req->attrib); - if (req->io) { - if (shutdown) - g_io_channel_shutdown(req->io, FALSE, NULL); - g_io_channel_unref(req->io); - } if (req->msg) dbus_message_unref(req->msg); if (req->conn) @@ -211,6 +206,12 @@ static void browse_request_cancel(struct browse_req *req) bt_cancel_discovery(&src, &device->bdaddr); + if (device->att_io != NULL) { + g_io_channel_shutdown(device->att_io, FALSE, NULL); + g_io_channel_unref(device->att_io); + device->att_io = NULL; + } + device->browse = NULL; browse_request_free(req, TRUE); } @@ -1907,6 +1908,9 @@ static void browse_primary_connect_cb(GIOChannel *io, GError *gerr, struct browse_req *req = device->browse; GAttrib *attrib; + g_io_channel_unref(device->att_io); + device->att_io = NULL; + if (gerr) { DBusMessage *reply; @@ -1948,7 +1952,7 @@ int device_browse_primary(struct btd_device *device, DBusConnection *conn, sec_level = secure ? BT_IO_SEC_HIGH : BT_IO_SEC_LOW; - req->io = bt_io_connect(BT_IO_L2CAP, browse_primary_connect_cb, + device->att_io = bt_io_connect(BT_IO_L2CAP, browse_primary_connect_cb, device, NULL, NULL, BT_IO_OPT_SOURCE_BDADDR, &src, BT_IO_OPT_DEST_BDADDR, &device->bdaddr, @@ -1956,7 +1960,7 @@ int device_browse_primary(struct btd_device *device, DBusConnection *conn, BT_IO_OPT_SEC_LEVEL, sec_level, BT_IO_OPT_INVALID); - if (req->io == NULL) { + if (device->att_io == NULL) { browse_request_free(req, FALSE); return -EIO; } |