From: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
Subject: [PATCH] Add watch for RFCOMM disconnect to HFP HF role
Date: Thu, 4 Aug 2011 14:51:50 +0200 [thread overview]
Message-ID: <1312462310-16965-1-git-send-email-frederic.dalleau@linux.intel.com> (raw)
---
audio/gateway.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/audio/gateway.c b/audio/gateway.c
index ec0ec5d..200930f 100644
--- a/audio/gateway.c
+++ b/audio/gateway.c
@@ -188,9 +188,29 @@ static void sco_connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
(GIOFunc) sco_io_cb, dev);
}
+static gboolean rfcomm_disconnect_cb(GIOChannel *chan, GIOCondition cond,
+ struct audio_device *dev)
+{
+ struct gateway *gw = dev->gateway;
+
+ if (cond & G_IO_NVAL)
+ return FALSE;
+
+ if (cond & (G_IO_ERR | G_IO_HUP)) {
+ g_io_channel_shutdown(gw->rfcomm, TRUE, NULL);
+ g_io_channel_unref(gw->rfcomm);
+ gw->rfcomm = NULL;
+ change_state(dev, GATEWAY_STATE_DISCONNECTED);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
static void newconnection_reply(DBusPendingCall *call, void *data)
{
struct audio_device *dev = data;
+ struct gateway *gw = dev->gateway;
DBusMessage *reply = dbus_pending_call_steal_reply(call);
DBusError derr;
@@ -202,6 +222,8 @@ static void newconnection_reply(DBusPendingCall *call, void *data)
dbus_error_init(&derr);
if (!dbus_set_error_from_message(&derr, reply)) {
DBG("Agent reply: file descriptor passed successfully");
+ g_io_add_watch(gw->rfcomm, G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+ (GIOFunc) rfcomm_disconnect_cb, dev);
change_state(dev, GATEWAY_STATE_CONNECTED);
goto done;
}
--
1.7.1
next reply other threads:[~2011-08-04 12:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-04 12:51 Frédéric Dalleau [this message]
2011-08-04 12:58 ` [PATCH] Add watch for RFCOMM disconnect to HFP HF role Johan Hedberg
2011-08-04 13:09 ` Frédéric Dalleau
2011-08-04 13:16 ` Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312462310-16965-1-git-send-email-frederic.dalleau@linux.intel.com \
--to=frederic.dalleau@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).