From 4f7a2c06fd35aef082951f30d93e89fabec9b031 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 24 May 2011 13:45:26 -0500 Subject: emulator: simplify ath callback --- src/emulator.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/emulator.c b/src/emulator.c index de9921ac..7bb48ba4 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -226,11 +226,6 @@ static void dun_ath_cb(GAtServer *server, GAtServerRequestType type, DBG(""); - if (em->ppp == NULL) { - g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR); - return; - } - switch (type) { case G_AT_SERVER_REQUEST_TYPE_SET: g_at_result_iter_init(&iter, result); @@ -242,16 +237,18 @@ static void dun_ath_cb(GAtServer *server, GAtServerRequestType type, if (val != 0) goto error; - g_at_ppp_unref(em->ppp); - em->ppp = NULL; - - g_at_server_send_final(server, G_AT_SERVER_RESULT_OK); - break; + /* Fall through */ case G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY: + if (em->ppp == NULL) + goto error; + g_at_ppp_unref(em->ppp); em->ppp = NULL; + __ofono_private_network_release(em->pns_id); + em->pns_id = 0; + g_at_server_send_final(server, G_AT_SERVER_RESULT_OK); break; -- cgit v1.2.3