Merge lp:~phablet-team/ofono/rilmodem-power-ussd into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

* gril, unit, rilmodem/call-settings: Add Call-settings suport
    - merge applicable nemomobile code
    - re-factor parcel code
    - add call-volume parcel unit tests
  * gril, unit, rilmodem/ussd: Add USSD support (LP: #1195398)
    - merge applicable nemomobile code
    - re-factor parcel code
    - add call-volume parcel unit tests
  * gril: fix cancel_group/offline crash (LP: #1262340)
  * rilmodem/voicecall: fix conference calls for maguro (LP: #1257206)
  * gril, plugins/ril: Re-worked RIL power code to prepare for flight-
    mode implementation (LP: #1245860), (LP: #1208657).

This merge proposal includes the following changes pulled from rilmodem trunk:

1. Call-settings support added
2. USSD support added (LP: #1195398)
3. Modem Offline crash fixed (LP: #1262340)
4. Maguro Conference call fix (LP: #1257206)
5. RIL plugin power re-factor (LP: ##1245860), (LP: #1208657)

All of this code was subject to github pull request reviews.

Items 1-4 have been tested on image r62 using both mako, and maguro. For details on how to test call-settings, and USSD, please refer to the 14.04 Telephony Test plan.

The RIL power fix is a re-working of the power on sequence implemented in the ril plugin. Prior to this change, we actually didn't have the ability to detect that actual power state of the radio. As we've added support for the unsolicited radio_state_changed event, we now are able to recognize actual power on/off state transitions. As such, we've re-worked the plugin logic so that we don't send an initial get_sim_status command till we're sure the radio is on. This is due to the fact that not all RIL implementations ( eg. maguro ) respond to sim_status or SIM IO commands unless the radio is on. This code has been tested on maguro, mako and the touch emulator. To test, on/off-lining the modem, you need to first stop NetworkManager and telepathy-ofono ( which can be challenging ). Again, see the test plan for more details.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6850
http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-ofono-ubuntu-trusty-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-ofono-ubuntu-ci/18/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, tested with mako and maguro using image 138, no regression (call, sms, gprs, sim, all working).

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-12-04 20:19:31 +0000
+++ Makefile.am	2014-01-08 20:51:43 +0000
@@ -133,7 +133,9 @@
 			drivers/rilmodem/sim.c \
 			drivers/rilmodem/sms.c \
 			drivers/rilmodem/rilutil.c \
-			drivers/rilmodem/rilutil.h
+			drivers/rilmodem/rilutil.h \
+			drivers/rilmodem/ussd.c \
+			drivers/rilmodem/call-settings.c
 
 endif
 
@@ -699,7 +701,8 @@
 				unit/test-sms unit/test-cdmasms \
 				unit/test-grilrequest \
 				unit/test-grilreply \
-				unit/test-grilunsol
+				unit/test-grilunsol \
+				unit/test-mnclength
 
 noinst_PROGRAMS = $(unit_tests) \
 			unit/test-sms-root unit/test-mux unit/test-caif
@@ -769,6 +772,11 @@
 unit_test_grilunsol_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_grilunsol_OBJECTS)
 
+unit_test_mnclength_SOURCES = unit/test-mnclength.c plugins/mnclength.c \
+				src/log.c src/sim-mnclength.c
+unit_test_mnclength_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_mnclength_OBJECTS)
+
 TESTS = $(unit_tests)
 
 if TOOLS

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-23 18:38:54 +0000
+++ debian/changelog	2014-01-08 20:51:43 +0000
@@ -9,6 +9,26 @@
     a print_backtrace() function declaration
     with __attribute__ ((unused))
 
+  [ Alfonso Sanchez-Beato ]
+  * gril, unit, rilmodem/call-settings: Add Call-settings suport
+    - merge applicable nemomobile code
+    - re-factor parcel code
+    - add call-volume parcel unit tests
+  * gril, unit, rilmodem/ussd: Add USSD support (LP: #1195398)
+    - merge applicable nemomobile code
+    - re-factor parcel code
+    - add call-volume parcel unit tests
+
+  [ Tony Espy ]
+  * gril: fix cancel_group/offline crash (LP: #1262340)
+
+  [ Alfonso Sanchez-Beato ]
+  * rilmodem/voicecall: fix conference calls for maguro (LP: #1257206)
+
+  [ Tony Espy ]
+  * gril, plugins/ril: Re-worked RIL power code to prepare for flight-
+    mode implementation (LP: #1245860), (LP: #1208657).
+
  -- Tony Espy <[e-mail]>  Mon, 23 Dec 2013 13:33:47 -0500
 
 ofono (1.12+bzr6848-0ubuntu1) trusty; urgency=low

=== added file 'drivers/rilmodem/call-settings.c'
--- drivers/rilmodem/call-settings.c	1970-01-01 00:00:00 +0000
+++ drivers/rilmodem/call-settings.c	2014-01-08 20:51:43 +0000
@@ -0,0 +1,286 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2013 Jolla Ltd
+ *  Copyright (C) 2013 Canonical Ltd
+ *  Contact: Jussi Kangas <[e-mail]>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/call-settings.h>
+
+#include "gril.h"
+#include "grilutil.h"
+#include "grilrequest.h"
+#include "grilreply.h"
+
+#include "rilmodem.h"
+#include "ril_constants.h"
+#include "common.h"
+
+struct settings_data {
+	GRil *ril;
+};
+
+static void ril_set_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_call_settings *cs = cbd->user;
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	ofono_call_settings_set_cb_t cb = cbd->cb;
+
+	if (message->error == RIL_E_SUCCESS) {
+		g_ril_print_response_no_args(sd->ril, message);
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	} else {
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
+}
+
+static void ril_cw_set(struct ofono_call_settings *cs, int mode, int cls,
+			ofono_call_settings_set_cb_t cb, void *data)
+{
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	struct cb_data *cbd = cb_data_new(cb, data, cs);
+	int ret;
+	struct parcel rilp;
+
+	g_ril_request_set_call_waiting(sd->ril, mode, cls, &rilp);
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_SET_CALL_WAITING, &rilp,
+				ril_set_cb, cbd, g_free);
+
+	/* In case of error free cbd and return the cb with failure */
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
+static void ril_cw_query_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_call_settings *cs = cbd->user;
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	ofono_call_settings_status_cb_t cb = cbd->cb;
+
+	if (message->error == RIL_E_SUCCESS) {
+		int res;
+
+		res = g_ril_reply_parse_query_call_waiting(sd->ril, message);
+
+		CALLBACK_WITH_SUCCESS(cb, res, cbd->data);
+	} else {
+		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+	}
+}
+
+static void ril_cw_query(struct ofono_call_settings *cs, int cls,
+				ofono_call_settings_status_cb_t cb, void *data)
+{
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	struct cb_data *cbd = cb_data_new(cb, data, cs);
+	int ret;
+	struct parcel rilp;
+
+	g_ril_request_query_call_waiting(sd->ril, cls, &rilp);
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_QUERY_CALL_WAITING, &rilp,
+				ril_cw_query_cb, cbd, g_free);
+
+	/* In case of error free cbd and return the cb with failure */
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, -1, data);
+	}
+}
+
+static void ril_clip_query_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_call_settings *cs = cbd->user;
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	ofono_call_settings_status_cb_t cb = cbd->cb;
+
+	if (message->error == RIL_E_SUCCESS) {
+		int res;
+
+		res = g_ril_reply_parse_query_clip(sd->ril, message);
+
+		CALLBACK_WITH_SUCCESS(cb, res, cbd->data);
+	} else {
+		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+	}
+}
+
+static void ril_clip_query(struct ofono_call_settings *cs,
+			ofono_call_settings_status_cb_t cb, void *data)
+{
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	struct cb_data *cbd = cb_data_new(cb, data, cs);
+	int ret;
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_QUERY_CLIP, NULL,
+				ril_clip_query_cb, cbd, g_free);
+
+	/* In case of error free cbd and return the cb with failure */
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, -1, data);
+	}
+}
+
+static void ril_clir_query_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_call_settings *cs = cbd->user;
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	ofono_call_settings_clir_cb_t cb = cbd->cb;
+	struct reply_clir *rclir;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: Reply failure: %s", __func__,
+				ril_error_to_string(message->error));
+		goto error;
+	}
+
+	rclir = g_ril_reply_parse_get_clir(sd->ril, message);
+	if (rclir == NULL) {
+		ofono_error("%s: parse error", __func__);
+		goto error;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, rclir->status, rclir->provisioned, cbd->data);
+
+	g_ril_reply_free_get_clir(rclir);
+
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, -1, -1, cbd->data);
+}
+
+static void ril_clir_query(struct ofono_call_settings *cs,
+			ofono_call_settings_clir_cb_t cb, void *data)
+{
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	struct cb_data *cbd = cb_data_new(cb, data, cs);
+	int ret;
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_GET_CLIR, NULL,
+				ril_clir_query_cb, cbd, g_free);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, -1, -1, data);
+	}
+}
+
+
+static void ril_clir_set(struct ofono_call_settings *cs, int mode,
+			ofono_call_settings_set_cb_t cb, void *data)
+{
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	struct cb_data *cbd = cb_data_new(cb, data, cs);
+	struct parcel rilp;
+	int ret;
+
+	g_ril_request_set_clir(sd->ril, mode, &rilp);
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_SET_CLIR, &rilp,
+				ril_set_cb, cbd, g_free);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
+static gboolean ril_delayed_register(gpointer user_data)
+{
+	struct ofono_call_settings *cs = user_data;
+
+	ofono_call_settings_register(cs);
+
+	return FALSE;
+}
+
+static int ril_call_settings_probe(struct ofono_call_settings *cs,
+					unsigned int vendor, void *user)
+{
+	GRil *ril = user;
+	struct settings_data *sd = g_new0(struct settings_data, 1);
+
+	sd->ril = g_ril_clone(ril);
+
+	ofono_call_settings_set_data(cs, sd);
+
+	g_idle_add(ril_delayed_register, cs);
+
+	return 0;
+}
+
+static void ril_call_settings_remove(struct ofono_call_settings *cs)
+{
+	struct settings_data *sd = ofono_call_settings_get_data(cs);
+	ofono_call_settings_set_data(cs, NULL);
+
+	g_ril_unref(sd->ril);
+	g_free(sd);
+}
+
+static struct ofono_call_settings_driver driver = {
+	.name			= RILMODEM,
+	.probe			= ril_call_settings_probe,
+	.remove			= ril_call_settings_remove,
+	.clip_query		= ril_clip_query,
+	.cw_query		= ril_cw_query,
+	.cw_set			= ril_cw_set,
+	.clir_query		= ril_clir_query,
+	.clir_set		= ril_clir_set
+
+	/*
+	 * Not supported in RIL API
+	 * .colp_query		= ril_colp_query,
+	 * .colr_query		= ril_colr_query
+	 */
+};
+
+void ril_call_settings_init(void)
+{
+	ofono_call_settings_driver_register(&driver);
+}
+
+void ril_call_settings_exit(void)
+{
+	ofono_call_settings_driver_unregister(&driver);
+}

=== modified file 'drivers/rilmodem/call-volume.c'
--- drivers/rilmodem/call-volume.c	2013-11-28 13:31:35 +0000
+++ drivers/rilmodem/call-volume.c	2014-01-08 20:51:43 +0000
@@ -76,20 +76,13 @@
 	struct cv_data *cvd = ofono_call_volume_get_data(cv);
 	struct cb_data *cbd = cb_data_new(cb, data, cvd);
 	struct parcel rilp;
-	int request = RIL_REQUEST_SET_MUTE;
-	int ret;
 
 	DBG("Initial ril muted state: %d", muted);
 
 	g_ril_request_set_mute(cvd->ril, muted, &rilp);
 
-	ret = g_ril_send(cvd->ril, request, rilp.data, rilp.size,
-				volume_mute_cb, cbd, g_free);
-
-	g_ril_print_request(cvd->ril, ret, request);
-	parcel_free(&rilp);
-
-	if (ret <= 0) {
+	if (g_ril_send(cvd->ril, RIL_REQUEST_SET_MUTE, &rilp,
+			volume_mute_cb, cbd, g_free) == 0) {
 		ofono_error("Send RIL_REQUEST_SET_MUTE failed.");
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
@@ -116,13 +109,9 @@
 {
 	struct ofono_call_volume *cv = user_data;
 	struct cv_data *cvd = ofono_call_volume_get_data(cv);
-	int request = RIL_REQUEST_GET_MUTE;
-	int ret;
-
-	ret = g_ril_send(cvd->ril, request, NULL, 0,
-				probe_mute_cb, cv, NULL);
-
-	g_ril_print_request_no_args(cvd->ril, ret, request);
+
+	g_ril_send(cvd->ril, RIL_REQUEST_GET_MUTE, NULL,
+			probe_mute_cb, cv, NULL);
 }
 
 static gboolean ril_delayed_register(gpointer user_data)

=== modified file 'drivers/rilmodem/devinfo.c'
--- drivers/rilmodem/devinfo.c	2013-12-03 08:22:15 +0000
+++ drivers/rilmodem/devinfo.c	2014-01-08 20:51:43 +0000
@@ -106,15 +106,9 @@
 {
 	GRil *ril = ofono_devinfo_get_data(info);
 	struct cb_data *cbd = cb_data_new(cb, data, ril);
-	int request = RIL_REQUEST_BASEBAND_VERSION;
-	int ret;
-
-	ret = g_ril_send(ril, request, NULL, 0,
-				query_revision_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(ril, ret, request);
-
-	if (ret <= 0) {
+
+	if (g_ril_send(ril, RIL_REQUEST_BASEBAND_VERSION, NULL,
+			query_revision_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, NULL, data);
 	}
@@ -149,17 +143,14 @@
 {
 	GRil *ril = ofono_devinfo_get_data(info);
 	struct cb_data *cbd = cb_data_new(cb, data, ril);
-	/* TODO: make it support both RIL_REQUEST_GET_IMEI (deprecated) and
-	 * RIL_REQUEST_DEVICE_IDENTITY depending on the rild version used */
-	int request = RIL_REQUEST_GET_IMEI;
-	int ret;
-
-	ret = g_ril_send(ril, request, NULL, 0,
-					query_serial_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(ril, ret, request);
-
-	if (ret <= 0) {
+
+	/*
+	 * TODO: make it support both RIL_REQUEST_GET_IMEI (deprecated) and
+	 * RIL_REQUEST_DEVICE_IDENTITY depending on the rild version used
+	 */
+
+	if (g_ril_send(ril, RIL_REQUEST_GET_IMEI, NULL,
+			query_serial_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, NULL, data);
 	}

=== modified file 'drivers/rilmodem/gprs-context.c'
--- drivers/rilmodem/gprs-context.c	2013-11-06 03:59:35 +0000
+++ drivers/rilmodem/gprs-context.c	2014-01-08 20:51:43 +0000
@@ -228,7 +228,6 @@
 	struct req_setup_data_call request;
 	struct parcel rilp;
 	struct ofono_error error;
-	int reqid = RIL_REQUEST_SETUP_DATA_CALL;
 	int ret = 0;
 
 	DBG("Activating contex: %d", ctx->cid);
@@ -257,17 +256,9 @@
 	gcd->active_ctx_cid = ctx->cid;
 	gcd->state = STATE_ENABLING;
 
-	ret = g_ril_send(gcd->ril,
-				reqid,
-				rilp.data,
-				rilp.size,
+	ret = g_ril_send(gcd->ril, RIL_REQUEST_SETUP_DATA_CALL, &rilp,
 				ril_setup_data_call_cb, cbd, g_free);
 
-	/* NOTE - we could make the following function part of g_ril_send? */
-	g_ril_print_request(gcd->ril, ret, reqid);
-
-	parcel_free(&rilp);
-
 error:
 	g_free(request.apn);
 	g_free(request.username);
@@ -329,13 +320,12 @@
 	struct parcel rilp;
 	struct req_deactivate_data_call request;
 	struct ofono_error error;
-	int reqid = RIL_REQUEST_DEACTIVATE_DATA_CALL;
 	int ret = 0;
 
 	DBG("cid: %d active_rild_cid: %d", id, gcd->active_rild_cid);
 
 	if (gcd->state == STATE_IDLE || gcd->state == STATE_DISABLING) {
-		/* nothing to do */ 	  
+		/* nothing to do */
 
 		if (cb) {
 			CALLBACK_WITH_SUCCESS(cb, data);
@@ -358,20 +348,15 @@
 		goto error;
 	}
 
-	ret = g_ril_send(gcd->ril,
-				reqid,
-				rilp.data,
-				rilp.size,
+	/* TODO: this should be folded into g_ril_request_deactivate_data_call()!!! */
+	g_ril_append_print_buf(gcd->ril, "(%d,0)", request.cid);
+
+	ret = g_ril_send(gcd->ril, RIL_REQUEST_DEACTIVATE_DATA_CALL, &rilp,
 				ril_deactivate_data_call_cb, cbd, g_free);
 
-	g_ril_append_print_buf(gcd->ril, "(%d,0)", request.cid);
-	g_ril_print_request(gcd->ril, ret, reqid);
-
-	parcel_free(&rilp);
-
 error:
 	if (ret <= 0) {
-		/* TODO: should we force state to disconnected here? */	  
+		/* TODO: should we force state to disconnected here? */
 
 		ofono_error("Send RIL_REQUEST_DEACTIVATE_DATA_CALL failed.");
 		g_free(cbd);

=== modified file 'drivers/rilmodem/gprs.c'
--- drivers/rilmodem/gprs.c	2013-12-04 20:19:31 +0000
+++ drivers/rilmodem/gprs.c	2014-01-08 20:51:43 +0000
@@ -262,17 +262,11 @@
 {
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
 	struct cb_data *cbd = cb_data_new(cb, data, gprs);
-	int request = RIL_REQUEST_DATA_REGISTRATION_STATE;
-	gint ret;
 
 	DBG("");
 
-	ret = g_ril_send(gd->ril, request,
-				NULL, 0, ril_data_reg_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(gd->ril, ret, request);
-
-	if (!ret) {
+	if (g_ril_send(gd->ril, RIL_REQUEST_DATA_REGISTRATION_STATE, NULL,
+			ril_data_reg_cb, cbd, g_free) == 0) {
 		ofono_error("%s: send "
 				"RIL_REQUEST_DATA_REGISTRATION_STATE failed",
 				__func__);

=== modified file 'drivers/rilmodem/network-registration.c'
--- drivers/rilmodem/network-registration.c	2013-11-15 23:18:12 +0000
+++ drivers/rilmodem/network-registration.c	2014-01-08 20:51:43 +0000
@@ -137,8 +137,6 @@
 {
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd;
-	int request = RIL_REQUEST_VOICE_REGISTRATION_STATE;
-	int ret;
 
 	/*
 	 * If no cb specified, setup internal callback to
@@ -149,12 +147,8 @@
 	else
 		cbd = cb_data_new(cb, data, nd);
 
-	ret = g_ril_send(nd->ril, request, NULL,
-				0, ril_creg_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(nd->ril, ret, request);
-
-	if (!ret) {
+	if (g_ril_send(nd->ril, RIL_REQUEST_VOICE_REGISTRATION_STATE, NULL,
+			ril_creg_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data);
 	}
@@ -204,15 +198,9 @@
 {
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data, nd);
-	int request = RIL_REQUEST_OPERATOR;
-	int ret;
-
-	ret = g_ril_send(nd->ril, request, NULL,
-				0, ril_cops_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(nd->ril, ret, request);
-
-	if (!ret) {
+
+	if (g_ril_send(nd->ril, RIL_REQUEST_OPERATOR, NULL,
+			ril_cops_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, NULL, data);
 	}
@@ -291,15 +279,9 @@
 {
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data, nd);
-	int request = RIL_REQUEST_QUERY_AVAILABLE_NETWORKS;
-	int ret;
-
-	ret = g_ril_send(nd->ril, request, NULL,
-				0, ril_cops_list_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(nd->ril, ret, request);
-
-	if (!ret) {
+
+	if (g_ril_send(nd->ril, RIL_REQUEST_QUERY_AVAILABLE_NETWORKS, NULL,
+			ril_cops_list_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, 0, NULL, data);
 	}
@@ -329,15 +311,9 @@
 {
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data, nd);
-	int request = RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC;
-	int ret;
-
-	ret = g_ril_send(nd->ril, request,
-				NULL, 0, ril_register_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(nd->ril, ret, request);
-
-	if (!ret) {
+
+	if (g_ril_send(nd->ril, RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, NULL,
+			ril_register_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -351,23 +327,15 @@
 	struct cb_data *cbd = cb_data_new(cb, data, nd);
 	char buf[OFONO_MAX_MCC_LENGTH + OFONO_MAX_MNC_LENGTH + 1];
 	struct parcel rilp;
-	int request = RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL;
-	int ret;
 
 	/* RIL expects a char * specifying MCCMNC of network to select */
 	snprintf(buf, sizeof(buf), "%s%s", mcc, mnc);
 
 	g_ril_request_set_net_select_manual(nd->ril, buf, &rilp);
 
-	ret = g_ril_send(nd->ril, request,
-				rilp.data, rilp.size, ril_register_cb,
-				cbd, g_free);
-
-	g_ril_print_request(nd->ril, ret, request);
-	parcel_free(&rilp);
-
 	/* In case of error free cbd and return the cb with failure */
-	if (!ret) {
+	if (g_ril_send(nd->ril, RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, &rilp,
+			ril_register_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -377,14 +345,9 @@
 {
 	struct ofono_netreg *netreg = user_data;
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
-	int strength;
-
-	g_assert(message->req == RIL_UNSOL_SIGNAL_STRENGTH);
-
-	strength = ril_util_get_signal(nd->ril, message);
+	int strength = g_ril_unsol_parse_signal_strength(nd->ril, message);
+
 	ofono_netreg_strength_notify(netreg, strength);
-
-	return;
 }
 
 static void ril_strength_cb(struct ril_msg *message, gpointer user_data)
@@ -402,7 +365,8 @@
 		goto error;
 	}
 
-	strength = ril_util_get_signal(nd->ril, message);
+	/* The g_ril_unsol* function handles both reply & unsolicited */
+	strength = g_ril_unsol_parse_signal_strength(nd->ril, message);
 	cb(&error, strength, cbd->data);
 
 	return;
@@ -416,15 +380,9 @@
 {
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data, nd);
-	int request = RIL_REQUEST_SIGNAL_STRENGTH;
-	int ret;
-
-	ret = g_ril_send(nd->ril, request,
-				NULL, 0, ril_strength_cb, cbd, g_free);
-
-	g_ril_print_request_no_args(nd->ril, ret, request);
-
-	if (!ret) {
+
+	if (g_ril_send(nd->ril, RIL_REQUEST_SIGNAL_STRENGTH, NULL,
+			ril_strength_cb, cbd, g_free) == 0) {
 		ofono_error("Send RIL_REQUEST_SIGNAL_STRENGTH failed.");
 
 		g_free(cbd);

=== modified file 'drivers/rilmodem/rilmodem.c'
--- drivers/rilmodem/rilmodem.c	2013-09-09 19:21:32 +0000
+++ drivers/rilmodem/rilmodem.c	2014-01-08 20:51:43 +0000
@@ -44,9 +44,10 @@
 	ril_sms_init();
 	ril_netreg_init();
 	ril_call_volume_init();
-
 	ril_gprs_init();
 	ril_gprs_context_init();
+	ril_ussd_init();
+	ril_call_settings_init();
 
 	return 0;
 }
@@ -63,6 +64,8 @@
 	ril_call_volume_exit();
 	ril_gprs_exit();
 	ril_gprs_context_exit();
+	ril_ussd_exit();
+	ril_call_settings_exit();
 }
 
 OFONO_PLUGIN_DEFINE(rilmodem, "RIL modem driver", VERSION,

=== modified file 'drivers/rilmodem/rilmodem.h'
--- drivers/rilmodem/rilmodem.h	2013-09-09 19:21:32 +0000
+++ drivers/rilmodem/rilmodem.h	2014-01-08 20:51:43 +0000
@@ -51,3 +51,9 @@
 
 extern void ril_gprs_context_init(void);
 extern void ril_gprs_context_exit(void);
+
+extern void ril_ussd_init(void);
+extern void ril_ussd_exit(void);
+
+extern void ril_call_settings_init(void);
+extern void ril_call_settings_exit(void);

=== modified file 'drivers/rilmodem/rilutil.c'
--- drivers/rilmodem/rilutil.c	2013-11-25 13:54:04 +0000
+++ drivers/rilmodem/rilutil.c	2014-01-08 20:51:43 +0000
@@ -157,17 +157,6 @@
 	return result;
 }
 
-/* TODO: this function can go away, once all the code has been
- * re-factored to use grilreply.c */
-void ril_util_init_parcel(struct ril_msg *message, struct parcel *rilp)
-{
-	/* Set up Parcel struct for proper parsing */
-	rilp->data = message->buf;
-	rilp->size = message->buf_len;
-	rilp->capacity = message->buf_len;
-	rilp->offset = 0;
-}
-
 struct ril_util_sim_state_query *ril_util_sim_state_query_new(GRil *ril,
 						guint interval, guint num_times,
 						ril_util_sim_inserted_cb_t cb,
@@ -203,61 +192,3 @@
 
 	g_free(req);
 }
-
-gint ril_util_get_signal(GRil *gril, struct ril_msg *message)
-{
-	struct parcel rilp;
-	int gw_signal, cdma_dbm, evdo_dbm, lte_signal;
-
-	/* Set up Parcel struct for proper parsing */
-	ril_util_init_parcel(message, &rilp);
-
-	/* RIL_SignalStrength_v6 */
-	/* GW_SignalStrength */
-	gw_signal = parcel_r_int32(&rilp);
-	parcel_r_int32(&rilp); /* bitErrorRate */
-
-	/* CDMA_SignalStrength */
-	cdma_dbm = parcel_r_int32(&rilp);
-	parcel_r_int32(&rilp); /* ecio */
-
-	/* EVDO_SignalStrength */
-	evdo_dbm = parcel_r_int32(&rilp);
-	parcel_r_int32(&rilp); /* ecio */
-	parcel_r_int32(&rilp); /* signalNoiseRatio */
-
-	/* LTE_SignalStrength */
-	lte_signal = parcel_r_int32(&rilp);
-	parcel_r_int32(&rilp); /* rsrp */
-	parcel_r_int32(&rilp); /* rsrq */
-	parcel_r_int32(&rilp); /* rssnr */
-	parcel_r_int32(&rilp); /* cqi */
-
-	g_ril_append_print_buf(gril, "(gw: %d, cdma: %d, evdo: %d, lte: %d)",
-				gw_signal, cdma_dbm, evdo_dbm, lte_signal);
-
-	if (message->unsolicited)
-		g_ril_print_unsol(gril, message);
-	else
-		g_ril_print_response(gril, message);
-
-	/* Return the first valid one */
-	if ((gw_signal != 99) && (gw_signal != -1))
-		return (gw_signal * 100) / 31;
-	if ((lte_signal != 99) && (lte_signal != -1))
-		return (lte_signal * 100) / 31;
-
-	/* In case of dbm, return the value directly */
-	if (cdma_dbm != -1) {
-		if (cdma_dbm > 100)
-			cdma_dbm = 100;
-		return cdma_dbm;
-	}
-	if (evdo_dbm != -1) {
-		if (evdo_dbm > 100)
-			evdo_dbm = 100;
-		return evdo_dbm;
-	}
-
-	return -1;
-}

=== modified file 'drivers/rilmodem/rilutil.h'
--- drivers/rilmodem/rilutil.h	2013-11-25 13:54:04 +0000
+++ drivers/rilmodem/rilutil.h	2014-01-08 20:51:43 +0000
@@ -24,8 +24,6 @@
 
 #include <stdio.h>
 
-#include "parcel.h"
-
 /* TODO: create a table lookup*/
 #define PREFIX_30_NETMASK "255.255.255.252"
 #define PREFIX_29_NETMASK "255.255.255.248"
@@ -95,7 +93,6 @@
 gint ril_util_call_compare_by_id(gconstpointer a, gconstpointer b);
 gint ril_util_call_compare(gconstpointer a, gconstpointer b);
 gchar *ril_util_get_netmask(const char *address);
-void ril_util_init_parcel(struct ril_msg *message, struct parcel *rilp);
 
 struct ril_util_sim_state_query *ril_util_sim_state_query_new(GRil *ril,
 						guint interval, guint num_times,
@@ -104,8 +101,6 @@
 						GDestroyNotify destroy);
 void ril_util_sim_state_query_free(struct ril_util_sim_state_query *req);
 
-gint ril_util_get_signal(GRil *gril, struct ril_msg *message);
-
 struct cb_data {
 	void *cb;
 	void *data;

=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2013-11-28 10:56:16 +0000
+++ drivers/rilmodem/sim.c	2014-01-08 20:51:43 +0000
@@ -193,7 +193,6 @@
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
 	struct req_sim_read_info req;
-	int request = RIL_REQUEST_SIM_IO;
 	guint ret = 0;
 
 	DBG("file %04x", fileid);
@@ -211,20 +210,14 @@
 		goto error;
 	}
 
-	ret = g_ril_send(sd->ril,
-				request,
-				rilp.data,
-				rilp.size,
+	g_ril_append_print_buf(sd->ril,
+				"%s0,0,15,(null),pin2=(null),aid=%s)",
+				print_buf,
+				sd->aid_str);
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_SIM_IO, &rilp,
 				ril_file_info_cb, cbd, g_free);
 
-	g_ril_append_print_buf(sd->ril,
-				"%s0,0,15,(null),pin2=(null),aid=%s)",
-				print_buf,
-				sd->aid_str);
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
 error:
 	if (ret == 0) {
 		g_free(cbd);
@@ -276,8 +269,7 @@
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
 	struct req_sim_read_binary req;
-	int request = RIL_REQUEST_SIM_IO;
-	guint ret = 0;
+	gint ret = 0;
 
 	DBG("file %04x", fileid);
 
@@ -296,12 +288,6 @@
 		goto error;
 	}
 
-	ret = g_ril_send(sd->ril,
-				request,
-				rilp.data,
-				rilp.size,
-				ril_file_io_cb, cbd, g_free);
-
 	g_ril_append_print_buf(sd->ril,
 				"%s%d,%d,%d,(null),pin2=(null),aid=%s)",
 				print_buf,
@@ -309,10 +295,9 @@
 				(start & 0xff),
 				length,
 				sd->aid_str);
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
+
+	ret = g_ril_send(sd->ril, RIL_REQUEST_SIM_IO, &rilp,
+				ril_file_io_cb, cbd, g_free);
 error:
 	if (ret == 0) {
 		g_free(cbd);
@@ -329,7 +314,6 @@
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
 	struct req_sim_read_record req;
-	int request = RIL_REQUEST_SIM_IO;
 	guint ret = 0;
 
 	DBG("file %04x", fileid);
@@ -349,12 +333,6 @@
 		goto error;
 	}
 
-	ret = g_ril_send(sd->ril,
-				request,
-				rilp.data,
-				rilp.size,
-				ril_file_io_cb, cbd, g_free);
-
 	g_ril_append_print_buf(sd->ril,
 				"%s%d,%d,%d,(null),pin2=(null),aid=%s)",
 				print_buf,
@@ -362,9 +340,9 @@
 				4,
 				length,
 				sd->aid_str);
-	g_ril_print_request(sd->ril, ret, request);
 
-	parcel_free(&rilp);
+	ret = g_ril_send(sd->ril, RIL_REQUEST_SIM_IO, &rilp,
+				ril_file_io_cb, cbd, g_free);
 
 error:
 	if (ret == 0) {
@@ -412,21 +390,11 @@
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
-	int request = RIL_REQUEST_GET_IMSI;
-	guint ret;
-
-	g_ril_request_read_imsi(sd->ril,
-				sd->aid_str,
-				&rilp);
-
-	ret = g_ril_send(sd->ril, request,
-				rilp.data, rilp.size, ril_imsi_cb, cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
-	if (ret == 0) {
+
+	g_ril_request_read_imsi(sd->ril, sd->aid_str, &rilp);
+
+	if (g_ril_send(sd->ril, RIL_REQUEST_GET_IMSI, &rilp,
+			ril_imsi_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, NULL, data);
 	}
@@ -554,18 +522,12 @@
 }
 
 
-static int send_get_sim_status(struct ofono_sim *sim)
+static void send_get_sim_status(struct ofono_sim *sim)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
-	int request = RIL_REQUEST_GET_SIM_STATUS;
-	guint ret;
-
-	ret = g_ril_send(sd->ril, request,
-				NULL, 0, sim_status_cb, sim, NULL);
-
-	g_ril_print_request_no_args(sd->ril, ret, request);
-
-	return ret;
+
+	g_ril_send(sd->ril, RIL_REQUEST_GET_SIM_STATUS, NULL,
+			sim_status_cb, sim, NULL);
 }
 
 static void ril_sim_status_changed(struct ril_msg *message, gpointer user_data)
@@ -637,8 +599,6 @@
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
-	int request = RIL_REQUEST_ENTER_SIM_PIN;
-	int ret;
 
 	sd->passwd_type = OFONO_SIM_PASSWORD_SIM_PIN;
 
@@ -647,15 +607,8 @@
 				sd->aid_str,
 				&rilp);
 
-	ret = g_ril_send(sd->ril, request,
-				rilp.data, rilp.size, ril_pin_change_state_cb,
-				cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
-	if (ret == 0) {
+	if (g_ril_send(sd->ril, RIL_REQUEST_ENTER_SIM_PIN, &rilp,
+			ril_pin_change_state_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -670,7 +623,6 @@
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
 	struct req_pin_change_state req;
-	int request = RIL_REQUEST_SET_FACILITY_LOCK;
 	int ret = 0;
 
 	sd->passwd_type = passwd_type;
@@ -687,13 +639,8 @@
 		goto error;
 	}
 
-	ret = g_ril_send(sd->ril, request,
-				rilp.data, rilp.size, ril_pin_change_state_cb,
-				cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
+	ret = g_ril_send(sd->ril, RIL_REQUEST_SET_FACILITY_LOCK, &rilp,
+				ril_pin_change_state_cb, cbd, g_free);
 
 error:
 	if (ret == 0) {
@@ -709,8 +656,6 @@
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
-	int request = RIL_REQUEST_ENTER_SIM_PUK;
-	int ret = 0;
 
 	sd->passwd_type = OFONO_SIM_PASSWORD_SIM_PUK;
 
@@ -720,15 +665,8 @@
 					sd->aid_str,
 					&rilp);
 
-	ret = g_ril_send(sd->ril, request,
-			rilp.data, rilp.size, ril_pin_change_state_cb,
-			cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
-	if (ret == 0) {
+	if (g_ril_send(sd->ril, RIL_REQUEST_ENTER_SIM_PUK, &rilp,
+			ril_pin_change_state_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -743,7 +681,6 @@
 	struct cb_data *cbd = cb_data_new(cb, data, sd);
 	struct parcel rilp;
 	int request = RIL_REQUEST_CHANGE_SIM_PIN;
-	int ret = 0;
 
 	sd->passwd_type = passwd_type;
 
@@ -756,14 +693,8 @@
 	if (passwd_type == OFONO_SIM_PASSWORD_SIM_PIN2)
 		request = RIL_REQUEST_CHANGE_SIM_PIN2;
 
-	ret = g_ril_send(sd->ril, request, rilp.data, rilp.size,
-			ril_pin_change_state_cb, cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
-	if (ret == 0) {
+	if (g_ril_send(sd->ril, request, &rilp, ril_pin_change_state_cb,
+			cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
 	}

=== modified file 'drivers/rilmodem/sms.c'
--- drivers/rilmodem/sms.c	2013-12-12 22:17:51 +0000
+++ drivers/rilmodem/sms.c	2014-01-08 20:51:43 +0000
@@ -73,21 +73,12 @@
 	struct sms_data *sd = ofono_sms_get_data(sms);
 	struct cb_data *cbd = cb_data_new(cb, user_data, sd);
 	struct parcel rilp;
-	gint ret;
-	int request = RIL_REQUEST_SET_SMSC_ADDRESS;
 
 	g_ril_request_set_smsc_address(sd->ril, sca, &rilp);
 
 	/* Send request to RIL */
-	ret = g_ril_send(sd->ril, request, rilp.data,
-				rilp.size, ril_csca_set_cb, cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
-	/* In case of error free cbd and return the cb with failure */
-	if (ret == 0) {
+	if (g_ril_send(sd->ril, RIL_REQUEST_SET_SMSC_ADDRESS, &rilp,
+			ril_csca_set_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, user_data);
 	}
@@ -122,17 +113,11 @@
 {
 	struct sms_data *sd = ofono_sms_get_data(sms);
 	struct cb_data *cbd = cb_data_new(cb, user_data, sd);
-	int request = RIL_REQUEST_GET_SMSC_ADDRESS;
-	int ret;
 
 	DBG("Sending csca_query");
 
-	ret = g_ril_send(sd->ril, request, NULL, 0,
-				ril_csca_query_cb, cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	if (ret == 0) {
+	if (g_ril_send(sd->ril, RIL_REQUEST_GET_SMSC_ADDRESS, NULL,
+			ril_csca_query_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, NULL, user_data);
 	}
@@ -163,8 +148,6 @@
 	struct sms_data *sd = ofono_sms_get_data(sms);
 	struct cb_data *cbd = cb_data_new(cb, user_data, sd);
 	struct parcel rilp;
-	int request = RIL_REQUEST_SEND_SMS;
-	int ret;
 	struct req_sms_cmgs req;
 
 	DBG("pdu_len: %d, tpdu_len: %d mms: %d", pdu_len, tpdu_len, mms);
@@ -177,17 +160,8 @@
 
 	g_ril_request_sms_cmgs(sd->ril, &req, &rilp);
 
-	ret = g_ril_send(sd->ril,
-				request,
-				rilp.data,
-				rilp.size,
-				ril_submit_sms_cb, cbd, g_free);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
-
-	if (ret == 0) {
+	if (g_ril_send(sd->ril, RIL_REQUEST_SEND_SMS, &rilp,
+			ril_submit_sms_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, -1, user_data);
 	}
@@ -204,22 +178,15 @@
 {
 	struct sms_data *sd = ofono_sms_get_data(sms);
 	struct parcel rilp;
-	int ret;
-	int request = RIL_REQUEST_SMS_ACKNOWLEDGE;
 
 	g_ril_request_sms_acknowledge(sd->ril, &rilp);
 
 	/* TODO: should ACK be sent for either of the error cases? */
 
 	/* ACK the incoming NEW_SMS */
-	ret = g_ril_send(sd->ril, request,
-				rilp.data,
-				rilp.size,
-				ril_ack_delivery_cb, NULL, NULL);
-
-	g_ril_print_request(sd->ril, ret, request);
-
-	parcel_free(&rilp);
+	g_ril_send(sd->ril, RIL_REQUEST_SMS_ACKNOWLEDGE, &rilp,
+			ril_ack_delivery_cb, NULL, NULL);
+
 }
 
 static void ril_sms_notify(struct ril_msg *message, gpointer user_data)

=== added file 'drivers/rilmodem/ussd.c'
--- drivers/rilmodem/ussd.c	1970-01-01 00:00:00 +0000
+++ drivers/rilmodem/ussd.c	2014-01-08 20:51:43 +0000
@@ -0,0 +1,227 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2013 Jolla Ltd
+ *  Copyright (C) 2013 Canonical Ltd
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/ussd.h>
+#include <smsutil.h>
+#include <util.h>
+
+#include "gril.h"
+#include "grilutil.h"
+#include "grilrequest.h"
+#include "grilunsol.h"
+
+#include "rilmodem.h"
+
+#include "ril_constants.h"
+
+struct ussd_data {
+	GRil *ril;
+};
+
+static void ril_ussd_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_ussd *ussd = cbd->user;
+	struct ussd_data *ud = ofono_ussd_get_data(ussd);
+	ofono_ussd_cb_t cb = cbd->cb;
+
+	if (message->error == RIL_E_SUCCESS) {
+		g_ril_print_response_no_args(ud->ril, message);
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	} else {
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
+}
+
+static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
+			const unsigned char *pdu, int len,
+			ofono_ussd_cb_t cb, void *data)
+{
+	struct ussd_data *ud = ofono_ussd_get_data(ussd);
+	struct cb_data *cbd = cb_data_new(cb, data, ussd);
+	enum sms_charset charset;
+	int ret = 0;
+
+	if (cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) {
+		/* TODO: send other alphabets (maybe needed by STK) */
+		if (charset == SMS_CHARSET_7BIT) {
+			unsigned char *unpacked_buf;
+			long written;
+
+			unpacked_buf = unpack_7bit(pdu, len, 0, TRUE, 0,
+							&written, 1);
+
+			if (written >= 1) {
+				struct parcel rilp;
+
+				*(unpacked_buf + written) = '\0';
+				g_ril_request_send_ussd(ud->ril,
+							(char *) unpacked_buf,
+							&rilp);
+
+				ret = g_ril_send(ud->ril, RIL_REQUEST_SEND_USSD,
+							&rilp, ril_ussd_cb, cbd,
+							g_free);
+			}
+
+			g_free(unpacked_buf);
+		} else {
+			ofono_error("%s: No support for charset %d",
+					__func__, charset);
+		}
+	}
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+static void ril_ussd_cancel_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_ussd *ussd = cbd->user;
+	struct ussd_data *ud = ofono_ussd_get_data(ussd);
+	ofono_ussd_cb_t cb = cbd->cb;
+
+	if (message->error == RIL_E_SUCCESS) {
+		g_ril_print_response_no_args(ud->ril, message);
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	} else {
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
+}
+
+static void ril_ussd_cancel(struct ofono_ussd *ussd,
+				ofono_ussd_cb_t cb, void *user_data)
+{
+	struct ussd_data *ud = ofono_ussd_get_data(ussd);
+	struct cb_data *cbd = cb_data_new(cb, user_data, ussd);
+	int ret;
+
+	ret = g_ril_send(ud->ril, RIL_REQUEST_CANCEL_USSD, NULL,
+				ril_ussd_cancel_cb, cbd, g_free);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, user_data);
+	}
+}
+
+static void ril_ussd_notify(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_ussd *ussd = user_data;
+	struct ussd_data *ud = ofono_ussd_get_data(ussd);
+	struct unsol_ussd *unsol;
+
+	unsol = g_ril_unsol_parse_ussd(ud->ril, message);
+	if (unsol == NULL) {
+		ofono_error("%s: Parsing error", __func__);
+		return;
+	}
+
+	/*
+	 * TODO
+	 *
+	 * With data coding scheme 0x44, we are saying that the ussd string is
+	 * 8-bit data, uncompressed, and with unspecified message class. This
+	 * must be changed in the future so we get the UTF16 from the RIL parcel
+	 * and decode it properly. For the DCS coding, see 3gpp 23.038, sect. 5.
+	 */
+	if (unsol->message != NULL)
+		ofono_ussd_notify(ussd, unsol->type, 0x44,
+					(const unsigned char *) unsol->message,
+					strlen(unsol->message));
+	else
+		ofono_ussd_notify(ussd, unsol->type, 0, NULL, 0);
+
+	g_ril_unsol_free_ussd(unsol);
+}
+
+static gboolean ril_delayed_register(gpointer user_data)
+{
+	struct ofono_ussd *ussd = user_data;
+	struct ussd_data *ud = ofono_ussd_get_data(ussd);
+
+	DBG("");
+
+	ofono_ussd_register(ussd);
+
+	/* Register for USSD responses */
+	g_ril_register(ud->ril, RIL_UNSOL_ON_USSD, ril_ussd_notify, ussd);
+
+	return FALSE;
+}
+
+static int ril_ussd_probe(struct ofono_ussd *ussd,
+					unsigned int vendor,
+					void *user)
+{
+	GRil *ril = user;
+	struct ussd_data *ud = g_new0(struct ussd_data, 1);
+
+	ud->ril = g_ril_clone(ril);
+	ofono_ussd_set_data(ussd, ud);
+	g_idle_add(ril_delayed_register, ussd);
+
+	return 0;
+}
+
+static void ril_ussd_remove(struct ofono_ussd *ussd)
+{
+	struct ussd_data *ud = ofono_ussd_get_data(ussd);
+	ofono_ussd_set_data(ussd, NULL);
+
+	g_ril_unref(ud->ril);
+	g_free(ud);
+}
+
+static struct ofono_ussd_driver driver = {
+	.name		= RILMODEM,
+	.probe		= ril_ussd_probe,
+	.remove		= ril_ussd_remove,
+	.request	= ril_ussd_request,
+	.cancel		= ril_ussd_cancel
+};
+
+void ril_ussd_init(void)
+{
+	ofono_ussd_driver_register(&driver);
+}
+
+void ril_ussd_exit(void)
+{
+	ofono_ussd_driver_unregister(&driver);
+}

=== modified file 'drivers/rilmodem/voicecall.c'
--- drivers/rilmodem/voicecall.c	2013-11-25 13:54:04 +0000
+++ drivers/rilmodem/voicecall.c	2014-01-08 20:51:43 +0000
@@ -90,6 +90,13 @@
 	int id;
 };
 
+/* Data for dial after swap */
+struct hold_before_dial_req {
+	struct ofono_voicecall *vc;
+	struct ofono_phone_number dial_ph;
+	enum ofono_clir_option dial_clir;
+};
+
 static void send_one_dtmf(struct voicecall_data *vd);
 static void clear_dtmf_queue(struct voicecall_data *vd);
 
@@ -111,6 +118,7 @@
 {
 	struct ofono_voicecall *vc = user_data;
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int reqid = RIL_REQUEST_LAST_CALL_FAIL_CAUSE;
 	GSList *calls;
 	GSList *n, *o;
 	struct ofono_call *nc, *oc;
@@ -140,14 +148,13 @@
 				/* Get disconnect cause before calling core */
 				struct lastcause_req *reqdata =
 					g_try_new0(struct lastcause_req, 1);
-				if (reqdata) {
-					int req;
-					req = RIL_REQUEST_LAST_CALL_FAIL_CAUSE;
+				if (reqdata != NULL) {
 					reqdata->vc = user_data;
 					reqdata->id = oc->id;
-					g_ril_send(vd->ril, req,
-							NULL, 0, lastcause_cb,
-							reqdata, g_free);
+
+					g_ril_send(vd->ril, reqid, NULL,
+							lastcause_cb, reqdata,
+							g_free);
 				}
 			}
 
@@ -221,13 +228,9 @@
 {
 	struct ofono_voicecall *vc = user_data;
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_GET_CURRENT_CALLS;
-	int ret;
-
-	ret = g_ril_send(vd->ril, request, NULL,
-			0, clcc_poll_cb, vc, NULL);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+
+	g_ril_send(vd->ril, RIL_REQUEST_GET_CURRENT_CALLS, NULL,
+			clcc_poll_cb, vc, NULL);
 
 	vd->clcc_source = 0;
 
@@ -239,8 +242,6 @@
 	struct change_state_req *req = user_data;
 	struct voicecall_data *vd = ofono_voicecall_get_data(req->vc);
 	struct ofono_error error;
-	int request = RIL_REQUEST_GET_CURRENT_CALLS;
-	int ret;
 
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
@@ -264,10 +265,8 @@
 	}
 
 out:
-	ret = g_ril_send(vd->ril, request, NULL,
-				0, clcc_poll_cb, req->vc, NULL);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	g_ril_send(vd->ril, RIL_REQUEST_GET_CURRENT_CALLS, NULL,
+			clcc_poll_cb, req->vc, NULL);
 
 	/* We have to callback after we schedule a poll if required */
 	if (req->cb)
@@ -276,8 +275,7 @@
 
 static int ril_template(const guint rreq, struct ofono_voicecall *vc,
 			GRilResponseFunc func, unsigned int affected_types,
-			gpointer pdata, const gsize psize,
-			ofono_voicecall_cb_t cb, void *data)
+			gpointer pdata, ofono_voicecall_cb_t cb, void *data)
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct change_state_req *req = g_try_new0(struct change_state_req, 1);
@@ -291,7 +289,7 @@
 	req->data = data;
 	req->affected_types = affected_types;
 
-	ret = g_ril_send(vd->ril, rreq, pdata, psize, func, req, g_free);
+	ret = g_ril_send(vd->ril, rreq, pdata, func, req, g_free);
 	if (ret > 0)
 		return ret;
 error:
@@ -310,8 +308,6 @@
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	ofono_voicecall_cb_t cb = cbd->cb;
 	struct ofono_error error;
-	struct ofono_call *call;
-	GSList *l;
 
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
@@ -322,17 +318,6 @@
 
 	g_ril_print_response_no_args(vd->ril, message);
 
-	/* On a success, make sure to put all active calls on hold */
-	for (l = vd->calls; l; l = l->next) {
-		call = l->data;
-
-		if (call->status != CALL_STATUS_ACTIVE)
-			continue;
-
-		call->status = CALL_STATUS_HELD;
-		ofono_voicecall_notify(vc, call);
-	}
-
 	/* CLCC will update the oFono call list with proper ids  */
 	if (!vd->clcc_source)
 		vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL,
@@ -348,7 +333,7 @@
 	cb(&error, cbd->data);
 }
 
-static void ril_dial(struct ofono_voicecall *vc,
+static void dial(struct ofono_voicecall *vc,
 			const struct ofono_phone_number *ph,
 			enum ofono_clir_option clir, ofono_voicecall_cb_t cb,
 			void *data)
@@ -356,26 +341,87 @@
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct cb_data *cbd = cb_data_new(cb, data, vc);
 	struct parcel rilp;
-	int request = RIL_REQUEST_DIAL;
-	int ret;
 
 	g_ril_request_dial(vd->ril, ph, clir, &rilp);
 
 	/* Send request to RIL */
-	ret = g_ril_send(vd->ril, request, rilp.data,
-				rilp.size, rild_cb, cbd, g_free);
-
-	g_ril_print_request(vd->ril, ret, request);
-
-	parcel_free(&rilp);
-
-	/* In case of error free cbd and return the cb with failure */
-	if (ret <= 0) {
+	if (g_ril_send(vd->ril, RIL_REQUEST_DIAL, &rilp,
+			rild_cb, cbd, g_free) == 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
 	}
 }
 
+static void hold_before_dial_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct hold_before_dial_req *req = cbd->user;
+	struct voicecall_data *vd = ofono_voicecall_get_data(req->vc);
+	ofono_voicecall_cb_t cb = cbd->cb;
+
+	if (message->error != RIL_E_SUCCESS) {
+		g_free(req);
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		return;
+	}
+
+	g_ril_print_response_no_args(vd->ril, message);
+
+	/* Current calls held: we can dial now */
+	dial(req->vc, &req->dial_ph, req->dial_clir, cb, cbd->data);
+
+	g_free(req);
+}
+
+static void ril_dial(struct ofono_voicecall *vc,
+			const struct ofono_phone_number *ph,
+			enum ofono_clir_option clir, ofono_voicecall_cb_t cb,
+			void *data)
+{
+	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+	int current_active = 0;
+	struct ofono_call *call;
+	GSList *l;
+
+	/* Check for current active calls */
+	for (l = vd->calls; l; l = l->next) {
+		call = l->data;
+
+		if (call->status == CALL_STATUS_ACTIVE) {
+			current_active = 1;
+			break;
+		}
+	}
+
+	/*
+	 * The network will put current active calls on hold. In some cases
+	 * (mako), the modem also updates properly the state. In others
+	 * (maguro), we need to explicitly set the state to held. In both cases
+	 * we send a request for holding the active call, as it is not harmful
+	 * when it is not really needed, and is what Android does.
+	 */
+	if (current_active) {
+		struct hold_before_dial_req *req;
+		struct cb_data *cbd;
+
+		req = g_malloc0(sizeof(*req));
+		req->vc = vc;
+		req->dial_ph = *ph;
+		req->dial_clir = clir;
+
+		cbd = cb_data_new(cb, data, req);
+
+		if (g_ril_send(vd->ril, RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE,
+				NULL, hold_before_dial_cb, cbd, g_free) == 0) {
+			g_free(cbd);
+			CALLBACK_WITH_FAILURE(cb, data);
+		}
+
+	} else {
+		dial(vc, ph, clir, cb, data);
+	}
+}
+
 static void ril_hangup_all(struct ofono_voicecall *vc,
 				ofono_voicecall_cb_t cb, void *data)
 {
@@ -384,8 +430,6 @@
 	struct ofono_error error;
 	struct ofono_call *call;
 	GSList *l;
-	int request = RIL_REQUEST_HANGUP;
-	int ret;
 
 	for (l = vd->calls; l; l = l->next) {
 		call = l->data;
@@ -394,12 +438,8 @@
 		g_ril_request_hangup(vd->ril, call->id, &rilp);
 
 		/* Send request to RIL */
-		ret = ril_template(request, vc, generic_cb, AFFECTED_STATES_ALL,
-					rilp.data, rilp.size, NULL, NULL);
-
-		g_ril_print_request(vd->ril, ret, request);
-
-		parcel_free(&rilp);
+		ril_template(RIL_REQUEST_HANGUP, vc, generic_cb,
+				AFFECTED_STATES_ALL, &rilp, NULL, NULL);
 	}
 
 	/* TODO: Deal in case of an error at hungup */
@@ -412,20 +452,14 @@
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct parcel rilp;
-	int request = RIL_REQUEST_HANGUP;
-	int ret;
 
 	DBG("Hanging up call with id %d", id);
 
 	g_ril_request_hangup(vd->ril, id, &rilp);
 
 	/* Send request to RIL */
-	ret = ril_template(request, vc, generic_cb, AFFECTED_STATES_ALL,
-				rilp.data, rilp.size, cb, data);
-
-	g_ril_print_request(vd->ril, ret, request);
-
-	parcel_free(&rilp);
+	ril_template(RIL_REQUEST_HANGUP, vc, generic_cb,
+			AFFECTED_STATES_ALL, &rilp, cb, data);
 }
 
 static void ril_call_state_notify(struct ril_msg *message, gpointer user_data)
@@ -473,17 +507,10 @@
 static void ril_answer(struct ofono_voicecall *vc,
 			ofono_voicecall_cb_t cb, void *data)
 {
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_ANSWER;
-	int ret;
-
 	DBG("Answering current call");
 
 	/* Send request to RIL */
-	ret = ril_template(request, vc, generic_cb, 0,
-				NULL, 0, cb, data);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	ril_template(RIL_REQUEST_ANSWER, vc, generic_cb, 0, NULL, cb, data);
 }
 
 static void ril_send_dtmf_cb(struct ril_msg *message, gpointer user_data)
@@ -512,8 +539,6 @@
 static void send_one_dtmf(struct voicecall_data *vd)
 {
 	struct parcel rilp;
-	int request = RIL_REQUEST_DTMF;
-	int ret;
 
 	if (vd->tone_pending == TRUE)
 		return; /* RIL request pending */
@@ -523,11 +548,8 @@
 
 	g_ril_request_dtmf(vd->ril, vd->tone_queue[0], &rilp);
 
-	ret = g_ril_send(vd->ril, request, rilp.data,
-				rilp.size, ril_send_dtmf_cb, vd, NULL);
-
-	g_ril_print_request(vd->ril, ret, request);
-	parcel_free(&rilp);
+	g_ril_send(vd->ril, RIL_REQUEST_DTMF, &rilp,
+			ril_send_dtmf_cb, vd, NULL);
 
 	vd->tone_pending = TRUE;
 }
@@ -563,13 +585,7 @@
 static void ril_create_multiparty(struct ofono_voicecall *vc,
 			ofono_voicecall_cb_t cb, void *data)
 {
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_CONFERENCE;
-	int ret;
-
-	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	ril_template(RIL_REQUEST_CONFERENCE, vc, generic_cb, 0, NULL, cb, data);
 }
 
 static void ril_private_chat(struct ofono_voicecall *vc, int id,
@@ -577,96 +593,59 @@
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct parcel rilp;
-	int request = RIL_REQUEST_SEPARATE_CONNECTION;
-	int ret;
 
 	g_ril_request_separate_conn(vd->ril, id, &rilp);
 
 	/* Send request to RIL */
-	ret = ril_template(request, vc, generic_cb, 0, rilp.data, rilp.size,
-				cb, data);
-
-	g_ril_print_request(vd->ril, ret, request);
-
-	parcel_free(&rilp);
+	ril_template(RIL_REQUEST_SEPARATE_CONNECTION, vc,
+			generic_cb, 0, &rilp, cb, data);
 }
 
 static void ril_swap_without_accept(struct ofono_voicecall *vc,
 			ofono_voicecall_cb_t cb, void *data)
 {
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE;
-	int ret;
-
-	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	ril_template(RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE, vc,
+			generic_cb, 0, NULL, cb, data);
 }
 
 static void ril_hold_all_active(struct ofono_voicecall *vc,
 			ofono_voicecall_cb_t cb, void *data)
 {
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE;
-	int ret;
-
-	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	ril_template(RIL_REQUEST_SWITCH_HOLDING_AND_ACTIVE, vc,
+			generic_cb, 0, NULL, cb, data);
 }
 
 static void ril_release_all_held(struct ofono_voicecall *vc,
 					ofono_voicecall_cb_t cb, void *data)
 {
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND;
-	int ret;
-
-	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	ril_template(RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND, vc,
+			generic_cb, 0, NULL, cb, data);
 }
 
 static void ril_release_all_active(struct ofono_voicecall *vc,
 					ofono_voicecall_cb_t cb, void *data)
 {
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND;
-	int ret;
-
-	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	ril_template(RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND, vc,
+			generic_cb, 0, NULL, cb, data);
 }
 
 static void ril_set_udub(struct ofono_voicecall *vc,
 					ofono_voicecall_cb_t cb, void *data)
 {
-	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND;
-	int ret;
-
-	ret = ril_template(request, vc, generic_cb, 0, NULL, 0, cb, data);
-
-	g_ril_print_request_no_args(vd->ril, ret, request);
+	ril_template(RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND, vc,
+			generic_cb, 0, NULL, cb, data);
 }
 
 static gboolean enable_supp_svc(gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
-	int request = RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION;
-	int ret;
 	struct parcel rilp;
 
 	g_ril_request_set_supp_svc_notif(vd->ril, &rilp);
 
-	ret = g_ril_send(vd->ril, request, rilp.data,
-				rilp.size, NULL, vc, NULL);
-
-	g_ril_print_request(vd->ril, ret, request);
-
-	parcel_free(&rilp);
+	g_ril_send(vd->ril, RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION, &rilp,
+			NULL, vc, NULL);
 
 	/* Makes this a single shot */
 	return FALSE;

=== modified file 'gril/gril.c'
--- gril/gril.c	2013-11-28 10:56:16 +0000
+++ gril/gril.c	2014-01-08 20:51:43 +0000
@@ -211,7 +211,6 @@
 	return TRUE;
 }
 
-
 /*
  * This function creates a RIL request.  For a good reference on
  * the layout of RIL requests, responses, and unsolicited requests
@@ -224,8 +223,7 @@
 						guint gid,
 						const gint req,
 						const gint id,
-						const char *data,
-						const gsize data_len,
+						struct parcel *rilp,
 						GRilResponseFunc func,
 						gpointer user_data,
 						GDestroyNotify notify,
@@ -233,6 +231,10 @@
 {
 	struct ril_request *r;
 	struct req_hdr header;
+	guint data_len = 0;
+
+	if (rilp != NULL)
+		data_len = rilp->size;
 
 	r = g_try_new0(struct ril_request, 1);
 	if (r == NULL) {
@@ -240,7 +242,7 @@
 		return NULL;
 	}
 
-	DBG("req: %s, id: %d, data_len: %zu",
+	DBG("req: %s, id: %d, data_len: %u",
 		ril_request_id_to_string(req), id, data_len);
 
 	/* Full request size: header size plus buffer length */
@@ -261,7 +263,8 @@
 	/* copy header */
 	memcpy(r->data, &header, sizeof(header));
 	/* copy request data */
-	memcpy(r->data + sizeof(header), data, data_len);
+	if (data_len)
+		memcpy(r->data + sizeof(header), rilp->data, data_len);
 
 	r->req = req;
 	r->gid = gid;
@@ -309,6 +312,8 @@
 {
 	struct ril_s *ril = user_data;
 
+	ofono_error("%s: disconnected from rild", __func__);
+
 	ril_cleanup(ril);
 	g_ril_io_unref(ril->io);
 	ril->io = NULL;
@@ -348,7 +353,7 @@
 				req->callback(message, req->user_data);
 
 			len = g_queue_get_length(p->out_queue);
-			DBG("requests in sent queue before removing:%d", len);
+			DBG("requests in out_queue before removing: %d", len);
 			for (i = 0; i < len; i++) {
 				id = GPOINTER_TO_INT(g_queue_peek_nth(
 							p->out_queue, i));
@@ -526,8 +531,11 @@
 	*/
 
 	message_len = *len - 4;
-	if (message_len < plen)
+	if (message_len < plen) {
+		DBG("Not enough bytes for fixed record; len: %d avail: %d",
+			plen, message_len);
 		return NULL;
+	}
 
 	/* FIXME: add check for message_len = 0? */
 
@@ -557,8 +565,6 @@
 
 	p->in_read_handler = TRUE;
 
-	DBG("len: %d, wrap: %d", len, wrap);
-
 	while (p->suspended == FALSE && (p->read_so_far < len)) {
 		gsize rbytes = MIN(len - p->read_so_far, wrap - p->read_so_far);
 
@@ -576,10 +582,8 @@
 		message = read_fixed_record(p, buf, &rbytes);
 
 		/* wait for the rest of the record... */
-		if (message == NULL) {
-			DBG("Not enough bytes for fixed record");
+		if (message == NULL)
 			break;
-		}
 
 		buf += rbytes;
 		p->read_so_far += rbytes;
@@ -870,31 +874,36 @@
 	int n = 0;
 	guint len, i;
 	struct ril_request *req;
+	gboolean sent;
 
 	if (ril->command_queue == NULL)
 		return;
 
 	while ((req = g_queue_peek_nth(ril->command_queue, n)) != NULL) {
-		if (req->gid != group) {
+		if (req->id == 0 || req->gid != group) {
 			n += 1;
 			continue;
 		}
 
 		req->callback = NULL;
+		sent = FALSE;
 
 		len = g_queue_get_length(ril->out_queue);
 		for (i = 0; i < len; i++) {
 			if (GPOINTER_TO_INT(
 					g_queue_peek_nth(ril->out_queue, i))
 					== req->id) {
-				g_queue_pop_nth(ril->out_queue, i);
+				n += 1;
+				sent = TRUE;
 				break;
 			}
  		}
 
+		if (sent)
+			continue;
+
 		g_queue_remove(ril->command_queue, req);
 		ril_request_destroy(req);
-		n += 1;
 	}
 }
 
@@ -999,6 +1008,7 @@
 	rilp->size = message->buf_len;
 	rilp->capacity = message->buf_len;
 	rilp->offset = 0;
+	rilp->malformed = 0;
 }
 
 GRil *g_ril_new()
@@ -1067,9 +1077,9 @@
 	return ril;
 }
 
-gint g_ril_send(GRil *ril, const gint reqid, const char *data,
-			const gsize data_len, GRilResponseFunc func,
-			gpointer user_data, GDestroyNotify notify)
+gint g_ril_send(GRil *ril, const gint reqid, struct parcel *rilp,
+		GRilResponseFunc func, gpointer user_data,
+		GDestroyNotify notify)
 {
 	struct ril_request *r;
 	struct ril_s *p;
@@ -1081,9 +1091,12 @@
 
 	p = ril->parent;
 
-	r = ril_request_create(p, ril->group, reqid, p->next_cmd_id,
-				data, data_len, func,
-				user_data, notify, FALSE);
+	r = ril_request_create(p, ril->group, reqid, p->next_cmd_id, rilp,
+				func, user_data, notify, FALSE);
+
+	if (rilp != NULL)
+		parcel_free(rilp);
+
 	if (r == NULL)
 		return 0;
 
@@ -1091,9 +1104,15 @@
 
 	g_queue_push_tail(p->command_queue, r);
 
-	DBG("calling wakeup_writer: qlen: %d", g_queue_get_length(p->command_queue));
+	DBG("calling wakeup_writer: command_queue len: %d",
+		g_queue_get_length(p->command_queue));
 	ril_wakeup_writer(p);
 
+	if (rilp == NULL)
+		g_ril_print_request_no_args(ril, r->id, reqid);
+	else
+		g_ril_print_request(ril, r->id, reqid);
+
 	return r->id;
 }
 

=== modified file 'gril/gril.h'
--- gril/gril.h	2013-11-20 02:46:47 +0000
+++ gril/gril.h	2014-01-08 20:51:43 +0000
@@ -125,9 +125,9 @@
  * g_ril_cancel.  If an error occurred, an id of 0 is returned.
  *
  */
-gint g_ril_send(GRil *ril, const gint reqid, const char *data,
-			const gsize data_len, GRilResponseFunc func,
-			gpointer user_data, GDestroyNotify notify);
+gint g_ril_send(GRil *ril, const gint reqid, struct parcel *rilp,
+		GRilResponseFunc func, gpointer user_data,
+		GDestroyNotify notify);
 
 guint g_ril_register(GRil *ril, const int req,
 			GRilNotifyFunc func, gpointer user_data);

=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2013-12-03 08:21:33 +0000
+++ gril/grilreply.c	2014-01-08 20:51:43 +0000
@@ -1108,3 +1108,103 @@
 
 	return imei;
 }
+
+int g_ril_reply_parse_query_call_waiting(GRil *gril,
+						const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int numint, enabled, cls;
+
+	g_ril_init_parcel(message, &rilp);
+
+	numint = parcel_r_int32(&rilp);
+	if (numint < 1) {
+		ofono_error("%s Wrong format", __func__);
+		goto error;
+	}
+
+	enabled = parcel_r_int32(&rilp);
+
+	if (enabled > 0)
+		cls = parcel_r_int32(&rilp);
+	else
+		cls = 0;
+
+	g_ril_append_print_buf(gril, "{%d,0x%x}", enabled, cls);
+	g_ril_print_response(gril, message);
+
+	return cls;
+
+error:
+	return -1;
+}
+
+int g_ril_reply_parse_query_clip(GRil *gril,
+					const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int clip_status, numint;
+
+	g_ril_init_parcel(message, &rilp);
+
+	numint = parcel_r_int32(&rilp);
+	if (numint != 1) {
+		ofono_error("%s Wrong format", __func__);
+		goto error;
+	}
+
+	clip_status = parcel_r_int32(&rilp);
+
+	g_ril_append_print_buf(gril, "{%d}", clip_status);
+	g_ril_print_response(gril, message);
+
+	return clip_status;
+
+error:
+	return -1;
+}
+
+void g_ril_reply_free_get_clir(struct reply_clir *rclir)
+{
+	g_free(rclir);
+}
+
+struct reply_clir *g_ril_reply_parse_get_clir(GRil *gril,
+						const struct ril_msg *message)
+{
+	struct parcel rilp;
+	struct reply_clir *rclir;
+	int numint;
+
+	rclir = g_try_malloc0(sizeof(*rclir));
+	if (rclir == NULL) {
+		ofono_error("%s Out of memory", __func__);
+		goto error;
+	}
+
+	g_ril_init_parcel(message, &rilp);
+
+	/* Length */
+	numint = parcel_r_int32(&rilp);
+	if (numint != 2) {
+		ofono_error("%s Wrong format", __func__);
+		goto error;
+	}
+
+	/* Set HideCallerId property from network */
+	rclir->status = parcel_r_int32(&rilp);
+
+	/* State of the CLIR supplementary service in the network */
+	rclir->provisioned = parcel_r_int32(&rilp);
+
+	g_ril_append_print_buf(gril, "{%d,%d}",
+				rclir->status, rclir->provisioned);
+	g_ril_print_response(gril, message);
+
+	return rclir;
+
+error:
+	g_free(rclir);
+
+	return NULL;
+}

=== modified file 'gril/grilreply.h'
--- gril/grilreply.h	2013-12-03 08:21:33 +0000
+++ gril/grilreply.h	2014-01-08 20:51:43 +0000
@@ -95,6 +95,11 @@
 	struct reply_sim_app *apps[MAX_UICC_APPS];
 };
 
+struct reply_clir {
+	int status;
+	int provisioned;
+};
+
 void g_ril_reply_free_avail_ops(struct reply_avail_ops *reply);
 
 struct reply_avail_ops *g_ril_reply_parse_avail_ops(GRil *gril,
@@ -144,6 +149,17 @@
 char *g_ril_reply_parse_get_imei(GRil *gril,
 					const struct ril_msg *message);
 
+int g_ril_reply_parse_query_call_waiting(GRil *gril,
+						const struct ril_msg *message);
+
+int g_ril_reply_parse_query_clip(GRil *gril,
+					const struct ril_msg *message);
+
+void g_ril_reply_free_get_clir(struct reply_clir *rclir);
+
+struct reply_clir *g_ril_reply_parse_get_clir(GRil *gril,
+						const struct ril_msg *message);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2013-11-28 13:31:35 +0000
+++ gril/grilrequest.c	2014-01-08 20:51:43 +0000
@@ -717,3 +717,66 @@
 
 	g_ril_append_print_buf(gril, "(%d)", muted);
 }
+
+void g_ril_request_send_ussd(GRil *gril,
+				const char *ussd,
+				struct parcel *rilp)
+{
+	parcel_init(rilp);
+	parcel_w_string(rilp, ussd);
+
+	g_ril_append_print_buf(gril, "(%s)", ussd);
+}
+
+void g_ril_request_set_call_waiting(GRil *gril,
+					int enabled, int serviceclass,
+					struct parcel *rilp)
+{
+	parcel_init(rilp);
+
+	parcel_w_int32(rilp, 2);	/* Number of params */
+	parcel_w_int32(rilp, enabled);	/* on/off */
+
+	/*
+	 * Modem seems to respond with error to all queries
+	 * or settings made with bearer class
+	 * BEARER_CLASS_DEFAULT. Design decision: If given
+	 * class is BEARER_CLASS_DEFAULT let's map it to
+	 * SERVICE_CLASS_VOICE effectively making it the
+	 * default bearer.
+	 */
+	if (serviceclass == BEARER_CLASS_DEFAULT)
+		serviceclass = BEARER_CLASS_VOICE;
+
+	parcel_w_int32(rilp, serviceclass);	/* Service class */
+
+	g_ril_append_print_buf(gril, "(%d, 0x%x)", enabled, serviceclass);
+}
+
+void g_ril_request_query_call_waiting(GRil *gril,
+					int serviceclass,
+					struct parcel *rilp)
+{
+	parcel_init(rilp);
+
+	parcel_w_int32(rilp, 1);	/* Number of params */
+	/*
+	 * RILD expects service class to be 0 as certain carriers can reject the
+	 * query with specific service class
+	 */
+	parcel_w_int32(rilp, 0);
+
+	g_ril_append_print_buf(gril, "(0)");
+}
+
+void g_ril_request_set_clir(GRil *gril,
+				int mode,
+				struct parcel *rilp)
+{
+	parcel_init(rilp);
+
+	parcel_w_int32(rilp, 1);	/* Number of params */
+	parcel_w_int32(rilp, mode);
+
+	g_ril_append_print_buf(gril, "(%d)", mode);
+}

=== modified file 'gril/grilrequest.h'
--- gril/grilrequest.h	2013-11-28 13:31:35 +0000
+++ gril/grilrequest.h	2014-01-08 20:51:43 +0000
@@ -181,6 +181,22 @@
 				int muted,
 				struct parcel *rilp);
 
+void g_ril_request_send_ussd(GRil *gril,
+				const char *ussd,
+				struct parcel *rilp);
+
+void g_ril_request_set_call_waiting(GRil *gril,
+					int enabled, int serviceclass,
+					struct parcel *rilp);
+
+void g_ril_request_query_call_waiting(GRil *gril,
+					int serviceclass,
+					struct parcel *rilp);
+
+void g_ril_request_set_clir(GRil *gril,
+				int mode,
+				struct parcel *rilp);
+
 #ifdef __cplusplus
 }
 #endif

=== removed file 'gril/grilresponse.h'
--- gril/grilresponse.h	2013-09-09 19:21:32 +0000
+++ gril/grilresponse.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- *
- *  RIL chat library with GLib integration
- *
- *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2012  Canonical Ltd.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __GRIL_RESPONSE_H
-#define __GRIL_RESPONSE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _GRilResponse {
-	GSList *lines;
-	char *final_or_pdu;
-};
-
-typedef struct _GRilResponse GRilResponse;
-
-#define G_RIL_RESPONSE_LINE_LENGTH_MAX 2048
-
-const char *g_ril_final_response(GRilResponse *response);
-const char *g_ril_response_pdu(GRilResponse *response);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GRIL_RESPONSE_H */

=== modified file 'gril/grilunsol.c'
--- gril/grilunsol.c	2013-11-25 12:17:06 +0000
+++ gril/grilunsol.c	2014-01-08 20:51:43 +0000
@@ -243,6 +243,84 @@
 	return NULL;
 }
 
+int g_ril_unsol_parse_radio_state_changed(GRil *gril, const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int radio_state;
+
+	g_ril_init_parcel(message, &rilp);
+
+	radio_state = parcel_r_int32(&rilp);
+
+	if (rilp.malformed) {
+		ofono_error("%s: malformed parcel received", __func__);
+		radio_state = -1;
+	}
+
+	g_ril_append_print_buf(gril, "(state: %s)",
+				ril_radio_state_to_string(radio_state));
+
+	g_ril_print_unsol(gril, message);
+
+	return radio_state;
+}
+int g_ril_unsol_parse_signal_strength(GRil *gril, const struct ril_msg *message)
+{
+	struct parcel rilp;
+	int gw_signal, cdma_dbm, evdo_dbm, lte_signal;
+
+	g_ril_init_parcel(message, &rilp);
+
+	/* RIL_SignalStrength_v6 */
+	/* GW_SignalStrength */
+	gw_signal = parcel_r_int32(&rilp);
+	parcel_r_int32(&rilp); /* bitErrorRate */
+
+	/* CDMA_SignalStrength */
+	cdma_dbm = parcel_r_int32(&rilp);
+	parcel_r_int32(&rilp); /* ecio */
+
+	/* EVDO_SignalStrength */
+	evdo_dbm = parcel_r_int32(&rilp);
+	parcel_r_int32(&rilp); /* ecio */
+	parcel_r_int32(&rilp); /* signalNoiseRatio */
+
+	/* LTE_SignalStrength */
+	lte_signal = parcel_r_int32(&rilp);
+	parcel_r_int32(&rilp); /* rsrp */
+	parcel_r_int32(&rilp); /* rsrq */
+	parcel_r_int32(&rilp); /* rssnr */
+	parcel_r_int32(&rilp); /* cqi */
+
+	g_ril_append_print_buf(gril, "(gw: %d, cdma: %d, evdo: %d, lte: %d)",
+				gw_signal, cdma_dbm, evdo_dbm, lte_signal);
+
+	if (message->unsolicited)
+		g_ril_print_unsol(gril, message);
+	else
+		g_ril_print_response(gril, message);
+
+	/* Return the first valid one */
+	if ((gw_signal != 99) && (gw_signal != -1))
+		return (gw_signal * 100) / 31;
+	if ((lte_signal != 99) && (lte_signal != -1))
+		return (lte_signal * 100) / 31;
+
+	/* In case of dbm, return the value directly */
+	if (cdma_dbm != -1) {
+		if (cdma_dbm > 100)
+			cdma_dbm = 100;
+		return cdma_dbm;
+	}
+	if (evdo_dbm != -1) {
+		if (evdo_dbm > 100)
+			evdo_dbm = 100;
+		return evdo_dbm;
+	}
+
+	return -1;
+}
+
 void g_ril_unsol_free_supp_svc_notif(struct unsol_supp_svc_notif *unsol)
 {
 	g_free(unsol);
@@ -279,3 +357,58 @@
 
 	return unsol;
 }
+
+void g_ril_unsol_free_ussd(struct unsol_ussd *unsol)
+{
+	if (unsol != NULL) {
+		g_free(unsol->message);
+		g_free(unsol);
+	}
+}
+
+struct unsol_ussd *g_ril_unsol_parse_ussd(GRil *gril, struct ril_msg *message)
+{
+	struct parcel rilp;
+	struct unsol_ussd *ussd;
+	char *typestr = NULL;
+	int numstr;
+
+	ussd = g_try_malloc0(sizeof(*ussd));
+	if (ussd == NULL) {
+		ofono_error("%s out of memory", __func__);
+		goto error;
+	}
+
+	g_ril_init_parcel(message, &rilp);
+
+	numstr = parcel_r_int32(&rilp);
+	if (numstr < 1) {
+		ofono_error("%s malformed parcel", __func__);
+		goto error;
+	}
+
+	typestr = parcel_r_string(&rilp);
+	if (typestr == NULL || *typestr == '\0') {
+		ofono_error("%s wrong type", __func__);
+		goto error;
+	}
+
+	ussd->type = *typestr - '0';
+
+	g_free(typestr);
+
+	if (numstr > 1)
+		ussd->message = parcel_r_string(&rilp);
+
+	g_ril_append_print_buf(gril, "{%d,%s}", ussd->type, ussd->message);
+
+	g_ril_print_unsol(gril, message);
+
+	return ussd;
+
+error:
+	g_free(typestr);
+	g_free(ussd);
+
+	return NULL;
+}

=== modified file 'gril/grilunsol.h'
--- gril/grilunsol.h	2013-11-25 12:17:06 +0000
+++ gril/grilunsol.h	2014-01-08 20:51:43 +0000
@@ -61,6 +61,11 @@
 	struct ofono_phone_number number;
 };
 
+struct unsol_ussd {
+	int type;
+	char *message;
+};
+
 void g_ril_unsol_free_data_call_list(struct unsol_data_call_list *unsol);
 
 struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
@@ -74,11 +79,21 @@
 struct unsol_sms_data *g_ril_unsol_parse_new_sms(GRil *gril,
 						const struct ril_msg *message);
 
+int g_ril_unsol_parse_radio_state_changed(GRil *gril,
+					const struct ril_msg *message);
+
+int g_ril_unsol_parse_signal_strength(GRil *gril,
+					const struct ril_msg *message);
+
 void g_ril_unsol_free_supp_svc_notif(struct unsol_supp_svc_notif *unsol);
 
 struct unsol_supp_svc_notif *g_ril_unsol_parse_supp_svc_notif(GRil *gril,
 						struct ril_msg *message);
 
+void g_ril_unsol_free_ussd(struct unsol_ussd *unsol);
+
+struct unsol_ussd *g_ril_unsol_parse_ussd(GRil *gril, struct ril_msg *message);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'gril/grilutil.c'
--- gril/grilutil.c	2013-11-25 12:17:06 +0000
+++ gril/grilutil.c	2014-01-08 20:51:43 +0000
@@ -178,6 +178,20 @@
 	}
 }
 
+const char *ril_radio_state_to_string(int radio_state)
+{
+	switch (radio_state) {
+	case RADIO_STATE_OFF:
+		return "OFF";
+	case RADIO_STATE_UNAVAILABLE:
+		return "UNAVAILABLE";
+	case RADIO_STATE_ON:
+		return "ON";
+	default:
+		return "<INVALID>";
+	}
+}
+
 const char *ril_request_id_to_string(int req)
 {
 	switch (req) {

=== modified file 'gril/grilutil.h'
--- gril/grilutil.h	2013-09-09 19:21:32 +0000
+++ gril/grilutil.h	2014-01-08 20:51:43 +0000
@@ -38,6 +38,7 @@
 const char *ril_cardstate_to_string(int card_state);
 const char *ril_error_to_string(int error);
 const char *ril_pinstate_to_string(int pin_state);
+const char *ril_radio_state_to_string(int radio_state);
 const char *ril_request_id_to_string(int req);
 const char *ril_unsol_request_to_string(int request);
 

=== modified file 'gril/parcel.c'
--- gril/parcel.c	2013-11-22 08:12:06 +0000
+++ gril/parcel.c	2014-01-08 20:51:43 +0000
@@ -53,6 +53,7 @@
 	p->size = 0;
 	p->capacity = sizeof(int32_t);
 	p->offset = 0;
+	p->malformed = 0;
 }
 
 void parcel_grow(struct parcel *p, size_t size)
@@ -73,6 +74,16 @@
 int32_t parcel_r_int32(struct parcel *p)
 {
 	int32_t ret;
+
+	if (p->malformed)
+		return 0;
+
+	if (p->offset + sizeof(int32_t) > p->size) {
+		ofono_error("%s: parcel is too small", __func__);
+		p->malformed = 1;
+		return 0;
+	}
+
 	ret = *((int32_t *) (void *) (p->data + p->offset));
 	p->offset += sizeof(int32_t);
 	return ret;
@@ -82,9 +93,6 @@
 {
 	for (;;) {
 
-		DBG("parcel_w_int32(%d): offset = %d, cap = %d, size = %d\n",
-		    val, (int) p->offset, (int) p->capacity, (int) p->size);
-
 		if (p->offset + sizeof(int32_t) < p->capacity) {
 			/* There's enough space */
 			*((int32_t *) (void *) (p->data + p->offset)) = val;
@@ -122,8 +130,6 @@
 	for (;;) {
 		size_t padded = PAD_SIZE(len);
 
-		DBG("parcel_w_string(\"%s\"): len %d offset %d, cap %d, size %d",
-		    str, (int) len, (int) p->offset, (int) p->capacity, (int) p->size);
 		if (p->offset + len < p->capacity) {
 			/* There's enough space */
 			memcpy(p->data + p->offset, gs16, gs16_size);
@@ -146,9 +152,6 @@
 				};
 #endif
 
-				DBG("Writing %d bytes, padded to %d\n",
-				    (int) len, (int) padded);
-
 				*((uint32_t*) (void *)
 					(p->data + p->offset - 4)) &=
 							mask[padded - len];
@@ -169,17 +172,31 @@
 {
 	char *ret;
 	int len16 = parcel_r_int32(p);
+	int strbytes;
+
+	if (p->malformed)
+		return NULL;
 
 	/* This is how a null string is sent */
 	if (len16 < 0)
 		return NULL;
 
+	strbytes = PAD_SIZE((len16 + 1) * sizeof(char16_t));
+	if (p->offset + strbytes > p->size) {
+		ofono_error("%s: parcel is too small", __func__);
+		p->malformed = 1;
+		return NULL;
+	}
+
 	ret = g_utf16_to_utf8((gunichar2 *) (void *) (p->data + p->offset),
 				len16, NULL, NULL, NULL);
-	if (ret == NULL)
+	if (ret == NULL) {
+		ofono_error("%s: wrong UTF16 coding", __func__);
+		p->malformed = 1;
 		return NULL;
+	}
 
-	p->offset += PAD_SIZE((len16 + 1) * sizeof(char16_t));
+	p->offset += strbytes;
 
 	return ret;
 }

=== modified file 'gril/parcel.h'
--- gril/parcel.h	2013-11-05 16:26:21 +0000
+++ gril/parcel.h	2014-01-08 20:51:43 +0000
@@ -29,6 +29,7 @@
 	size_t offset;
 	size_t capacity;
 	size_t size;
+	int malformed;
 };
 
 void parcel_init(struct parcel *p);

=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2013-11-25 12:17:06 +0000
+++ gril/ril_constants.h	2014-01-08 20:51:43 +0000
@@ -57,6 +57,11 @@
 #define PREF_NET_TYPE_LTE_CMDA_EVDO_GSM_WCDMA 10
 #define PREF_NET_TYPE_LTE_ONLY 11
 
+/* Radio States */
+#define RADIO_STATE_OFF 0
+#define RADIO_STATE_UNAVAILABLE 1
+#define RADIO_STATE_ON 10
+
 /* Radio technologies */
 #define RADIO_TECH_UNKNOWN 0
 #define RADIO_TECH_GPRS 1

=== modified file 'plugins/ril.c'
--- plugins/ril.c	2013-11-06 04:08:00 +0000
+++ plugins/ril.c	2014-01-08 20:51:43 +0000
@@ -30,10 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <gril.h>
-#include <grilreply.h>
-#include <parcel.h>
-#include <grilrequest.h>
 
 #define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/plugin.h>
@@ -58,6 +54,13 @@
 #include <ofono/audio-settings.h>
 #include <ofono/types.h>
 
+#include "ofono.h"
+
+#include <gril.h>
+#include <grilreply.h>
+#include <grilrequest.h>
+#include <grilunsol.h>
+
 #include "drivers/rilmodem/rilmodem.h"
 
 #define MAX_SIM_STATUS_RETRIES 15
@@ -67,6 +70,10 @@
 	int sim_status_retries;
 	ofono_bool_t connected;
 	ofono_bool_t have_sim;
+	ofono_bool_t ofono_online;
+	int radio_state;
+	struct ofono_sim *sim;
+	struct ofono_voicecall *voice;
 };
 
 static void send_get_sim_status(struct ofono_modem *modem);
@@ -87,6 +94,55 @@
 	return FALSE;
 }
 
+static void ril_radio_state_changed(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct ril_data *ril = ofono_modem_get_data(modem);
+	int radio_state = g_ril_unsol_parse_radio_state_changed(ril->modem,
+								message);
+
+	if (radio_state != ril->radio_state) {
+
+		ofono_info("%s: state: %s ril->ofono_online: %d",
+				__func__,
+				ril_radio_state_to_string(radio_state),
+				ril->ofono_online);
+
+		ril->radio_state = radio_state;
+
+		switch (radio_state) {
+		case RADIO_STATE_ON:
+
+			if (ril->voice == NULL)
+				ril->voice =
+					ofono_voicecall_create(modem,
+								0,
+								RILMODEM,
+								ril->modem);
+
+			send_get_sim_status(modem);
+			break;
+
+		case RADIO_STATE_UNAVAILABLE:
+		case RADIO_STATE_OFF:
+
+			/*
+			 * If radio powers off asychronously, then
+			 * assert, and let upstart re-start the stack.
+			 */
+			if (ril->ofono_online) {
+				ofono_error("%s: radio self-powered off!",
+						__func__);
+				g_assert(FALSE);
+			}
+			break;
+		default:
+			/* Malformed parcel; no radio state == broken rild */
+			g_assert(FALSE);
+		}
+	}
+}
+
 static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -95,66 +151,71 @@
 
 	DBG("");
 
-	/*
-	 * ril.h claims this should NEVER fail!
-	 * However this isn't quite true.  So,
-	 * on anything other than SUCCESS, we
-	 * log an error, and schedule another
-	 * GET_SIM_STATUS request.
-	 */
-
 	if (message->error != RIL_E_SUCCESS) {
 		ril->sim_status_retries++;
 
-		ofono_error("GET_SIM_STATUS reques failed: %d; retries: %d",
-				message->error, ril->sim_status_retries);
+		ofono_error("GET_SIM_STATUS request failed: %s; retries: %d",
+				ril_error_to_string(message->error),
+				ril->sim_status_retries);
 
 		if (ril->sim_status_retries < MAX_SIM_STATUS_RETRIES)
 			g_timeout_add_seconds(2, sim_status_retry, modem);
 		else
 			ofono_error("Max retries for GET_SIM_STATUS exceeded!");
 	} else {
+
 		if ((status = g_ril_reply_parse_sim_status(ril->modem, message))
 				!= NULL) {
+
 			if (status->card_state == RIL_CARDSTATE_PRESENT) {
-				DBG("have_sim = TRUE; powering on modem; num_apps: %d",
+				DBG("Card PRESENT; num_apps: %d",
 					status->num_apps);
-				ril->have_sim = TRUE;
+
+				if (!ril->have_sim) {
+					DBG("notify SIM inserted");
+					ril->have_sim = TRUE;
+
+					ofono_sim_inserted_notify(ril->sim, TRUE);
+				}
+
 			} else {
-				ofono_warn("No SIM card present.");
+				ofono_warn("Card NOT_PRESENT.");
+
+				if (ril->have_sim) {
+					DBG("notify SIM removed");
+					ril->have_sim = FALSE;
+
+					ofono_sim_inserted_notify(ril->sim, FALSE);
+				}
 			}
 			g_ril_reply_free_sim_status(status);
 		}
-		DBG("calling set_powered(TRUE)");
-		ofono_modem_set_powered(modem, TRUE);
 	}
-	/* TODO: handle emergency calls if SIM !present or locked */
 }
 
 static void send_get_sim_status(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
-	int request = RIL_REQUEST_GET_SIM_STATUS;
-	gint ret;
-
-	ret = g_ril_send(ril->modem, request,
-				NULL, 0, sim_status_cb, modem, NULL);
-
-	if (ret > 0)
-		g_ril_print_request_no_args(ril->modem, ret, request);
+
+	DBG("");
+
+	g_ril_send(ril->modem, RIL_REQUEST_GET_SIM_STATUS, NULL,
+			sim_status_cb, modem, NULL);
 }
 
 static int ril_probe(struct ofono_modem *modem)
 {
-	struct ril_data *ril = NULL;
-
-	ril = g_try_new0(struct ril_data, 1);
+	struct ril_data *ril = g_try_new0(struct ril_data, 1);
 	if (ril == NULL) {
 		errno = ENOMEM;
 		goto error;
 	}
 
-	ril->modem = NULL;
+	DBG("");
+
+	ril->have_sim = FALSE;
+	ril->ofono_online = FALSE;
+	ril->radio_state = RADIO_STATE_OFF;
 
 	ofono_modem_set_data(modem, ril);
 
@@ -184,13 +245,11 @@
 static void ril_pre_sim(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
-	struct ofono_sim *sim;
-
-	sim = ofono_sim_create(modem, 0, RILMODEM, ril->modem);
-	ofono_voicecall_create(modem, 0, RILMODEM, ril->modem);
-
-	if (sim && ril->have_sim)
-		ofono_sim_inserted_notify(sim, TRUE);
+
+	DBG("");
+
+	ril->sim = ofono_sim_create(modem, 0, RILMODEM, ril->modem);
+	g_assert(ril->sim != NULL);
 }
 
 static void ril_post_sim(struct ofono_modem *modem)
@@ -221,53 +280,50 @@
 
 	ofono_call_volume_create(modem, 0, RILMODEM, ril->modem);
 	ofono_netreg_create(modem, 0, RILMODEM, ril->modem);
+	ofono_ussd_create(modem, 0, RILMODEM, ril->modem);
+	ofono_call_settings_create(modem, 0, RILMODEM, ril->modem);
 }
 
 static void ril_set_online_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
+	struct ril_data *ril = cbd->user;
 	ofono_modem_online_cb_t cb = cbd->cb;
 
-	if (message->error == RIL_E_SUCCESS)
+	if (message->error == RIL_E_SUCCESS) {
+		DBG("%s: set_online OK: ril->ofono_online: %d", __func__,
+			ril->ofono_online);
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
-	else
+	} else {
+		ofono_error("%s: set_online: %d failed", __func__,
+				ril->ofono_online);
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
 }
 
 static void ril_send_power(struct ril_data *ril, ofono_bool_t online,
 				GRilResponseFunc func,
-				ofono_modem_online_cb_t callback,
-				void *data)
+				gpointer user_data)
 {
-	struct cb_data *cbd;
-	GDestroyNotify notify;
-	int request = RIL_REQUEST_RADIO_POWER;
+	struct cb_data *cbd = user_data;
+	ofono_modem_online_cb_t cb;
+	GDestroyNotify notify = NULL;
 	struct parcel rilp;
-	int ret;
 
-	if (callback) {
-		cbd = cb_data_new(callback, data, NULL);
+	if (cbd != NULL) {
 		notify = g_free;
-		g_assert(func);
-	} else {
-		cbd = NULL;
-		notify = NULL;
+		cb = cbd->cb;
 	}
 
 	DBG("(online = 1, offline = 0)): %i", online);
 
 	g_ril_request_power(ril->modem, (const gboolean) online, &rilp);
 
-	ret = g_ril_send(ril->modem, request, rilp.data,
-				rilp.size, func, cbd, notify);
-
-	parcel_free(&rilp);
-
-	if (ret <= 0) {
+	if (g_ril_send(ril->modem, RIL_REQUEST_RADIO_POWER, &rilp,
+			func, cbd, notify) == 0 && cbd != NULL) {
+
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
 		g_free(cbd);
-		CALLBACK_WITH_FAILURE(callback, data);
-	} else {
-		g_ril_print_request(ril->modem, ret, request);
 	}
 }
 
@@ -275,7 +331,13 @@
 				ofono_modem_online_cb_t callback, void *data)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
-	ril_send_power(ril, online, ril_set_online_cb, callback, data);
+	struct cb_data *cbd = cb_data_new(callback, data, ril);
+
+	ril->ofono_online = online;
+
+	DBG("setting ril->ofono_online to: %d", online);
+
+	ril_send_power(ril, online, ril_set_online_cb, cbd);
 }
 
 static void ril_connected(struct ril_msg *message, gpointer user_data)
@@ -288,14 +350,16 @@
 	/* TODO: need a disconnect function to restart things! */
 	ril->connected = TRUE;
 
-	send_get_sim_status(modem);
+	DBG("calling set_powered(TRUE)");
+
+	ofono_modem_set_powered(modem, TRUE);
 }
 
 static int ril_enable(struct ofono_modem *modem)
 {
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-	ril->have_sim = FALSE;
+	DBG("");
 
 	ril->modem = g_ril_new();
 
@@ -321,6 +385,9 @@
 	g_ril_register(ril->modem, RIL_UNSOL_RIL_CONNECTED,
 			ril_connected, modem);
 
+	g_ril_register(ril->modem, RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED,
+			ril_radio_state_changed, modem);
+
 	ofono_devinfo_create(modem, 0, RILMODEM, ril->modem);
 
 	return -EINPROGRESS;
@@ -332,7 +399,7 @@
 
 	DBG("%p", modem);
 
-	ril_send_power(ril, FALSE, NULL, NULL, NULL);
+	ril_send_power(ril, FALSE, NULL, NULL);
 
 	return 0;
 }

=== modified file 'src/sim-mnclength.c'
--- src/sim-mnclength.c	2013-11-11 10:37:01 +0000
+++ src/sim-mnclength.c	2014-01-08 20:51:43 +0000
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
 #include <string.h>
 #include <glib.h>
 #include "ofono.h"
@@ -34,7 +35,7 @@
 int __ofono_sim_mnclength_get_mnclength(const char *imsi)
 {
 	GSList *d;
-	int mnclen;
+	int mnclen = -ENOTSUP;
 
 	for (d = g_drivers; d != NULL; d = d->next) {
 		const struct ofono_sim_mnclength_driver *driver = d->data;
@@ -50,7 +51,7 @@
 		return mnclen;
 	}
 
-	return 0;
+	return mnclen;
 }
 
 int ofono_sim_mnclength_driver_register(

=== modified file 'unit/test-grilreply.c'
--- unit/test-grilreply.c	2013-12-03 23:56:44 +0000
+++ unit/test-grilreply.c	2014-01-08 20:51:43 +0000
@@ -1344,6 +1344,63 @@
 	.error = 0,
 };
 
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_QUERY_CALL_WAITING reply with the following parameters:
+ *
+ * {1,0x30}
+ */
+static const guchar reply_query_call_waiting_valid_parcel1[] = {
+	0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_query_call_waiting_valid_1 = {
+	.buf = (gchar *) reply_query_call_waiting_valid_parcel1,
+	.buf_len = sizeof(reply_query_call_waiting_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_QUERY_CALL_WAITING,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_QUERY_CLIP reply with the following parameters:
+ *
+ * {1}
+ */
+static const guchar reply_query_clip_valid_parcel1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_query_clip_valid_1 = {
+	.buf = (gchar *) reply_query_clip_valid_parcel1,
+	.buf_len = sizeof(reply_query_clip_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_QUERY_CLIP,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data contains the event data of a valid
+ * RIL_REQUEST_GET_CLIR reply with the following parameters:
+ *
+ * {2,4}
+ */
+static const guchar reply_get_clir_valid_parcel1[] = {
+	0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_get_clir_valid_1 = {
+	.buf = (gchar *) reply_get_clir_valid_parcel1,
+	.buf_len = sizeof(reply_get_clir_valid_parcel1),
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_GET_CLIR,
+	.serial_no = 0,
+	.error = 0,
+};
+
 static void test_reply_data_call_invalid(gconstpointer data)
 {
 	struct ofono_error error;
@@ -1516,6 +1573,35 @@
 	g_free(imei);
 }
 
+static void test_reply_query_call_waiting_valid(gconstpointer data)
+{
+	int cls;
+
+	cls = g_ril_reply_parse_query_call_waiting(NULL, data);
+
+	g_assert(cls != -1);
+}
+
+static void test_reply_query_clip_valid(gconstpointer data)
+{
+	int clip_status;
+
+	clip_status = g_ril_reply_parse_query_clip(NULL, data);
+
+	g_assert(clip_status != -1);
+}
+
+static void test_reply_get_clir_valid(gconstpointer data)
+{
+	struct reply_clir *reply;
+
+	reply = g_ril_reply_parse_get_clir(NULL, data);
+
+	g_assert(reply != NULL);
+
+	g_ril_reply_free_get_clir(reply);
+}
+
 int main(int argc, char **argv)
 {
 	g_test_init(&argc, &argv, NULL);
@@ -1748,6 +1834,21 @@
 				&reply_get_imei_valid_1,
 				test_reply_get_imei_valid);
 
+	g_test_add_data_func("/testgrilreply/call-settings: "
+				"valid QUERY_CALL_WAITING Test 1",
+				&reply_query_call_waiting_valid_1,
+				test_reply_query_call_waiting_valid);
+
+	g_test_add_data_func("/testgrilreply/call-settings: "
+				"valid QUERY_CLIP Test 1",
+				&reply_query_clip_valid_1,
+				test_reply_query_clip_valid);
+
+	g_test_add_data_func("/testgrilreply/call-settings: "
+				"valid GET_CLIR Test 1",
+				&reply_get_clir_valid_1,
+				test_reply_get_clir_valid);
+
 #endif
 
 	return g_test_run();

=== modified file 'unit/test-grilrequest.c'
--- unit/test-grilrequest.c	2013-11-28 13:40:27 +0000
+++ unit/test-grilrequest.c	2014-01-08 20:51:43 +0000
@@ -515,6 +515,68 @@
 	.parcel_size = sizeof(req_set_mute_valid_parcel2),
 };
 
+/* send_ussd tests */
+
+static const guchar req_send_ussd_parcel_valid_1[] = {
+	0x05, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x31, 0x00, 0x31, 0x00, 0x38, 0x00,
+	0x23, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_data send_ussd_valid_test_1 = {
+	.request = "*118#",
+	.parcel_data = req_send_ussd_parcel_valid_1,
+	.parcel_size = sizeof(req_send_ussd_parcel_valid_1),
+};
+
+/* set_call_waiting tests */
+
+struct request_test_set_call_waiting {
+	int enabled;
+	int serviceclass;
+	const char *parcel_data;
+	size_t parcel_size;
+};
+
+static const char req_set_call_waiting_parcel_valid_1[] = {
+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_set_call_waiting
+		set_call_waiting_valid_test_1 = {
+	.enabled = 0,
+	.serviceclass = 0x01,
+	.parcel_data = req_set_call_waiting_parcel_valid_1,
+	.parcel_size = sizeof(req_set_call_waiting_parcel_valid_1),
+};
+
+/* query_call_waiting tests */
+
+const int query_call_waiting_mode_0 = 0;
+
+static const guchar req_query_call_waiting_parcel_valid_1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_data query_call_waiting_valid_test_1 = {
+	.request = &query_call_waiting_mode_0,
+	.parcel_data = req_query_call_waiting_parcel_valid_1,
+	.parcel_size = sizeof(req_query_call_waiting_parcel_valid_1),
+};
+
+/* set_clir tests */
+
+const int set_clir_mode_0 = 0;
+
+static const guchar req_set_clir_parcel_valid_1[] = {
+	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct request_test_data set_clir_valid_test_1 = {
+	.request = &set_clir_mode_0,
+	.parcel_data = req_set_clir_parcel_valid_1,
+	.parcel_size = sizeof(req_set_clir_parcel_valid_1),
+};
+
 /*
  * The following hexadecimal data represents a serialized Binder parcel
  * instance containing a valid RIL_REQUEST_RADIO_POWER 'OFF' message.
@@ -887,6 +949,61 @@
 	parcel_free(&rilp);
 }
 
+static void test_request_send_ussd(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	struct parcel rilp;
+
+	g_ril_request_send_ussd(NULL, test_data->request, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+				test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
+static void test_request_set_call_waiting(gconstpointer data)
+{
+	const struct request_test_set_call_waiting *test_data = data;
+	struct parcel rilp;
+
+	g_ril_request_set_call_waiting(NULL, test_data->enabled,
+					test_data->serviceclass, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+				test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
+static void test_request_query_call_waiting(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	int mode = *(int *) test_data->request;
+	struct parcel rilp;
+
+	g_ril_request_query_call_waiting(NULL, mode, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+				test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
+static void test_request_set_clir(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	int mode = *(int *) test_data->request;
+	struct parcel rilp;
+
+	g_ril_request_set_clir(NULL, mode, &rilp);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data,
+				test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
 int main(int argc, char **argv)
 {
 	g_test_init(&argc, &argv, NULL);
@@ -1074,6 +1191,26 @@
 				&set_mute_valid_test_2,
 				test_request_set_mute_valid);
 
+	g_test_add_data_func("/testgrilrequest/ussd: "
+				"valid SEND_USSD Test 1",
+				&send_ussd_valid_test_1,
+				test_request_send_ussd);
+
+	g_test_add_data_func("/testgrilrequest/call-settings: "
+				"valid SET_CALL_WAITING Test 1",
+				&set_call_waiting_valid_test_1,
+				test_request_set_call_waiting);
+
+	g_test_add_data_func("/testgrilrequest/call-settings: "
+				"valid QUERY_CALL_WAITING Test 1",
+				&query_call_waiting_valid_test_1,
+				test_request_query_call_waiting);
+
+	g_test_add_data_func("/testgrilrequest/call-settings: "
+				"valid SET_CLIR Test 1",
+				&set_clir_valid_test_1,
+				test_request_set_clir);
+
 #endif
 	return g_test_run();
 }

=== modified file 'unit/test-grilunsol.c'
--- unit/test-grilunsol.c	2013-11-25 13:54:04 +0000
+++ unit/test-grilunsol.c	2014-01-08 20:51:43 +0000
@@ -42,6 +42,12 @@
  * once more tests are added.
  */
 
+typedef struct signal_strength_test signal_strength_test;
+struct signal_strength_test {
+	int strength;
+	const struct ril_msg msg;
+};
+
 static const struct ril_msg unsol_data_call_list_changed_invalid_1 = {
 	.buf = "",
 	.buf_len = 0,
@@ -175,6 +181,63 @@
 	.error = 0,
 };
 
+/*
+ * The following hexadecimal data represents a serialized Binder parcel
+ * instance containing a valid RIL_UNSOL_SIGNAL_STRENGTH message
+ * with the following parameters:
+ *
+ * (gw: 14, cdma: -1, evdo: -1, lte: 99)
+ *
+ * Note, the return value for gw sigmal is: (gw * 100) / 31, which
+ * in this case equals 45.
+ */
+static const guchar unsol_signal_strength_parcel1[] = {
+	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x63, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x7f,
+	0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f
+};
+
+static const signal_strength_test unsol_signal_strength_valid_1 = {
+	.strength = 45,
+	.msg = {
+		.buf = (gchar *) &unsol_signal_strength_parcel1,
+		.buf_len = sizeof(unsol_signal_strength_parcel1),
+		.unsolicited = TRUE,
+		.req = RIL_UNSOL_SIGNAL_STRENGTH,
+		.serial_no = 0,
+		.error = 0,
+	}
+};
+
+/*
+ * The following hexadecimal data represents a serialized Binder parcel
+ * instance containing a valid RIL_UNSOL_ON_USSD message with the following
+ * parameters:
+ *
+ * {0,Spain 12:56 09/12/13  Canary 11:56 09/12/13  }
+ */
+static const guchar unsol_on_ussd_parcel1[] = {
+	0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00,
+	0x2d, 0x00, 0x00, 0x00, 0x53, 0x00, 0x70, 0x00, 0x61, 0x00, 0x69, 0x00,
+	0x6e, 0x00, 0x20, 0x00, 0x31, 0x00, 0x32, 0x00, 0x3a, 0x00, 0x35, 0x00,
+	0x36, 0x00, 0x20, 0x00, 0x30, 0x00, 0x39, 0x00, 0x2f, 0x00, 0x31, 0x00,
+	0x32, 0x00, 0x2f, 0x00, 0x31, 0x00, 0x33, 0x00, 0x20, 0x00, 0x20, 0x00,
+	0x43, 0x00, 0x61, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x72, 0x00, 0x79, 0x00,
+	0x20, 0x00, 0x31, 0x00, 0x31, 0x00, 0x3a, 0x00, 0x35, 0x00, 0x36, 0x00,
+	0x20, 0x00, 0x30, 0x00, 0x39, 0x00, 0x2f, 0x00, 0x31, 0x00, 0x32, 0x00,
+	0x2f, 0x00, 0x31, 0x00, 0x33, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg unsol_on_ussd_valid_1 = {
+	.buf = (gchar *) &unsol_on_ussd_parcel1,
+	.buf_len = sizeof(unsol_on_ussd_parcel1),
+	.unsolicited = TRUE,
+	.req = RIL_UNSOL_ON_USSD,
+	.serial_no = 0,
+	.error = 0,
+};
+
 static void test_unsol_data_call_list_changed_invalid(gconstpointer data)
 {
 	struct ofono_error error;
@@ -201,6 +264,13 @@
 			error.error == 0);
 }
 
+static void test_signal_strength_valid(gconstpointer data)
+{
+	const signal_strength_test *test = data;
+	int strength = g_ril_unsol_parse_signal_strength(NULL, &test->msg);
+	g_assert(strength == test->strength);
+}
+
 static void test_unsol_response_new_sms_valid(gconstpointer data)
 {
 	struct unsol_sms_data *sms_data;
@@ -224,6 +294,16 @@
 	g_ril_unsol_free_supp_svc_notif(unsol);
 }
 
+static void test_unsol_on_ussd_valid(gconstpointer data)
+{
+	struct unsol_ussd *unsol;
+
+	unsol = g_ril_unsol_parse_ussd(NULL, (struct ril_msg *) data);
+
+	g_assert(unsol != NULL);
+	g_ril_unsol_free_ussd(unsol);
+}
+
 int main(int argc, char **argv)
 {
 	g_test_init(&argc, &argv, NULL);
@@ -260,6 +340,16 @@
 				&unsol_supp_svc_notif_valid_1,
 				test_unsol_supp_svc_notif_valid);
 
+	g_test_add_data_func("/testgrilunsol/voicecall: "
+				"valid SIGNAL_STRENGTH Test 1",
+				&unsol_signal_strength_valid_1,
+				test_signal_strength_valid);
+
+	g_test_add_data_func("/testgrilunsol/ussd: "
+				"valid ON_USSD Test 1",
+				&unsol_on_ussd_valid_1,
+				test_unsol_on_ussd_valid);
+
 #endif
 	return g_test_run();
 }

=== added file 'unit/test-mnclength.c'
--- unit/test-mnclength.c	1970-01-01 00:00:00 +0000
+++ unit/test-mnclength.c	2014-01-08 20:51:43 +0000
@@ -0,0 +1,166 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2013 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+#include <glib/gprintf.h>
+
+#include <ofono.h>
+#include <plugin.h>
+#include <sim-mnclength.h>
+
+extern struct ofono_plugin_desc __ofono_builtin_mnclength;
+
+struct get_mnclength_test_data {
+	const char *imsi;
+	int mnc_length;		/* Expected length */
+};
+
+/* test data */
+
+static const struct get_mnclength_test_data get_mnclength_0 = {
+	.imsi = "214060240111837",
+	.mnc_length = -ENOTSUP
+};
+
+static const struct get_mnclength_test_data get_mnclength_1 = {
+	.imsi = "214060240111837",
+	.mnc_length = 2
+};
+
+static const struct get_mnclength_test_data get_mnclength_2 = {
+	.imsi = "313001740111837",
+	.mnc_length = 3
+};
+
+static const struct get_mnclength_test_data get_mnclength_3 = {
+	.imsi = "352060240111837",
+	.mnc_length = 3
+};
+
+static const struct get_mnclength_test_data get_mnclength_4 = {
+	.imsi = "602060240111837",
+	.mnc_length = 2
+};
+
+static const struct get_mnclength_test_data get_mnclength_5 = {
+	.imsi = "4051000240111837",
+	.mnc_length = 2
+};
+
+static const struct get_mnclength_test_data get_mnclength_6 = {
+	.imsi = "405801240111837",
+	.mnc_length = 3
+};
+
+static const struct get_mnclength_test_data get_mnclength_7 = {
+	.imsi = "714020240111837",
+	.mnc_length = 3
+};
+
+static const struct get_mnclength_test_data get_mnclength_8 = {
+	.imsi = "000000000000000",
+	.mnc_length = -ENOENT
+};
+
+static const struct get_mnclength_test_data get_mnclength_9 = {
+	.imsi = "0xx000000000000",
+	.mnc_length = -EINVAL
+};
+
+static const struct get_mnclength_test_data get_mnclength_10 = {
+	.imsi = "111111000000000",
+	.mnc_length = -ENOENT
+};
+
+static void test_get_mnclength(gconstpointer data)
+{
+	int mnc_length;
+	const struct get_mnclength_test_data *testdata = data;
+
+	mnc_length = __ofono_sim_mnclength_get_mnclength(testdata->imsi);
+	g_assert(mnc_length == testdata->mnc_length);
+}
+
+static void test_mnclength_register(void)
+{
+	g_assert(__ofono_builtin_mnclength.init() == 0);
+}
+
+int main(int argc, char **argv)
+{
+	int res;
+
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_add_data_func("/testmnclength: Test 0",
+				&get_mnclength_0,
+				test_get_mnclength);
+
+	g_test_add_func("/testmnclength: Test register",
+			test_mnclength_register);
+
+	g_test_add_data_func("/testmnclength: Test 1",
+				&get_mnclength_1,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 2",
+				&get_mnclength_2,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 3",
+				&get_mnclength_3,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 4",
+				&get_mnclength_4,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 5",
+				&get_mnclength_5,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 6",
+				&get_mnclength_6,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 7",
+				&get_mnclength_7,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 8",
+				&get_mnclength_8,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 9",
+				&get_mnclength_9,
+				test_get_mnclength);
+	g_test_add_data_func("/testmnclength: Test 10",
+				&get_mnclength_10,
+				test_get_mnclength);
+
+	res = g_test_run();
+
+	__ofono_builtin_mnclength.exit();
+
+	return res;
+}