From: Kristen Carlson Accardi <kristen@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH] gatio: do not read if no read_handler
Date: Mon, 03 May 2010 15:45:45 -0700 [thread overview]
Message-ID: <1272926745-4595-1-git-send-email-kristen@linux.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]
If no read_handler specified, leave data alone in case someone
else wants to read it.
---
gatchat/gatio.c | 4 ++++
gatchat/gsmdial.c | 12 ++++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gatchat/gatio.c b/gatchat/gatio.c
index 61b0260..b4a3806 100644
--- a/gatchat/gatio.c
+++ b/gatchat/gatio.c
@@ -91,6 +91,10 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond,
if (cond & G_IO_NVAL)
return FALSE;
+ /* if nobody wants this data, leave it alone */
+ if (io->read_handler == NULL)
+ return TRUE;
+
/* Regardless of condition, try to read all the data available */
do {
toread = ring_buffer_avail_no_wrap(io->buf);
diff --git a/gatchat/gsmdial.c b/gatchat/gsmdial.c
index a531aa3..5fb406d 100644
--- a/gatchat/gsmdial.c
+++ b/gatchat/gsmdial.c
@@ -235,6 +235,8 @@ static void ppp_connect(const char *iface, const char *ip,
static void ppp_disconnect(GAtPPPDisconnectReason reason, gpointer user_data)
{
g_print("PPP Link down: %d\n", reason);
+ g_at_chat_resume(control);
+ g_at_chat_resume(modem);
}
static void connect_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -249,14 +251,8 @@ static void connect_cb(gboolean ok, GAtResult *result, gpointer user_data)
/* get the data IO channel */
channel = g_at_chat_get_channel(modem);
- /*
- * shutdown gatchat or else it tries to take all the input
- * from the modem and does not let PPP get it.
- */
- g_at_chat_unref(control);
- control = NULL;
- g_at_chat_unref(modem);
- modem = NULL;
+ g_at_chat_suspend(control);
+ g_at_chat_suspend(modem);
/* open ppp */
ppp = g_at_ppp_new(channel);
--
1.6.6.1
next reply other threads:[~2010-05-03 22:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-03 22:45 Kristen Carlson Accardi [this message]
2010-05-10 14:11 ` [PATCH] gatio: do not read if no read_handler Denis Kenzior
2010-05-10 17:12 ` Kristen Carlson Accardi
2010-05-10 17:23 ` Denis Kenzior
2010-05-10 17:22 ` Kristen Carlson Accardi
2010-05-10 17:48 ` Denis Kenzior
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=1272926745-4595-1-git-send-email-kristen@linux.intel.com \
--to=kristen@linux.intel.com \
--cc=ofono@ofono.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.