9:39 p.m.
Ofono either crashed or busy looped with my Huawei E1552 3G modem when I
tried to deactivate GPRS context. The reason was that gcd->chat was
unreferenced already in setup_ppp() but the chat was still accessed
later in at_gprs_deactivate_primary().
To fix the problem, change the logic instead to suspend chat session
for PPP and resume when PPP has disconnected. Now it doesn't crash
anymore.
Deactivation still doesn't work properly with Huawei E1552, and most
probably with other Huawei modems, because the modem hangs up the chat
line after PPP deactivation. This needs to be fixed separately.
---
drivers/atmodem/gprs-context.c | 64 ++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index ba5f0c0..4412a07 100644
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -103,14 +103,44 @@ static void ppp_disconnect(GAtPPPDisconnectReason reason, gpointer
user_data)
{
struct ofono_gprs_context *gc = user_data;
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ struct cb_data *cbd;
+ char buf[64];
+ guint ret;
+
+ DBG("");
+
+ g_at_chat_resume(gcd->chat);
if (gcd->state == STATE_ENABLING) {
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, FALSE, NULL,
NULL, NULL, NULL, gcd->cb_data);
- return;
+ } else if (gcd->state == STATE_DISABLING) {
+ cbd = cb_data_new(gcd->down_cb, gcd->cb_data);
+
+ if (cbd == NULL) {
+ CALLBACK_WITH_FAILURE(gcd->down_cb, gcd->cb_data);
+ goto out;
+ }
+
+ cbd->user = gc;
+
+ snprintf(buf, sizeof(buf), "AT+CGACT=0,%u",
+ gcd->active_context);
+
+ ret = g_at_chat_send(gcd->chat, buf, none_prefix,
+ at_cgact_down_cb, cbd, g_free);
+
+ if (ret == 0) {
+ ofono_info("Unable to send AT+CGACT=0");
+ CALLBACK_WITH_FAILURE(gcd->down_cb, gcd->cb_data);
+ g_free(cbd);
+ goto out;
+ }
+ } else {
+ ofono_gprs_context_deactivated(gc, gcd->active_context);
}
- ofono_gprs_context_deactivated(gc, gcd->active_context);
+out:
gcd->active_context = 0;
gcd->state = STATE_IDLE;
}
@@ -118,13 +148,14 @@ static void ppp_disconnect(GAtPPPDisconnectReason reason, gpointer
user_data)
static gboolean setup_ppp(struct ofono_gprs_context *gc)
{
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
- GIOChannel *channel;
+ GAtIO *io;
+
+ io = g_at_chat_get_io(gcd->chat);
- channel = g_at_chat_get_channel(gcd->chat);
- g_at_chat_unref(gcd->chat);
+ g_at_chat_suspend(gcd->chat);
/* open ppp */
- gcd->ppp = g_at_ppp_new(channel);
+ gcd->ppp = g_at_ppp_new_from_io(io);
if (gcd->ppp == NULL)
return FALSE;
@@ -227,25 +258,14 @@ static void at_gprs_deactivate_primary(struct ofono_gprs_context
*gc,
ofono_gprs_context_cb_t cb, void *data)
{
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
- struct cb_data *cbd = cb_data_new(cb, data);
- char buf[64];
- if (!cbd)
- goto error;
+ DBG("");
- cbd->user = gc;
-
- snprintf(buf, sizeof(buf), "AT+CGACT=0,%u", id);
-
- if (g_at_chat_send(gcd->chat, buf, none_prefix,
- at_cgact_down_cb, cbd, g_free) > 0)
- return;
-
-error:
- if (cbd)
- g_free(cbd);
+ gcd->state = STATE_DISABLING;
+ gcd->down_cb = cb;
+ gcd->cb_data = data;
- CALLBACK_WITH_FAILURE(cb, data);
+ g_at_ppp_shutdown(gcd->ppp);
}
static int at_gprs_context_probe(struct ofono_gprs_context *gc,