Merge lp:~awe/phablet-extras/ofono-unittest-gprs-context into lp:phablet-extras/ofono

[Tony Espy]

[gril/rilmodem] Re-factor gprs-context code to facilitate unit testing.

This branch re-factors rilmodem's gprs-context module such that all RIL message code has been moved into the lower gril base layer. This was done to allow unit testing of the RIL parcel code used by gprs-context.

Once this code has been merged, the plan is to re-factor the rest of the rilmodem code using this approach.

Tested on an un-flipped raring image running on maguro.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/51/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/26/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[Tony Espy (awe)]

Build failure is due to the fact that I didn't add the unit test source file... I'm working on restoring it, and should have this branch updated by end-of-day.

[lp:~awe/phablet-extras/ofono-unittest-gprs-context]

54. By Tony Espy on 2013-07-10

[gril] Re-work of gprsmessages based on unit testing.

55. By Tony Espy on 2013-07-10

[gril] Initial gprs-context unit tests for grilmessages.

56. By Tony Espy on 2013-07-10

[gril] Make changes for unit testing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/56/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

I would split:
823 +static void test_invalid_setup_data_calls(void)
834 + /* Test invalid radio tech values */
847 + /* Test invalid data profile */
855 + /* Invalid APNs */
...
and so on for the other test functions into individual test cases.

Also consider the posibility of a test fixture for each of these test functions(at your discretion)
https://developer.gnome.org/glib/2.28/glib-Testing.html#g-test-add

Is it a good idea to make a free_reply (or with similar name) that would take care of freeing the complete struct and then just call that?
238 + g_strfreev(reply.dns_addresses);
239 + g_strfreev(reply.ip_addrs);
240 + g_strfreev(reply.gateways);
249 + g_free(reply.ifname);

review: Needs Fixing

[Tony Espy (awe)]

@Sergio

Thanks for the comments, and I agree that splitting the tests out probably makes sense.

Also per our discussion yesterday, I will split grilmessages.c into three separate files: grilrequests.c, grilreplies.c, and grilevents.c.

Finally, I also mentioned that I only added unit tests for the SETUP_DATA_CALL request. I will go ahead and add unit tests for the corresponding reply as well.

I should be able to wrap up all these changes today.

[Sergio Schvezov (sergiusens)]

On Fri, Jul 12, 2013 at 12:15 PM, Tony Espy <email address hidden> wrote:
> @Sergio
>
> Thanks for the comments, and I agree that splitting the tests out probably makes sense.
>
> Also per our discussion yesterday, I will split grilmessages.c into three separate files: grilrequests.c, grilreplies.c, and grilevents.c.
>
> Finally, I also mentioned that I only added unit tests for the SETUP_DATA_CALL request. I will go ahead and add unit tests for the corresponding reply as well.
>
> I should be able to wrap up all these changes today.

Sounds good to me :-)

[lp:~awe/phablet-extras/ofono-unittest-gprs-context]

57. By Tony Espy on 2013-07-17

[gril/rilmodem] Split grilmessages into grilrequest, grilreply, and grilunsol.

58. By Tony Espy on 2013-07-17

[rilmodem] Back out AudioSystem and Makefile.am changes made by mistake.

59. By Tony Espy on 2013-07-19

[gril] Re-factored low-level message support into type-specific modules.

60. By Tony Espy on 2013-07-19

[gril] Fixed the tracing logic, and cleaned up some minor warnings.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:60
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[lp:~awe/phablet-extras/ofono-unittest-gprs-context]

61. By Tony Espy on 2013-07-19

Re-merge from trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:61
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/34/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/59/rebuild

review: Needs Fixing (continuous-integration)

[Tony Espy (awe)]

Two last things need to be fixed.

First, the CI build fails due to a unit test failure. This is the test I mentioned earlier that was also failing in pbuild.

ERROR:unit/test-grilrequest.c:200:test_deactivate_data_call_valid: assertion failed: (!memcmp(rilp.data, test_data->parcel_data, test_data->parcel_size)\

Test test tries to compare wire-format parcel data ( stored in rilp.data ) to a static guchar of bytes that represent what the parcel wire format should look like.

The second issue is how the gprs-context code handles setup_data_call failures. I'm not sure if a failure callback triggers a disconnect from the core ofono code or not. If it does, then the code should be fine as is. If it doesn't, then this could potentially leave an active data call within RIL, and thus we should explicitly disconnect in this case.

[Tony Espy (awe)]

OK, so it appears the failure callback doesn't trigger a disconnect, so I'll modify the code to do that if the SETUP_DATA_CALL reply triggers a message validation error.

[Tony Espy (awe)]

I'll plan on landing the final bits over the weekend...

[lp:~awe/phablet-extras/ofono-unittest-gprs-context]

62. By Tony Espy on 2013-07-20

[gril/grilmodem] Ensure that data call is deactivated in invalid reply scenarios.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/60/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[lp:~awe/phablet-extras/ofono-unittest-gprs-context]

63. By Tony Espy on 2013-07-22

[gril] Fix a bug in parcel_w_string() that can cause an invalid string terminator to be generated.

[Tony Espy (awe)]

OK, both problems are now fixed.

Data calls are properly disconnected if a reply is received from RIL that is deemed invalid by the gril code.

The unit test failure was due to a subtle bug in parcel_w_string() which could result in invalid string terminator bytes to be included due to an incorrect offset used to write the terminating utf16 0x00000.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/36/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/61/rebuild

review: Approve (continuous-integration)

[lp:~awe/phablet-extras/ofono-unittest-gprs-context]

64. By Tony Espy on 2013-07-26

[rilmodem] Implement gprs_context_detach_shutdown().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/37/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/62/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

127 - if (message->req != RIL_UNSOL_DATA_CALL_LIST_CHANGED) {
128 - ofono_error("ril_gprs_update_calls: invalid message received %d",
129 - message->req);
130 - return;
131 - }

Why did you remove the above? g_ril_unsol_parse_data_call_list is also not checking if the message is indeed UNSOL_DATA_CALL_LIST_CHANGED.

1017 + g_free(reply);
1611 + g_free(call);
1621 + g_free(unsol);

Not an issue, but as you're checking for call and unsol just before free, you could include the g_free call as part of the if scope.

901 +#define OFONO_EINVAL(error) do { \
902 + error->type = OFONO_ERROR_TYPE_FAILURE; \
903 + error->error = -EINVAL; \
904 +} while (0)
905 +
906 +#define OFONO_NO_ERROR(error) do { \
907 + error->type = OFONO_ERROR_TYPE_NO_ERROR; \
908 + error->error = 0; \
909 +} while (0)
910 +

These would be better if defined somewhere in a common ofono code, not just for ril.

2018 +static const struct ril_msg reply_data_call_invalid_2 = {
2019 + .buf = (gchar *) &reply_data_call_invalid_parcel1,

2052 +static const struct ril_msg reply_data_call_invalid_3 = {
2053 + .buf = (gchar *) &reply_data_call_invalid_parcel2,

2084 +static const struct ril_msg reply_data_call_invalid_4 = {
2085 + .buf = (gchar *) &reply_data_call_invalid_parcel3,

2115 +static const struct ril_msg reply_data_call_invalid_5 = {
2116 + .buf = (gchar *) &reply_data_call_invalid_parcel4,

2147 +static const struct ril_msg reply_data_call_invalid_6 = {
2148 + .buf = (gchar *) &reply_data_call_invalid_parcel5,

2176 +static const struct ril_msg reply_data_call_invalid_7 = {
2177 + .buf = (gchar *) &reply_data_call_invalid_parcel6,

Would you mind changing the test id to match the same number used by both structs? Otherwise it gets quite confusing when reading the code, as data_call_invalid_2 is part of invalid_parcel_1, instead of invalid_parcel_2 (which is a natural reading by our brain).

Other than those minor comments, code looks good (although it could technically be separated in more MRs, as we discussed).

Will now test in both mako and maguro.

review: Needs Fixing

[Ricardo Salveti (rsalveti)]

Tested with both mako and maguro and it seems to be all good :-)

Just minor issue I got with my maguro is that the modem can't attach anymore it seems, but don't think it's related with this MR (might be that intermittent issue we had this week).

Will test a bit more with maguro...

Would be nice if you could double check with it as well.

[Ricardo Salveti (rsalveti)]

Yeah, can't get my mako to attach anymore, with/without NM, and even after a clean install.

We might be having another issue somewhere in this code, which is not related with this MR.

[Ricardo Salveti (rsalveti)]

Argh, *maguro*.

[Ricardo Salveti (rsalveti)]

Ok, the issue with maguro is that it cannot attach at first, but it works after restarting ofono =\

First run, not attached:
http://paste.ubuntu.com/5917341/

Second run, attached:
http://paste.ubuntu.com/5917346/

Wonder if this is a side effect of that roaming bug you fixed (will follow up this in a bug).

[Tony Espy (awe)]

Question, were you testing with just this MR, or the combined MRs? As we discussed, the attach fix was split between the two MRs due to the heavy re-factoring of gprs-context.c in this MR.

I will look at your comments above, which all seem reasonable and try and update the MR later today.

I will also do some more testing to see if I can reproduce any of the issues you ran into while testing.

Note, my fix assumes that NetworkManager always sets the ConnectionManager's 'Powered' on start-up. Perhaps there's a race condition and this isn't always happening?

[Ricardo Salveti (rsalveti)]

Just with this MR, and without NetworkManager involved. Was just tracking the ofono state after it was properly initialized.

[Tony Espy (awe)]

OK, I'll plan on giving both a shake-down tomorrow after I clean up the couple of things based on your previous comment.

This code really shouldn't have effected whether GPRS attaches or not, as it only touches the gprs-context driver.

[lp:~awe/phablet-extras/ofono-unittest-gprs-context]

65. By Tony Espy on 2013-07-28

[gril] Moved ofono error helper #defines into <ofono/types.h>

66. By Tony Espy on 2013-07-28

[gril] Re-numbered parcel unit test data variables to match test cases.

67. By Tony Espy on 2013-07-28

[gril] Minor re-factoring in helper functions.

[Tony Espy (awe)]

> 127 - if (message->req != RIL_UNSOL_DATA_CALL_LIST_CHANGED) {
> 128 - ofono_error("ril_gprs_update_calls: invalid message received %d",
> 129 - message->req);
> 130 - return;
> 131 - }
>
> Why did you remove the above? g_ril_unsol_parse_data_call_list is also not
> checking if the message is indeed UNSOL_DATA_CALL_LIST_CHANGED.

I removed it because it wasn't needed. If you look at the code in gril.c that handles unsolicited messages, it's not really possible for the wrong message to be passed to a registered listener, as that's the whole purpose of registering for a particular message.

> 1017 + g_free(reply);
> 1611 + g_free(call);
> 1621 + g_free(unsol);
>
> Not an issue, but as you're checking for call and unsol just before free, you
> could include the g_free call as part of the if scope.

Done.

> 901 +#define OFONO_EINVAL(error) do { \
> 902 + error->type = OFONO_ERROR_TYPE_FAILURE; \
> 903 + error->error = -EINVAL; \
> 904 +} while (0)
> 905 +
> 906 +#define OFONO_NO_ERROR(error) do { \
> 907 + error->type = OFONO_ERROR_TYPE_NO_ERROR; \
> 908 + error->error = 0; \
> 909 +} while (0)
> 910 +
>
> These would be better if defined somewhere in a common ofono code, not just
> for ril.

Done, moved these to <ofono/type.h>.
>
> 2018 +static const struct ril_msg reply_data_call_invalid_2 = {
> 2019 + .buf = (gchar *) &reply_data_call_invalid_parcel1,
>
> 2052 +static const struct ril_msg reply_data_call_invalid_3 = {
> 2053 + .buf = (gchar *) &reply_data_call_invalid_parcel2,
>
> 2084 +static const struct ril_msg reply_data_call_invalid_4 = {
> 2085 + .buf = (gchar *) &reply_data_call_invalid_parcel3,
>
> 2115 +static const struct ril_msg reply_data_call_invalid_5 = {
> 2116 + .buf = (gchar *) &reply_data_call_invalid_parcel4,
>
> 2147 +static const struct ril_msg reply_data_call_invalid_6 = {
> 2148 + .buf = (gchar *) &reply_data_call_invalid_parcel5,
>
> 2176 +static const struct ril_msg reply_data_call_invalid_7 = {
> 2177 + .buf = (gchar *) &reply_data_call_invalid_parcel6,
>
> Would you mind changing the test id to match the same number used by both
> structs? Otherwise it gets quite confusing when reading the code, as
> data_call_invalid_2 is part of invalid_parcel_1, instead of invalid_parcel_2
> (which is a natural reading by our brain).

Yea, I thought about this an since the first test case didn't actually have parcel_data, I thought it would be weird having the first parcel data variable start with "2". Oh well, not a big deal. Re-number per your suggestion.

> Other than those minor comments, code looks good (although it could
> technically be separated in more MRs, as we discussed).
>
> Will now test in both mako and maguro.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/40/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/65/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, thanks!

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-06-18 00:13:38 +0000
+++ Makefile.am	2013-07-28 19:18:23 +0000
@@ -93,7 +93,10 @@
 				gril/grilio.c gril/grilutil.h \
 				gril/grilutil.c gril/ringbuffer.h \
 				gril/gfunc.h gril/ril.h \
-				gril/parcel.c gril/parcel.h
+				gril/parcel.c gril/parcel.h \
+				gril/grilreply.c gril/grilreply.h \
+				gril/grilrequest.c gril/grilrequest.h \
+				gril/grilunsol.c gril/grilunsol.h
 
 btio_sources = btio/btio.h btio/btio.c
 
@@ -684,7 +687,10 @@
 
 unit_tests = unit/test-common unit/test-util unit/test-idmap \
 				unit/test-simutil unit/test-stkutil \
-				unit/test-sms unit/test-cdmasms
+				unit/test-sms unit/test-cdmasms \
+				unit/test-grilrequest \
+				unit/test-grilreply \
+				unit/test-grilunsol
 
 noinst_PROGRAMS = $(unit_tests) \
 			unit/test-sms-root unit/test-mux unit/test-caif
@@ -736,6 +742,21 @@
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)
 
+unit_test_grilrequest_SOURCES = unit/test-grilrequest.c $(gril_sources) \
+				src/log.c gatchat/ringbuffer.c
+unit_test_grilrequest_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_grilrequest_OBJECTS)
+
+unit_test_grilreply_SOURCES = unit/test-grilreply.c $(gril_sources) \
+				src/log.c gatchat/ringbuffer.c
+unit_test_grilreply_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_grilreply_OBJECTS)
+
+unit_test_grilunsol_SOURCES = unit/test-grilunsol.c $(gril_sources) \
+				src/log.c gatchat/ringbuffer.c
+unit_test_grilunsol_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_grilunsol_OBJECTS)
+
 TESTS = $(unit_tests)
 
 if TOOLS

=== modified file 'drivers/rilmodem/gprs-context.c'
--- drivers/rilmodem/gprs-context.c	2013-06-13 14:59:09 +0000
+++ drivers/rilmodem/gprs-context.c	2013-07-28 19:18:23 +0000
@@ -38,23 +38,12 @@
 #include <ofono/gprs-context.h>
 #include <ofono/types.h>
 
-#include "gril.h"
-#include "grilutil.h"
+#include "grilreply.h"
+#include "grilrequest.h"
+#include "grilunsol.h"
 
 #include "rilmodem.h"
 
-/* REQUEST_DEACTIVATE_DATA_CALL parameter values */
-#define DEACTIVATE_DATA_CALL_NUM_PARAMS 2
-#define DEACTIVATE_DATA_CALL_NO_REASON "0"
-
-/* REQUEST_SETUP_DATA_CALL parameter values */
-#define SETUP_DATA_CALL_PARAMS 7
-#define CHAP_PAP_OK "3"
-#define DATA_PROFILE_DEFAULT "0"
-#define PROTO_IP "IP"
-#define PROTO_IPV6 "IPV6"
-#define PROTO_IPV4V6 "IPV4V6"
-
 enum state {
 	STATE_IDLE,
 	STATE_ENABLING,
@@ -64,36 +53,51 @@
 
 struct gprs_context_data {
 	GRil *ril;
-	unsigned int active_ctx_cid;
-	unsigned int active_rild_cid;
-	char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
-	char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
+	guint active_ctx_cid;
+	gint active_rild_cid;
 	enum state state;
 };
 
+static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
+						unsigned int id,
+						ofono_gprs_context_cb_t cb, void *data);
+
+static void set_context_disconnected(struct gprs_context_data *gcd)
+{
+	DBG("");
+
+	gcd->active_ctx_cid = -1;
+	gcd->active_rild_cid = -1;
+	gcd->state = STATE_IDLE;
+}
+
+static void disconnect_context(struct ofono_gprs_context *gc)
+{
+	ril_gprs_context_deactivate_primary(gc, 0, NULL, NULL);
+}
+
 static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 						gpointer user_data)
 {
 	struct ofono_gprs_context *gc = user_data;
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct data_call *call = NULL;
+	struct unsol_data_call_list *unsol;
 	gboolean active_cid_found = FALSE;
 	gboolean disconnect = FALSE;
-	GSList *calls = NULL, *iterator = NULL;
+	GSList *iterator = NULL;
+	struct ofono_error error;
 
 	DBG("");
 
-	if (message->req != RIL_UNSOL_DATA_CALL_LIST_CHANGED) {
-		ofono_error("ril_gprs_update_calls: invalid message received %d",
-				message->req);
-		return;
-	}
-
-	calls = ril_util_parse_data_call_list(gcd->ril, message);
-
-	DBG("number of call in call_list_changed is: %d", g_slist_length(calls));
-
-	for (iterator = calls; iterator; iterator = iterator->next) {
+	unsol = g_ril_unsol_parse_data_call_list(gcd->ril, message, &error);
+
+	if (error.type != OFONO_ERROR_TYPE_NO_ERROR)
+		goto error;
+
+	DBG("number of call in call_list_changed is: %d", unsol->num);
+
+	for (iterator = unsol->call_list; iterator; iterator = iterator->next) {
 		call = (struct data_call *) iterator->data;
 
 		if (call->cid == gcd->active_rild_cid) {
@@ -113,13 +117,11 @@
 	if (disconnect || active_cid_found == FALSE) {
 		DBG("Clearing active context");
 
-		gcd->active_ctx_cid = -1;
-		gcd->active_rild_cid = -1;
-		gcd->state = STATE_IDLE;
+		set_context_disconnected(gcd);
 	}
 
-	g_slist_foreach(calls, (GFunc) g_free, NULL);
-	g_slist_free(calls);
+error:
+	g_ril_unsol_free_data_call_list(unsol);
 }
 
 static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
@@ -129,87 +131,67 @@
 	struct ofono_gprs_context *gc = cbd->user;
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct ofono_error error;
-	struct parcel rilp;
-	int status, retry_time, cid, active, num, version;
-	char *dnses = NULL, *ifname = NULL;
-	char *raw_ip_addrs = NULL, *raw_gws = NULL, *type = NULL;
-	char **dns_addresses = NULL, **gateways = NULL;
-	char **ip_addrs = NULL, **split_ip_addr = NULL;
-
-	/* TODO:
-	 * Cleanup duplicate code between this function and
-	 * ril_util_parse_data_call_list().
-	 */
-
-	/* valid size: 36 (34 if HCRADIO defined) */
-	if (message->buf_len < 36) {
-		DBG("Parcel is less then minimum DataCallResponseV6 size!");
-		decode_ril_error(&error, "FAIL");
-		goto error;
-	}
+	struct reply_setup_data_call *reply;
+	char **split_ip_addr = NULL;
 
 	if (message->error != RIL_E_SUCCESS) {
 		DBG("Reply failure: %s", ril_error_to_string(message->error));
-		decode_ril_error(&error, "FAIL");
+
+		error.type = OFONO_ERROR_TYPE_FAILURE;
 		error.error = message->error;
-		goto error;
-	}
-
-	ril_util_init_parcel(message, &rilp);
+
+		set_context_disconnected(gcd);
+		goto error;
+	}
+
+	reply = g_ril_reply_parse_data_call(gcd->ril, message, &error);
+
+	gcd->active_rild_cid = reply->cid;
+
+	if (error.type != OFONO_ERROR_TYPE_NO_ERROR) {
+		if (gcd->active_rild_cid != -1)
+			disconnect_context(gc);
+
+		goto error;
+	}
+
+	if (reply->status != 0) {
+		ofono_error("%s: reply->status is non-zero: %d",
+				__func__,
+				reply->status);
+
+		error.type = OFONO_ERROR_TYPE_FAILURE;
+		error.error = reply->status;
+
+		set_context_disconnected(gcd);
+		goto error;
+	}
 
 	/*
-	 * ril.h documents the reply to a RIL_REQUEST_SETUP_DATA_CALL
-	 * as being a RIL_Data_Call_Response_v6 struct, however in
-	 * reality, the response actually includes the version of the
-	 * struct, followed by an array of calls, so the array size
-	 * also has to be read after the version.
+	 * TODO: consier moving this into parse_data_reply
 	 *
-	 * TODO: What if there's more than 1 call in the list??
+	 * Note - the address may optionally include a prefix size
+	 * ( Eg. "/30" ).  As this confuses NetworkManager, we
+	 * explicitly strip any prefix after calculating the netmask.
 	 */
-	version = parcel_r_int32(&rilp);
-	num = parcel_r_int32(&rilp);
-
-	status = parcel_r_int32(&rilp);
-	retry_time = parcel_r_int32(&rilp);
-	cid = parcel_r_int32(&rilp);
-	active = parcel_r_int32(&rilp);
-
-	type = parcel_r_string(&rilp);
-	ifname = parcel_r_string(&rilp);
-	raw_ip_addrs = parcel_r_string(&rilp);
-	dnses = parcel_r_string(&rilp);
-	raw_gws = parcel_r_string(&rilp);
-
-	g_ril_append_print_buf(gcd->ril,
-				"{version=%d,num=%d [status=%d,retry=%d,cid=%d,active=%d,type=%s,ifname=%s,address=%s,dns=%s,gateways=%s]}",
-				version,
-				num,
-				status,
-				retry_time,
-				cid,
-				active,
-				type,
-				ifname,
-				raw_ip_addrs,
-				dnses,
-				raw_gws);
-	g_ril_print_response(gcd->ril, message);
-
-	if (status != 0) {
-		DBG("Reply failure; status %d", status);
-		gcd->state = STATE_IDLE;
+	split_ip_addr = g_strsplit(reply->ip_addrs[0], "/", 2);
+
+	/* TODO: see note above re: invalid messages... */
+	if (split_ip_addr[0] == NULL) {
+		ofono_error("%s: invalid IP address field returned: %s",
+				__func__,
+				reply->ip_addrs[0]);
+
+		error.type = OFONO_ERROR_TYPE_FAILURE;
+		error.error = EINVAL;
+
+		set_context_disconnected(gcd);
 		goto error;
 	}
 
 	gcd->state = STATE_ACTIVE;
-	gcd->active_rild_cid = cid;
-
-	ofono_gprs_context_set_interface(gc, ifname);
-
-	/*
-	 * TODO: re-factor the following code into a
-	 * ril_util function that can be unit-tested.
-	 */
+
+	ofono_gprs_context_set_interface(gc, reply->ifname);
 
 	/* TODO:
 	 * RILD can return multiple addresses; oFono only supports
@@ -218,65 +200,19 @@
 	 * just specify the end-points of the point-to-point
 	 * connection, in which case this code will need to
 	 * changed to handle such a device.
-	 *
-	 * For now split into a maximum of three, and only use
-	 * the first address for the remaining operations.
 	 */
-	ip_addrs = g_strsplit(raw_ip_addrs, " ", 3);
-	if (ip_addrs[0] == NULL) {
-		DBG("No IP address specified: %s", raw_ip_addrs);
-		decode_ril_error(&error, "FAIL");
-		goto error;
-	}
-
 	ofono_gprs_context_set_ipv4_netmask(gc,
-			ril_util_get_netmask(ip_addrs[0]));
-
-	/*
-	 * Note - the address may optionally include a prefix size
-	 * ( Eg. "/30" ).  As this confuses NetworkManager, we
-	 * explicitly strip any prefix after calculating the netmask.
-	 */
-	split_ip_addr = g_strsplit(ip_addrs[0], "/", 2);
-	if (split_ip_addr[0] == NULL) {
-		DBG("Invalid IP address field returned: %s", raw_ip_addrs);
-		decode_ril_error(&error, "FAIL");
-		goto error;
-	}
+			ril_util_get_netmask(reply->ip_addrs[0]));
 
 	ofono_gprs_context_set_ipv4_address(gc, split_ip_addr[0], TRUE);
-
-	/*
-	 * RILD can return multiple addresses; oFono only supports
-	 * setting a single IPv4 gateway.
-	 */
-	gateways = g_strsplit(raw_gws, " ", 3);
-	if (gateways[0] == NULL) {
-		DBG("Invalid gateways field returned: %s", raw_gws);
-		decode_ril_error(&error, "FAIL");
-		goto error;
-	}
-
-	ofono_gprs_context_set_ipv4_gateway(gc, gateways[0]);
-
-	/* Split DNS addresses */
-	dns_addresses = g_strsplit(dnses, " ", 3);
+	ofono_gprs_context_set_ipv4_gateway(gc, reply->gateways[0]);
+
 	ofono_gprs_context_set_ipv4_dns_servers(gc,
-						(const char **) dns_addresses);
-
-	decode_ril_error(&error, "OK");
+						(const char **) reply->dns_addresses);
 
 error:
-	g_strfreev(dns_addresses);
-	g_strfreev(ip_addrs);
+	g_ril_reply_free_setup_data_call(reply);
 	g_strfreev(split_ip_addr);
-	g_strfreev(gateways);
-
-	g_free(type);
-	g_free(ifname);
-	g_free(raw_ip_addrs);
-	g_free(dnses);
-	g_free(raw_gws);
 
 	cb(&error, cbd->data);
 }
@@ -287,91 +223,61 @@
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct cb_data *cbd = cb_data_new(cb, data);
+	struct req_setup_data_call request;
 	struct parcel rilp;
-	gchar *protocol = PROTO_IP;
-	gchar tech[3];
-	int request = RIL_REQUEST_SETUP_DATA_CALL;
-	int ret;
+	struct ofono_error error;
+	int reqid = RIL_REQUEST_SETUP_DATA_CALL;
+	int ret = 0;
+
+	DBG("Activating contex: %d", ctx->cid);
 
 	cbd->user = gc;
+
+	/* TODO: implement radio technology selection. */
+	request.tech = RADIO_TECH_HSPA;
+
+	/* TODO: add comments about tethering, other non-public
+	 * profiles...
+	 */
+	request.data_profile = RIL_DATA_PROFILE_DEFAULT;
+	request.apn = g_strdup(ctx->apn);
+	request.username = g_strdup(ctx->username);
+	request.password = g_strdup(ctx->password);
+	request.auth_type = RIL_AUTH_BOTH;
+	request.protocol = ctx->proto;
+
+	if (g_ril_request_setup_data_call(gcd->ril,
+						&request,
+						&rilp,
+						&error) == FALSE) {
+		ofono_error("Couldn't build SETUP_DATA_CALL request.");
+		goto error;
+	}
+
 	gcd->active_ctx_cid = ctx->cid;
 	gcd->state = STATE_ENABLING;
 
-	memcpy(gcd->username, ctx->username, sizeof(ctx->username));
-	memcpy(gcd->password, ctx->password, sizeof(ctx->password));
-
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, SETUP_DATA_CALL_PARAMS);
-
-        /* RadioTech: hardcoded to HSPA for now... */
-	sprintf((char *) tech, "%d", (int) RADIO_TECH_HSPA);
-	DBG("setting tech to: %s", tech);
-	parcel_w_string(&rilp, (char *) tech);
-
-        /*
-	 * TODO ( OEM/Tethering ): DataProfile:
-	 *
-	 * Other options are TETHERING (1) or OEM_BASE (1000).
-	 */
-	parcel_w_string(&rilp, DATA_PROFILE_DEFAULT);
-
-	/* APN */
-	parcel_w_string(&rilp, (char *) (ctx->apn));
-
-	if (ctx->username && strlen(ctx->username)) {
-		parcel_w_string(&rilp, (char *) (ctx->username));
-	} else {
-		parcel_w_string(&rilp, NULL);
-	}
-
-	if (ctx->password && strlen(ctx->password)) {
-		parcel_w_string(&rilp, (char *) (ctx->password));
-	} else {
-		parcel_w_string(&rilp, NULL);
-	}
-
-	/*
-	 * TODO: review with operators...
-         * Auth type: PAP/CHAP may be performed
-	 */
-	parcel_w_string(&rilp, CHAP_PAP_OK);
-
-	switch (ctx->proto) {
-	case OFONO_GPRS_PROTO_IPV6:
-		protocol = PROTO_IPV6;
-		break;
-	case OFONO_GPRS_PROTO_IPV4V6:
-		protocol = PROTO_IPV4V6;
-		break;
-	case OFONO_GPRS_PROTO_IP:
-		break;
-	default:
-		DBG("Invalid protocol: %d", ctx->proto);
-	}
-
-	parcel_w_string(&rilp, protocol);
-
 	ret = g_ril_send(gcd->ril,
-				request,
+				reqid,
 				rilp.data,
 				rilp.size,
 				ril_setup_data_call_cb, cbd, g_free);
 
-	g_ril_append_print_buf(gcd->ril,
-				"(%s,%s,%s,%s,%s,%s,%s)",
-				tech,
-				DATA_PROFILE_DEFAULT,
-				ctx->apn,
-				ctx->username,
-				ctx->password,
-				CHAP_PAP_OK,
-				protocol);
-	g_ril_print_request(gcd->ril, ret, request);
+	/* 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);
+	g_free(request.password);
+
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_SETUP_DATA_CALL failed.");
 
+		set_context_disconnected(gcd);
+
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -383,7 +289,6 @@
 	ofono_gprs_context_cb_t cb = cbd->cb;
 	struct ofono_gprs_context *gc = cbd->user;
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-	struct ofono_error error;
 
 	DBG("");
 
@@ -392,16 +297,24 @@
 
 		g_ril_print_response_no_args(gcd->ril, message);
 
-		gcd->state = STATE_IDLE;
-		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+		set_context_disconnected(gcd);
+
+		/* If the deactivate was a result of a shutdown,
+		 * there won't be call back, so _deactivated()
+		 * needs to be called directly.
+		 */
+		if (cb)
+			CALLBACK_WITH_SUCCESS(cb, cbd->data);
+		else
+			ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
 
 	} else {
-		DBG("Reply failure: %s", ril_error_to_string(message->error));
-
-		decode_ril_error(&error, "FAIL");
-		error.error = message->error;
-
-		cb(&error, cbd->data);
+		ofono_error("%s: replay failure: %s",
+				__func__,
+				ril_error_to_string(message->error));
+
+		if (cb)
+			CALLBACK_WITH_FAILURE(cb, cbd->data);
 	}
 }
 
@@ -410,51 +323,67 @@
 						ofono_gprs_context_cb_t cb, void *data)
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
-	struct cb_data *cbd = cb_data_new(cb, data);
+	struct cb_data *cbd = NULL;
 	struct parcel rilp;
-	gchar *cid = NULL;
-	int request = RIL_REQUEST_DEACTIVATE_DATA_CALL;
-	int ret;
-
+	struct req_deactivate_data_call request;
+	struct ofono_error error;
+	int reqid = RIL_REQUEST_DEACTIVATE_DATA_CALL;
+	int ret = 0;
+
+	DBG("");
+
+	if (gcd->active_rild_cid == -1) {
+		set_context_disconnected(gcd);
+
+		if (cb) {
+			CALLBACK_WITH_SUCCESS(cb, data);
+			g_free(cbd);
+		}
+
+		return;
+	}
+
+
+	cbd = cb_data_new(cb, data);
 	cbd->user = gc;
 
 	gcd->state = STATE_DISABLING;
 
-	parcel_init(&rilp);
-	parcel_w_int32(&rilp, DEACTIVATE_DATA_CALL_NUM_PARAMS);
-
-	cid = g_strdup_printf("%d", gcd->active_rild_cid);
-	parcel_w_string(&rilp, cid);
-
-	/*
-	 * TODO: airplane-mode; change reason to '1',
-	 * which means "radio power off".
-	 */
-	parcel_w_string(&rilp, DEACTIVATE_DATA_CALL_NO_REASON);
+	request.cid = gcd->active_rild_cid;
+	request.reason = RIL_DEACTIVATE_DATA_CALL_NO_REASON;
+
+	if (g_ril_request_deactivate_data_call(gcd->ril, &request,
+						&rilp, &error) == FALSE) {
+		ofono_error("Couldn't build DEACTIVATE_DATA_CALL request.");
+		goto error;
+	}
 
 	ret = g_ril_send(gcd->ril,
-				request,
+				reqid,
 				rilp.data,
 				rilp.size,
 				ril_deactivate_data_call_cb, cbd, g_free);
 
-	g_ril_append_print_buf(gcd->ril, "(%s,0)", cid);
-	g_ril_print_request(gcd->ril, ret, request);
+	g_ril_append_print_buf(gcd->ril, "(%d,0)", request.cid);
+	g_ril_print_request(gcd->ril, ret, reqid);
 
 	parcel_free(&rilp);
-	g_free(cid);
 
+error:
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_DEACTIVATE_DATA_CALL failed.");
 		g_free(cbd);
-		CALLBACK_WITH_FAILURE(cb, data);
+		if (cb)
+			CALLBACK_WITH_FAILURE(cb, data);
 	}
 }
 
 static void ril_gprs_context_detach_shutdown(struct ofono_gprs_context *gc,
-					unsigned int id)
+						unsigned int id)
 {
-	DBG("");
+	DBG("cid: %d", id);
+
+	ril_gprs_context_deactivate_primary(gc, 0, NULL, NULL);
 }
 
 static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
@@ -468,9 +397,7 @@
 		return -ENOMEM;
 
 	gcd->ril = g_ril_clone(ril);
-	gcd->active_ctx_cid = -1;
-	gcd->active_rild_cid = -1;
-	gcd->state = STATE_IDLE;
+	set_context_disconnected(gcd);
 
 	ofono_gprs_context_set_data(gc, gcd);
 
@@ -486,7 +413,7 @@
 	DBG("");
 
 	if (gcd->state != STATE_IDLE) {
-		/* TODO: call detach_shutdown */
+		ril_gprs_context_detach_shutdown(gc, 0);
 	}
 
 	ofono_gprs_context_set_data(gc, NULL);

=== modified file 'drivers/rilmodem/rilutil.c'
--- drivers/rilmodem/rilutil.c	2013-07-08 18:02:27 +0000
+++ drivers/rilmodem/rilutil.c	2013-07-28 19:18:23 +0000
@@ -97,20 +97,6 @@
 	return 0;
 }
 
-gint ril_util_data_call_compare(gconstpointer a, gconstpointer b)
-{
-	const struct data_call *ca = a;
-	const struct data_call *cb = b;
-
-	if (ca->cid < cb->cid)
-		return -1;
-
-	if (ca->cid > cb->cid)
-		return 1;
-
-	return 0;
-}
-
 gint ril_util_call_compare(gconstpointer a, gconstpointer b)
 {
 	const struct ofono_call *ca = a;
@@ -171,6 +157,8 @@
 	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 */
@@ -283,73 +271,6 @@
 	return l;
 }
 
-GSList *ril_util_parse_data_call_list(GRil *gril, struct ril_msg *message)
-{
-	struct data_call *call;
-	struct parcel rilp;
-	GSList *l = NULL;
-	int num, i, version;
-	gchar *number, *name;
-
-	ril_util_init_parcel(message, &rilp);
-
-	/*
-	 * ril.h documents the reply to a RIL_REQUEST_DATA_CALL_LIST
-	 * as being an array of  RIL_Data_Call_Response_v6 structs,
-	 * however in reality, the response also includes a version
-	 * to start.
-	 */
-	version = parcel_r_int32(&rilp);
-
-	/* Number of calls */
-	num = parcel_r_int32(&rilp);
-
-	g_ril_append_print_buf(gril,
-				"(version=%d,num=%d",
-				version,
-				num);
-
-	for (i = 0; i < num; i++) {
-		call = g_try_new(struct data_call, 1);
-		if (call == NULL)
-			break;
-
-		call->status = parcel_r_int32(&rilp);
-		call->retry = parcel_r_int32(&rilp);
-		call->cid = parcel_r_int32(&rilp);
-		call->active = parcel_r_int32(&rilp);
-
-		call->type = parcel_r_string(&rilp);
-		call->ifname = parcel_r_string(&rilp);
-		call->addresses = parcel_r_string(&rilp);
-		call->dnses = parcel_r_string(&rilp);
-		call->gateways = parcel_r_string(&rilp);
-
-		/* TODO: figure out how to line-wrap properly
-		 * without introducing spaces in string.
-		 */
-		g_ril_append_print_buf(gril,
-					"%s [status=%d,retry=%d,cid=%d,active=%d,type=%s,ifname=%s,address=%s,dns=%s,gateways=%s]",
-					print_buf,
-					call->status,
-					call->retry,
-					call->cid,
-					call->active,
-					call->type,
-					call->ifname,
-					call->addresses,
-					call->dnses,
-					call->gateways);
-
-		l = g_slist_insert_sorted(l, call, ril_util_data_call_compare);
-	}
-
-	g_ril_append_print_buf(gril, "%s}", print_buf);
-	g_ril_print_response(gril, message);
-
-	return l;
-}
-
 char *ril_util_parse_sim_io_rsp(GRil *gril,
 				struct ril_msg *message,
 				int *sw1, int *sw2,

=== modified file 'drivers/rilmodem/rilutil.h'
--- drivers/rilmodem/rilutil.h	2013-07-08 17:17:54 +0000
+++ drivers/rilmodem/rilutil.h	2013-07-28 19:18:23 +0000
@@ -72,18 +72,6 @@
 	APPSTATE_READY,
 };
 
-struct data_call {
-    int status;
-    int retry;
-    int cid;
-    int active;
-    char *type;
-    char *ifname;
-    char *addresses;
-    char *dnses;
-    char *gateways;
-};
-
 #define MAX_UICC_APPS 16
 
 struct sim_status {
@@ -124,7 +112,6 @@
 void ril_util_sim_state_query_free(struct ril_util_sim_state_query *req);
 
 GSList *ril_util_parse_clcc(GRil *gril, struct ril_msg *message);
-GSList *ril_util_parse_data_call_list(GRil *gril, struct ril_msg *message);
 char *ril_util_parse_sim_io_rsp(GRil *gril, struct ril_msg *message,
 				int *sw1, int *sw2,
 				int *hex_len);

=== modified file 'gril/gril.c'
--- gril/gril.c	2013-06-25 16:15:35 +0000
+++ gril/gril.c	2013-07-28 19:18:23 +0000
@@ -40,6 +40,7 @@
 #include "log.h"
 #include "ringbuffer.h"
 #include "gril.h"
+#include "grilutil.h"
 
 #define RIL_TRACE(ril, fmt, arg...) do {	\
 	if (ril->trace == TRUE)		        \
@@ -119,6 +120,9 @@
 	guint32 error_code;                     /* LE: */
 };
 
+#define RIL_PRINT_BUF_SIZE 8096
+char print_buf[RIL_PRINT_BUF_SIZE] __attribute__((used));
+
 static void ril_wakeup_writer(struct ril_s *ril);
 
 static void ril_notify_node_destroy(gpointer data, gpointer user_data)
@@ -240,7 +244,7 @@
 
 
 	DBG("req: %s, id: %d, data_len: %d",
-		ril_request_id_to_string(req), id, data_len);
+		ril_request_id_to_string(req), id, (int) data_len);
 
         /* RIL request: 8 byte header + data */
         len = 8 + data_len;
@@ -634,7 +638,9 @@
 
 	len = req->data_len;
 
-	DBG("len: %d, req_bytes_written: %d", len, ril->req_bytes_written);
+	DBG("len: %d, req_bytes_written: %d",
+		(int) len,
+		ril->req_bytes_written);
 
 	/* For some reason write watcher fired, but we've already
 	 * written the entire command out to the io channel,
@@ -810,8 +816,6 @@
 		return NULL;
         }
 
-	g_io_channel_set_buffered(io, FALSE);
-	g_io_channel_set_encoding(io, NULL, NULL);
 	g_io_channel_set_close_on_unref(io, TRUE);
 	g_io_channel_set_flags(io, G_IO_FLAG_NONBLOCK, NULL);
 
@@ -956,6 +960,15 @@
 	return FALSE;
 }
 
+void g_ril_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;
+}
+
 GRil *g_ril_new()
 {
 	GRil *ril;
@@ -1022,7 +1035,7 @@
 	return ril;
 }
 
-guint g_ril_send(GRil *ril, const guint req, const char *data,
+guint g_ril_send(GRil *ril, const guint reqid, const char *data,
 			const gsize data_len, GRilResponseFunc func,
 			gpointer user_data, GDestroyNotify notify)
 {
@@ -1034,7 +1047,7 @@
 
         p = ril->parent;
 
-	r = ril_request_create(p, ril->group, req, p->next_cmd_id,
+	r = ril_request_create(p, ril->group, reqid, p->next_cmd_id,
 				data, data_len, func,
 				user_data, notify, FALSE);
 	if (r == NULL)

=== modified file 'gril/gril.h'
--- gril/gril.h	2013-06-14 16:11:01 +0000
+++ gril/gril.h	2013-07-28 19:18:23 +0000
@@ -27,9 +27,9 @@
 extern "C" {
 #endif
 
-#include "grilresponse.h"
+#include "grilio.h"
 #include "grilutil.h"
-#include "grilio.h"
+#include "parcel.h"
 #include "ril_constants.h"
 
 struct _GRil;
@@ -63,12 +63,11 @@
  * name it is called in.
  */
 #define G_RIL_TRACE(gril, fmt, arg...) do {	\
-	if (g_ril_get_trace(gril))		\
+	if (gril && g_ril_get_trace(gril))	\
 		ofono_debug(fmt, ## arg); 	\
 } while (0)
 
-#define RIL_PRINT_BUF_SIZE 8096
-static char print_buf[RIL_PRINT_BUF_SIZE] __attribute__((used));
+extern char print_buf[];
 
 #define g_ril_print_request(gril, token, req)			\
         G_RIL_TRACE(gril, "[%04d]> %s %s", token, ril_request_id_to_string(req), print_buf)
@@ -82,7 +81,7 @@
 			ril_request_id_to_string(message->req))
 
 #define g_ril_append_print_buf(gril, x...)  do {    \
-	if (g_ril_get_trace(gril))                  \
+	if (gril && g_ril_get_trace(gril))          \
 		sprintf(print_buf, x);              \
 } while (0)
 
@@ -92,6 +91,8 @@
 #define g_ril_print_unsol_no_args(gril, message)				\
         G_RIL_TRACE(gril, "[UNSOL]< %s", ril_unsol_request_to_string(message->req))
 
+void g_ril_init_parcel(struct ril_msg *message, struct parcel *rilp);
+
 GRil *g_ril_new();
 
 GIOChannel *g_ril_get_channel(GRil *ril);
@@ -127,8 +128,9 @@
  * g_ril_cancel.  If an error occurred, an id of 0 is returned.
  *
  */
-guint g_ril_send(GRil *ril, const guint req, const char *data, const gsize data_len,
-		GRilResponseFunc func, gpointer user_data, GDestroyNotify notify);
+guint g_ril_send(GRil *ril, const guint reqid, const char *data,
+			const gsize data_len, GRilResponseFunc func,
+			gpointer user_data, GDestroyNotify notify);
 
 guint g_ril_register(GRil *ril, const int req,
 			GRilNotifyFunc func, gpointer user_data);

=== added file 'gril/grilreply.c'
--- gril/grilreply.c	1970-01-01 00:00:00 +0000
+++ gril/grilreply.c	2013-07-28 19:18:23 +0000
@@ -0,0 +1,225 @@
+/*
+ *
+ *  RIL library with GLib integration
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-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 <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+
+#include "grilreply.h"
+#include "grilutil.h"
+
+/* SETUP_DATA_CALL_PARAMS reply params */
+#define MIN_DATA_CALL_REPLY_SIZE 36
+
+/* TODO: move this to grilutil.c */
+void g_ril_reply_free_setup_data_call(struct reply_setup_data_call *reply)
+{
+	if (reply) {
+		g_free(reply->ifname);
+		g_strfreev(reply->dns_addresses);
+		g_strfreev(reply->gateways);
+		g_strfreev(reply->ip_addrs);
+		g_free(reply);
+	}
+}
+
+struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
+							struct ril_msg *message,
+							struct ofono_error *error)
+{
+	struct parcel rilp;
+	int num = 0;
+	int protocol;
+	char *type = NULL, *raw_ip_addrs = NULL;
+	char *dnses = NULL, *raw_gws = NULL;
+
+	struct reply_setup_data_call *reply =
+		g_new0(struct reply_setup_data_call, 1);
+
+	OFONO_NO_ERROR(error);
+
+	reply->cid = -1;
+
+       /* TODO:
+	 * Cleanup duplicate code between this function and
+	 * ril_util_parse_data_call_list().
+	 */
+
+	/* valid size: 36 (34 if HCRADIO defined) */
+	if (message->buf_len < MIN_DATA_CALL_REPLY_SIZE) {
+		/* TODO: make a macro for error logging */
+		ofono_error("%s: reply too small: %d",
+				__func__,
+				(int) message->buf_len);
+		OFONO_EINVAL(error);
+		goto error;
+	}
+
+	g_ril_init_parcel(message, &rilp);
+
+	/*
+	 * ril.h documents the reply to a RIL_REQUEST_SETUP_DATA_CALL
+	 * as being a RIL_Data_Call_Response_v6 struct, however in
+	 * reality, the response actually includes the version of the
+	 * struct, followed by an array of calls, so the array size
+	 * also has to be read after the version.
+	 *
+	 * TODO: What if there's more than 1 call in the list??
+	 */
+
+	/*
+	 * TODO: consider using 'unused' variable; however if we
+	 * do this, the alternative is a few more append_print_buf
+	 * calls ( which become no-ops if tracing isn't enabled.
+	 */
+	reply->version = parcel_r_int32(&rilp);
+	num = parcel_r_int32(&rilp);
+	if (num != 1) {
+		ofono_error("%s: too many calls: %d", __func__,	num);
+		OFONO_EINVAL(error);
+		goto error;
+	}
+
+	reply->status = parcel_r_int32(&rilp);
+	reply->retry_time = parcel_r_int32(&rilp);
+	reply->cid = parcel_r_int32(&rilp);
+	reply->active = parcel_r_int32(&rilp);
+	type = parcel_r_string(&rilp);
+	reply->ifname = parcel_r_string(&rilp);
+	raw_ip_addrs = parcel_r_string(&rilp);
+	dnses = parcel_r_string(&rilp);
+	raw_gws = parcel_r_string(&rilp);
+
+	g_ril_append_print_buf(gril,
+				"{version=%d,num=%d [status=%d,retry=%d,"
+				"cid=%d,active=%d,type=%s,ifname=%s,address=%s"
+				",dns=%s,gateways=%s]}",
+				reply->version,
+				num,
+				reply->status,
+				reply->retry_time,
+				reply->cid,
+				reply->active,
+				type,
+				reply->ifname,
+				raw_ip_addrs,
+				dnses,
+				raw_gws);
+
+	g_ril_print_response(gril, message);
+
+	protocol = ril_protocol_string_to_ofono_protocol(type);
+	if (protocol < 0) {
+		ofono_error("%s: Invalid type(protocol) specified: %s",
+				__func__,
+				type);
+		OFONO_EINVAL(error);
+		goto error;
+	}
+
+	reply->protocol = (guint) protocol;
+
+	if (reply->ifname == NULL || strlen(reply->ifname) == 0) {
+		ofono_error("%s: No interface specified: %s",
+				__func__,
+				reply->ifname);
+
+		OFONO_EINVAL(error);
+		goto error;
+
+	}
+
+	/* TODO:
+	 * RILD can return multiple addresses; oFono only supports
+	 * setting a single IPv4 address.  At this time, we only
+	 * use the first address.  It's possible that a RIL may
+	 * just specify the end-points of the point-to-point
+	 * connection, in which case this code will need to
+	 * changed to handle such a device.
+	 *
+	 * For now split into a maximum of three, and only use
+	 * the first address for the remaining operations.
+	 */
+	if (raw_ip_addrs)
+		reply->ip_addrs = g_strsplit(raw_ip_addrs, " ", 3);
+	else
+		reply->ip_addrs = NULL;
+
+	/* TODO: I'm not sure it's possible to specify a zero-length
+	 * in a parcel in a parcel.  If *not*, then this can be
+	 * simplified.
+	 */
+	if (reply->ip_addrs == NULL || (sizeof(reply->ip_addrs) == 0)) {
+		ofono_error("%s no IP address: %s", __func__, raw_ip_addrs);
+
+		OFONO_EINVAL(error);
+		goto error;
+	}
+
+	/*
+	 * RILD can return multiple addresses; oFono only supports
+	 * setting a single IPv4 gateway.
+	 */
+	if (raw_gws)
+		reply->gateways = g_strsplit(raw_gws, " ", 3);
+	else
+		reply->gateways = NULL;
+
+	if (reply->gateways == NULL || (sizeof(reply->gateways) == 0)) {
+		ofono_error("%s: no gateways: %s", __func__, raw_gws);
+		OFONO_EINVAL(error);
+		goto error;
+	}
+
+	/* Split DNS addresses */
+	if (dnses)
+		reply->dns_addresses = g_strsplit(dnses, " ", 3);
+	else
+		reply->dns_addresses = NULL;
+
+	if (reply->dns_addresses == NULL ||
+		(sizeof(reply->dns_addresses) == 0)) {
+		ofono_error("%s: no DNS: %s", __func__, dnses);
+
+		OFONO_EINVAL(error);
+		goto error;
+	}
+
+error:
+	g_free(type);
+	g_free(raw_ip_addrs);
+	g_free(dnses);
+	g_free(raw_gws);
+
+	return reply;
+}

=== added file 'gril/grilreply.h'
--- gril/grilreply.h	1970-01-01 00:00:00 +0000
+++ gril/grilreply.h	2013-07-28 19:18:23 +0000
@@ -0,0 +1,57 @@
+/*
+ *
+ *  RIL library with GLib integration
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-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
+ *
+ */
+
+#ifndef __GRILREPLY_H
+#define __GRILREPLY_H
+
+#include <ofono/types.h>
+
+#include "gril.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct reply_setup_data_call {
+	guint version;
+	guint status;
+	gint cid;
+	guint retry_time;
+	guint active;
+	guint protocol;
+	gchar *ifname;
+	gchar **dns_addresses;
+	gchar **gateways;
+	gchar **ip_addrs;
+};
+
+void g_ril_reply_free_setup_data_call(struct reply_setup_data_call *reply);
+
+struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
+							struct ril_msg *message,
+							struct ofono_error *error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GRILREPLY_H */

=== added file 'gril/grilrequest.c'
--- gril/grilrequest.c	1970-01-01 00:00:00 +0000
+++ gril/grilrequest.c	2013-07-28 19:18:23 +0000
@@ -0,0 +1,213 @@
+/*
+ *
+ *  RIL library with GLib integration
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-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 <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+
+#include "grilrequest.h"
+
+/* DEACTIVATE_DATA_CALL request parameters */
+#define DEACTIVATE_DATA_CALL_NUM_PARAMS 2
+
+/* SETUP_DATA_CALL_PARAMS request parameters */
+#define SETUP_DATA_CALL_PARAMS 7
+#define DATA_PROFILE_DEFAULT_STR "0"
+#define DATA_PROFILE_TETHERED_STR "1"
+#define DATA_PROFILE_IMS_STR "2"
+#define DATA_PROFILE_FOTA_STR "3"
+#define DATA_PROFILE_CBS_STR "4"
+#define DATA_PROFILE_OEM_BASE_STR "1000"
+
+/* SETUP_DATA_CALL_PARAMS reply parameters */
+#define MIN_DATA_CALL_REPLY_SIZE 36
+
+/*
+ * TODO:
+ *
+ * A potential future change here is to create a driver
+ * abstraction for each request/reply/event method, and a
+ * corresponding method to allow new per-message implementations
+ * to be registered.  This would allow PES to easily add code
+ * to quirk a particular RIL implementation.
+ *
+ * struct g_ril_messages_driver {
+ *	const char *name;
+ * };
+ *
+ */
+
+gboolean g_ril_request_deactivate_data_call(GRil *gril,
+				const struct req_deactivate_data_call *req,
+				struct parcel *rilp,
+				struct ofono_error *error)
+{
+	gchar *cid_str = NULL;
+	gchar *reason_str = NULL;
+
+	if (req->reason != RIL_DEACTIVATE_DATA_CALL_NO_REASON &&
+		req->reason != RIL_DEACTIVATE_DATA_CALL_RADIO_SHUTDOWN) {
+		goto error;
+	}
+
+	parcel_init(rilp);
+	parcel_w_int32(rilp, DEACTIVATE_DATA_CALL_NUM_PARAMS);
+
+	cid_str = g_strdup_printf("%d", req->cid);
+	parcel_w_string(rilp, cid_str);
+
+	/*
+	 * TODO: airplane-mode; change reason to '1',
+	 * which means "radio power off".
+	 */
+	reason_str = g_strdup_printf("%d", req->reason);
+	parcel_w_string(rilp, reason_str);
+
+	g_free(cid_str);
+	g_free(reason_str);
+
+	OFONO_NO_ERROR(error);
+	return TRUE;
+
+error:
+	OFONO_EINVAL(error);
+	return FALSE;
+}
+
+gboolean g_ril_request_setup_data_call(GRil *gril,
+					const struct req_setup_data_call *req,
+					struct parcel *rilp,
+					struct ofono_error *error)
+{
+	const gchar *protocol_str;
+	gchar *tech_str;
+	gchar *auth_str;
+	gchar *profile_str;
+	size_t apn_len;
+
+	DBG("");
+
+	if (req->tech < RADIO_TECH_GPRS || req->tech > RADIO_TECH_GSM) {
+		ofono_error("%s: Invalid tech value: %d", __func__, req->tech);
+		goto error;
+	}
+
+	/*
+	 * TODO(OEM): This code doesn't currently support
+	 * OEM data profiles.  If a use case exist, then
+	 * this code will need to be modified.
+	 */
+	switch (req->data_profile) {
+	case RIL_DATA_PROFILE_DEFAULT:
+		profile_str = DATA_PROFILE_DEFAULT_STR;
+		break;
+	case RIL_DATA_PROFILE_TETHERED:
+		profile_str = DATA_PROFILE_TETHERED_STR;
+		break;
+	case RIL_DATA_PROFILE_IMS:
+		profile_str = DATA_PROFILE_IMS_STR;
+		break;
+	case RIL_DATA_PROFILE_FOTA:
+		profile_str = DATA_PROFILE_FOTA_STR;
+		break;
+	case RIL_DATA_PROFILE_CBS:
+		profile_str = DATA_PROFILE_CBS_STR;
+		break;
+	default:
+		ofono_error("%s, invalid data_profile value: %d",
+				__func__,
+				req->data_profile);
+		goto error;
+	}
+
+	if (req->apn == NULL)
+		goto error;
+
+	apn_len = strlen(req->apn);
+	if (apn_len == 0 || apn_len > 100) {
+		ofono_error("%s: invalid apn length: %d",
+				__func__,
+				(int) apn_len);
+		goto error;
+	}
+
+	if (req->auth_type > RIL_AUTH_BOTH) {
+		ofono_error("%s: Invalid auth type: %d",
+				__func__,
+				req->auth_type);
+		goto error;
+	}
+
+	protocol_str = ril_ofono_protocol_to_ril_string(req->protocol);
+	if (protocol_str == NULL) {
+		ofono_error("%s: Invalid protocol: %d",
+				__func__,
+				req->protocol);
+		goto error;
+	}
+
+	parcel_init(rilp);
+
+	parcel_w_int32(rilp, SETUP_DATA_CALL_PARAMS);
+
+	tech_str = g_strdup_printf("%d", req->tech);
+	parcel_w_string(rilp, (char *) tech_str);
+	parcel_w_string(rilp, (char *) profile_str);
+	parcel_w_string(rilp, (char *) req->apn);
+	parcel_w_string(rilp, (char *) req->username);
+	parcel_w_string(rilp, (char *) req->password);
+
+	auth_str = g_strdup_printf("%d", req->auth_type);
+	parcel_w_string(rilp, (char *) auth_str);
+	parcel_w_string(rilp, (char *) protocol_str);
+
+	g_ril_append_print_buf(gril,
+				"(%s,%s,%s,%s,%s,%s,%s)",
+				tech_str,
+				profile_str,
+				req->apn,
+				req->username,
+				req->password,
+				auth_str,
+				protocol_str);
+
+	g_free(tech_str);
+	g_free(auth_str);
+
+	OFONO_NO_ERROR(error);
+	return TRUE;
+
+error:
+        OFONO_EINVAL(error);
+	return FALSE;
+}

=== added file 'gril/grilrequest.h'
--- gril/grilrequest.h	1970-01-01 00:00:00 +0000
+++ gril/grilrequest.h	2013-07-28 19:18:23 +0000
@@ -0,0 +1,63 @@
+/*
+ *
+ *  RIL library with GLib integration
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-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
+ *
+ */
+
+#ifndef __GRILREQUEST_H
+#define __GRILREQUEST_H
+
+#include <ofono/types.h>
+
+#include "gril.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct req_deactivate_data_call {
+	guint cid;
+	guint reason;
+};
+
+struct req_setup_data_call {
+	guint tech;
+	guint data_profile;
+	gchar *apn;
+	gchar *username;
+	gchar *password;
+	guint auth_type;
+	guint protocol;
+};
+
+gboolean g_ril_request_deactivate_data_call(GRil *gril,
+				const struct req_deactivate_data_call *req,
+				struct parcel *rilp,
+				struct ofono_error *error);
+
+gboolean g_ril_request_setup_data_call(GRil *gril,
+					const struct req_setup_data_call *req,
+					struct parcel *rilp,
+					struct ofono_error *error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GRILREQUEST_H */

=== added file 'gril/grilunsol.c'
--- gril/grilunsol.c	1970-01-01 00:00:00 +0000
+++ gril/grilunsol.c	2013-07-28 19:18:23 +0000
@@ -0,0 +1,158 @@
+/*
+ *
+ *  RIL library with GLib integration
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-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 <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+
+#include "grilunsol.h"
+
+/* Minimum size is two int32s version/number of calls */
+#define MIN_DATA_CALL_LIST_SIZE 8
+
+static gint data_call_compare(gconstpointer a, gconstpointer b)
+{
+	const struct data_call *ca = a;
+	const struct data_call *cb = b;
+
+	if (ca->cid < cb->cid)
+		return -1;
+
+	if (ca->cid > cb->cid)
+		return 1;
+
+	return 0;
+}
+
+static void free_data_call(gpointer data, gpointer user_data)
+{
+	struct data_call *call = data;
+
+	if (call) {
+		g_free(call->type);
+		g_free(call->ifname);
+		g_free(call->addresses);
+		g_free(call->dnses);
+		g_free(call->gateways);
+		g_free(call);
+	}
+}
+
+void g_ril_unsol_free_data_call_list(struct unsol_data_call_list *unsol)
+{
+	if (unsol) {
+		g_slist_foreach(unsol->call_list, (GFunc) free_data_call, NULL);
+		g_slist_free(unsol->call_list);
+		g_free(unsol);
+	}
+}
+
+struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
+					struct ril_msg *message,
+					struct ofono_error *error)
+{
+	struct data_call *call;
+	struct parcel rilp;
+	struct unsol_data_call_list *reply =
+		g_new0(struct unsol_data_call_list, 1);
+	int i;
+
+	DBG("");
+
+	OFONO_NO_ERROR(error);
+
+	if (message->buf_len < MIN_DATA_CALL_LIST_SIZE) {
+		ofono_error("%s: message too small: %d",
+				__func__,
+				(int) message->buf_len);
+		OFONO_EINVAL(error);
+		goto error;
+	}
+
+	g_ril_init_parcel(message, &rilp);
+
+	/*
+	 * ril.h documents the reply to a RIL_REQUEST_DATA_CALL_LIST
+	 * as being an array of  RIL_Data_Call_Response_v6 structs,
+	 * however in reality, the response also includes a version
+	 * to start.
+	 */
+	reply->version = parcel_r_int32(&rilp);
+	reply->num = parcel_r_int32(&rilp);
+
+	g_ril_append_print_buf(gril,
+				"(version=%d,num=%d",
+				reply->version,
+				reply->num);
+
+	for (i = 0; i < reply->num; i++) {
+		call = g_new0(struct data_call, 1);
+
+		call->status = parcel_r_int32(&rilp);
+		call->retry = parcel_r_int32(&rilp);
+		call->cid = parcel_r_int32(&rilp);
+		call->active = parcel_r_int32(&rilp);
+
+		call->type = parcel_r_string(&rilp);
+		call->ifname = parcel_r_string(&rilp);
+		call->addresses = parcel_r_string(&rilp);
+		call->dnses = parcel_r_string(&rilp);
+		call->gateways = parcel_r_string(&rilp);
+
+		g_ril_append_print_buf(gril,
+					"%s [status=%d,retry=%d,cid=%d,"
+					"active=%d,type=%s,ifname=%s,"
+					"address=%s,dns=%s,gateways=%s]",
+					print_buf,
+					call->status,
+					call->retry,
+					call->cid,
+					call->active,
+					call->type,
+					call->ifname,
+					call->addresses,
+					call->dnses,
+					call->gateways);
+
+		reply->call_list =
+			g_slist_insert_sorted(reply->call_list,
+						call,
+						data_call_compare);
+	}
+
+	g_ril_append_print_buf(gril, "%s}", print_buf);
+	g_ril_print_unsol(gril, message);
+
+error:
+	return reply;
+}

=== added file 'gril/grilunsol.h'
--- gril/grilunsol.h	1970-01-01 00:00:00 +0000
+++ gril/grilunsol.h	2013-07-28 19:18:23 +0000
@@ -0,0 +1,62 @@
+/*
+ *
+ *  RIL library with GLib integration
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-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
+ *
+ */
+
+#ifndef __GRILUNSOL_H
+#define __GRILUNSOL_H
+
+#include <ofono/types.h>
+
+#include "gril.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct unsol_data_call_list {
+	guint version;
+	guint num;
+	GSList *call_list;
+};
+
+struct data_call {
+    guint status;
+    guint retry;
+    guint cid;
+    guint active;
+    char *type;
+    char *ifname;
+    char *addresses;
+    char *dnses;
+    char *gateways;
+};
+
+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,
+					struct ril_msg *message,
+					struct ofono_error *error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GRILUNSOL_H */

=== modified file 'gril/grilutil.c'
--- gril/grilutil.c	2013-05-25 03:31:48 +0000
+++ gril/grilutil.c	2013-07-28 19:18:23 +0000
@@ -30,9 +30,56 @@
 
 #include <glib.h>
 
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+#include <ofono/types.h>
+
 #include "grilutil.h"
+#include "parcel.h"
 #include "ril_constants.h"
 
+/* Constants used by CALL_LIST, and SETUP_DATA_CALL RIL requests */
+#define PROTO_IP_STR "IP"
+#define PROTO_IPV6_STR "IPV6"
+#define PROTO_IPV4V6_STR "IPV4V6"
+
+const char *ril_ofono_protocol_to_ril_string(guint protocol)
+{
+	char *result;
+
+	switch (protocol) {
+	case OFONO_GPRS_PROTO_IPV6:
+		result = PROTO_IPV6_STR;
+		break;
+	case OFONO_GPRS_PROTO_IPV4V6:
+		result = PROTO_IPV4V6_STR;
+		break;
+	case OFONO_GPRS_PROTO_IP:
+		result = PROTO_IP_STR;
+		break;
+	default:
+		result = NULL;
+	}
+
+	return result;
+}
+
+int ril_protocol_string_to_ofono_protocol(gchar *protocol_str)
+{
+	int result;
+
+	if (g_strcmp0(protocol_str, PROTO_IPV6_STR) == 0)
+		result = OFONO_GPRS_PROTO_IPV6;
+	else if (g_strcmp0(protocol_str, PROTO_IPV4V6_STR) == 0)
+		result = OFONO_GPRS_PROTO_IPV4V6;
+	else if (g_strcmp0(protocol_str, PROTO_IP_STR) == 0)
+		result = OFONO_GPRS_PROTO_IP;
+	else
+		result = -1;
+
+	return result;
+}
+
 const char *ril_appstate_to_string(int app_state)
 {
 	switch (app_state) {

=== modified file 'gril/grilutil.h'
--- gril/grilutil.h	2013-05-25 03:31:48 +0000
+++ gril/grilutil.h	2013-07-28 19:18:23 +0000
@@ -23,12 +23,16 @@
 #ifndef __GRILUTIL_H
 #define __GRILUTIL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "gfunc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#include "parcel.h"
+#include "gril.h"
+
+const char *ril_ofono_protocol_to_ril_string(guint protocol);
+int ril_protocol_string_to_ofono_protocol(gchar *protocol_str);
 const char *ril_appstate_to_string(int app_state);
 const char *ril_apptype_to_string(int app_type);
 const char *ril_cardstate_to_string(int card_state);

=== modified file 'gril/parcel.c'
--- gril/parcel.c	2013-05-24 22:02:28 +0000
+++ gril/parcel.c	2013-07-28 19:18:23 +0000
@@ -82,11 +82,9 @@
 {
 	for (;;) {
 
-		/*
-		 * TODO: make conditional:
-		 * DBG("parcel_w_int32(%d): offset = %d, cap = %d, size = %d",
-		 *		val, p->offset, p->capacity, p->size);
-		 */
+		DBG("parcel_w_int32(%d): offset = %d, cap = %d, size = %d\n",
+			val, p->offset, p->capacity, p->size);
+
 		if (p->offset + sizeof(int32_t) < p->capacity) {
 			/* There's enough space */
 			*((int32_t *) (p->data + p->offset)) = val;
@@ -106,6 +104,7 @@
 	gunichar2 *gs16;
 	glong gs16_len;
 	size_t len;
+	size_t gs16_size;
 
 	if (str == NULL) {
 		parcel_w_int32(p, -1);
@@ -118,27 +117,24 @@
 		return -1;
 	}
 
-	len = (gs16_len + 1) * sizeof(char16_t);
+	gs16_size = gs16_len * sizeof(char16_t);
+	len = gs16_size + sizeof(char16_t);
 	for (;;) {
 		size_t padded = PAD_SIZE(len);
-		/*
-		 * TODO: make conditional:
-		 * DBG("parcel_w_string(\"%s\"): offset %d, cap %d, size %d",
-		 *			str, p->offset, p->capacity, p->size);
-		 */
+
+		DBG("parcel_w_string(\"%s\"): len %d offset %d, cap %d, size %d",
+			str, p->offset, p->capacity, p->size);
 		if (p->offset + len < p->capacity) {
 			/* There's enough space */
-			memcpy(p->data + p->offset, gs16,
-					gs16_len * sizeof(char16_t));
-			*((char16_t *) (p->data + p->offset + len)) = 0;
+			memcpy(p->data + p->offset, gs16, gs16_size);
+			*((char16_t *) (p->data + p->offset + gs16_size)) = 0;
 			p->offset += padded;
 			p->size += padded;
 			if (padded != len) {
-				/*
-				 * TODO: make conditional:
-				 * DBG("Writing %d bytes, padded to %d",
-				 *	len, padded);
-				 */
+
+				DBG("Writing %d bytes, padded to %d\n",
+					len, padded);
+
 #if BYTE_ORDER == BIG_ENDIAN
 				static const uint32_t mask[4] = {
 					0x00000000, 0xffffff00,

=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2013-05-24 22:03:27 +0000
+++ gril/ril_constants.h	2013-07-28 19:18:23 +0000
@@ -76,12 +76,24 @@
 #define RADIO_TECH_HSPAP 15
 #define RADIO_TECH_GSM 16
 
+/* see RIL_REQUEST_DEACTIVATE_DATA_CALL parameter*/
+#define RIL_DEACTIVATE_DATA_CALL_NO_REASON 0
+#define RIL_DEACTIVATE_DATA_CALL_RADIO_SHUTDOWN 1
+
 /* See RIL_REQUEST_SETUP_DATA_CALL */
 
 #define RIL_DATA_PROFILE_DEFAULT 0
 #define RIL_DATA_PROFILE_TETHERED 1
+#define RIL_DATA_PROFILE_IMS 2
+#define RIL_DATA_PROFILE_FOTA 3           /* FOTA = Firmware Over the Air */
+#define RIL_DATA_PROFILE_CBS 4
 #define RIL_DATA_PROFILE_OEM_BASE 1000    /* Start of OEM-specific profiles */
 
+#define RIL_AUTH_NONE 0
+#define RIL_AUTH_PAP 1
+#define RIL_AUTH_CHAP 2
+#define RIL_AUTH_BOTH 3
+
 /* SIM card states */
 #define RIL_CARDSTATE_ABSENT 0
 #define RIL_CARDSTATE_PRESENT 1

=== modified file 'include/types.h'
--- include/types.h	2012-08-22 19:59:08 +0000
+++ include/types.h	2013-07-28 19:18:23 +0000
@@ -70,6 +70,16 @@
 	int error;
 };
 
+#define OFONO_EINVAL(error) do {	        \
+	error->type = OFONO_ERROR_TYPE_FAILURE; \
+	error->error = -EINVAL;                 \
+} while (0)
+
+#define OFONO_NO_ERROR(error) do {	         \
+	error->type = OFONO_ERROR_TYPE_NO_ERROR; \
+	error->error = 0;                        \
+} while (0)
+
 #define OFONO_MAX_PHONE_NUMBER_LENGTH 80
 #define OFONO_MAX_CALLER_NAME_LENGTH 80
 

=== added file 'unit/test-grilreply.c'
--- unit/test-grilreply.c	1970-01-01 00:00:00 +0000
+++ unit/test-grilreply.c	2013-07-28 19:18:23 +0000
@@ -0,0 +1,339 @@
+/*
+ *
+ *  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 <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include <glib.h>
+#include <errno.h>
+
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+#include <ofono/types.h>
+
+#include "grilreply.h"
+
+/*
+ * TODO: It may make sense to split this file into
+ * domain-specific files ( eg. test-grilreply-gprs-context.c )
+ * once more tests are added.
+ */
+
+static const struct ril_msg reply_data_call_invalid_1 = {
+	.buf = "",
+	.buf_len = 0,
+};
+
+/*
+ * The following hexadecimal data equates te the following
+ * RIL_REQUEST_SETUP_DATA_CALL reply parameters:
+ *
+ * {version=2,num=2 [status=0,retry=-1,cid=0,active=2,type=IP}
+ * Parcel is truncated, as num=2 should trigger a failure.
+ */
+static const guchar reply_data_call_invalid_parcel2[36] = {
+	0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_call_invalid_2 = {
+	.buf = (gchar *) &reply_data_call_invalid_parcel2,
+	.buf_len = 36,
+};
+
+/*
+ * The following hexadecimal data is a binary representation of
+ * a parcel containing an invalid RIL_REQUEST_SETUP_DATA_CALL reply
+ * with a NULL string specified cfor 'type':
+ *
+ * {version=7,num=1 [status=0,retry=-1,cid=0,active=2,type=NULL
+ * ifname=rmnet_usb0,address=10.181.235.154/30,
+ * dns=172.16.145.103 172.16.145.103,gateways=10.181.235.153]}
+ */
+static const guchar reply_data_call_invalid_parcel3[196] = {
+	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,
+	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
+	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
+	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_call_invalid_3 = {
+	.buf = (gchar *) &reply_data_call_invalid_parcel3,
+	.buf_len = 196,
+};
+
+/*
+ * The following hexadecimal data is a binary representation of
+ * a parcel containing an invalid RIL_REQUEST_SETUP_DATA_CALL reply
+ * with a NULL string specified for 'ifname':
+ *
+ * {version=7,num=1 [status=0,retry=-1,cid=0,active=2,type=IP
+ * ifname=NULL,address=10.181.235.154/30,
+ * dns=172.16.145.103 172.16.145.103,gateways=10.181.235.153]}
+ */
+static const guchar reply_data_call_invalid_parcel4[190] = {
+	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
+	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_call_invalid_4 = {
+	.buf = (gchar *) &reply_data_call_invalid_parcel4,
+	.buf_len = 190,
+};
+
+/*
+ * The following hexadecimal data is a binary representation of
+ * a parcel containing an invalid RIL_REQUEST_SETUP_DATA_CALL reply
+ * with a NULL string specified for 'address':
+ *
+ * {version=7,num=1 [status=0,retry=-1,cid=0,active=2,type=IP
+ * ifname=rmnet_usb0,address=NULL,
+ * dns=172.16.145.103 172.16.145.103,gateways=10.181.235.153]}
+ */
+static const guchar reply_data_call_invalid_parcel5[168] = {
+	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
+	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00,	0xff, 0xff, 0xff, 0xff, 0x1d, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_call_invalid_5 = {
+	.buf = (gchar *) &reply_data_call_invalid_parcel5,
+	.buf_len = 168,
+};
+
+/*
+ * The following hexadecimal data represents a serialized Binder parcel
+ * instance containing an invalid RIL_REQUEST_SETUP_DATA_CALL reply
+ * with a NULL string specified for 'gateways':
+ *
+ * {version=7,num=1 [status=0,retry=-1,cid=0,active=2,type=IP
+ * ifname=rmnet_usb0,address=10.181.235.154/30,
+ * dns=172.16.145.103 172.16.145.103,gateways=NULL]}
+ */
+static const guchar reply_data_call_invalid_parcel6[180] = {
+	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
+	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
+	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff
+};
+
+static const struct ril_msg reply_data_call_invalid_6 = {
+	.buf = (gchar *) &reply_data_call_invalid_parcel6,
+	.buf_len = 180,
+};
+
+/*
+ * The following hexadecimal data represents a serialized Binder parcel
+ * instance containing an invalid RIL_REQUEST_SETUP_DATA_CALL reply with
+ * with a NULL string specified for 'dns':
+ *
+ * {version=7,num=1 [status=0,retry=-1,cid=0,active=2,type=IP
+ * ifname=rmnet_usb0,address=10.181.235.154/30,
+ * dns=NULL,gateways=10.181.235.153]}
+ */
+static const guchar reply_data_call_invalid_parcel7[144] = {
+	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
+	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
+	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_call_invalid_7 = {
+	.buf = (gchar *) &reply_data_call_invalid_parcel7,
+	.buf_len = 144,
+};
+
+/*
+ * The following hexadecimal data represents a serialized Binder parcel
+ * instance containing a valid RIL_REQUEST_SETUP_DATA_CALL reply with the
+ * following parameters:
+ *
+ * {version=7,num=1 [status=0,retry=-1,cid=0,active=2,type=IP,
+ * ifname=rmnet_usb0,address=10.181.235.154/30,
+ * dns=172.16.145.103 172.16.145.103,gateways=10.181.235.153]}
+ */
+static const guchar reply_data_call_valid_parcel1[204] = {
+	0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff,	0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00,	0x00, 0x00, 0x00, 0x00,
+	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
+	0x74, 0x00, 0x5f, 0x00, 0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00,	0x11, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x38, 0x00, 0x31, 0x00,	0x2e, 0x00, 0x32, 0x00,
+	0x33, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00,
+	0x2f, 0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x37, 0x00,	0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x35, 0x00, 0x2e, 0x00,	0x31, 0x00, 0x30, 0x00, 0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00,	0x2e, 0x00, 0x31, 0x00,
+	0x38, 0x00, 0x31, 0x00, 0x2e, 0x00, 0x32, 0x00, 0x33, 0x00, 0x35, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg reply_data_call_valid_1 = {
+	.buf = (gchar *) &reply_data_call_valid_parcel1,
+	.buf_len = 204,
+	.unsolicited = FALSE,
+	.req = RIL_REQUEST_SETUP_DATA_CALL,
+	.serial_no = 0,
+	.error = 0,
+};
+
+static void test_reply_data_call_invalid(gconstpointer data)
+{
+	/* TODO: fix de-const cast... */
+	struct ril_msg *message = (struct ril_msg *) data;
+	struct ofono_error error;
+	struct reply_setup_data_call *reply;
+
+	reply = g_ril_reply_parse_data_call(NULL, message, &error);
+	g_assert(reply != NULL);
+	g_ril_reply_free_setup_data_call(reply);
+
+	g_assert(error.type == OFONO_ERROR_TYPE_FAILURE &&
+			error.error == -EINVAL);
+}
+
+static void test_reply_data_call_valid(gconstpointer data)
+{
+	/* TODO: fix de-const cast... */
+	struct ril_msg *message = (struct ril_msg *) data;
+	struct ofono_error error;
+	struct reply_setup_data_call *reply;
+
+	reply = g_ril_reply_parse_data_call(NULL, message, &error);
+	g_assert(reply != NULL);
+	g_ril_reply_free_setup_data_call(reply);
+
+	g_assert(error.type == OFONO_ERROR_TYPE_NO_ERROR &&
+			error.error == 0);
+}
+
+int main(int argc, char **argv)
+{
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 1",
+				&reply_data_call_invalid_1,
+				test_reply_data_call_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 2",
+				&reply_data_call_invalid_2,
+				test_reply_data_call_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 3",
+				&reply_data_call_invalid_3,
+				test_reply_data_call_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 4",
+				&reply_data_call_invalid_4,
+				test_reply_data_call_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 5",
+				&reply_data_call_invalid_5,
+				test_reply_data_call_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 6",
+				&reply_data_call_invalid_6,
+				test_reply_data_call_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 7",
+				&reply_data_call_invalid_7,
+				test_reply_data_call_invalid);
+
+	g_test_add_data_func("/testgrilreply/gprs-context: "
+				"valid SETUP_DATA_CALL Test 1",
+				&reply_data_call_valid_1,
+				test_reply_data_call_valid);
+
+
+	return g_test_run();
+}

=== added file 'unit/test-grilrequest.c'
--- unit/test-grilrequest.c	1970-01-01 00:00:00 +0000
+++ unit/test-grilrequest.c	2013-07-28 19:18:23 +0000
@@ -0,0 +1,312 @@
+/*
+ *
+ *  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 <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include <glib.h>
+#include <errno.h>
+
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+#include <ofono/types.h>
+
+#include "grilrequest.h"
+
+struct request_test_data {
+	gconstpointer request;
+	guchar *parcel_data;
+	gsize parcel_size;
+};
+
+/*
+ * TODO: It may make sense to split this file into
+ * domain-specific files ( eg. test-grilrequest-gprs-context.c )
+ * once more tests are added.
+ */
+
+static const struct req_deactivate_data_call req_deact_data_call_invalid_1 = {
+	.cid = 1,
+	.reason = 10,
+};
+
+/*
+ * The following hexadecimal data represents a serialized Binder parcel
+ * instance containing a valid RIL_REQUEST_DEACTIVATE_DATA_CALL message
+ * with the following parameters:
+ *
+ * (cid=1,reason=0)
+ */
+static const guchar req_deact_data_call_valid_parcel1[20] = {
+	0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00,
+	0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00
+};
+
+static const struct req_deactivate_data_call req_deact_data_call_valid_1 = {
+	.cid = 1,
+	.reason = RIL_DEACTIVATE_DATA_CALL_NO_REASON,
+};
+
+static const struct request_test_data deact_data_call_valid_test_1 = {
+	.request = &req_deact_data_call_valid_1,
+	.parcel_data = (guchar *) &req_deact_data_call_valid_parcel1,
+	.parcel_size = 20,
+};
+
+
+static const struct req_setup_data_call req_setup_data_call_invalid_1 = {
+	.tech = RADIO_TECH_UNKNOWN,
+};
+
+static const struct req_setup_data_call req_setup_data_call_invalid_2 = {
+	.tech = 2112,
+};
+
+static const struct req_setup_data_call req_setup_data_call_invalid_3 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = 5,
+};
+
+static const struct req_setup_data_call req_setup_data_call_invalid_4 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = NULL,
+};
+
+static const struct req_setup_data_call req_setup_data_call_invalid_5 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "",
+};
+
+static const struct req_setup_data_call req_setup_data_call_invalid_6 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "",
+	.apn = "12345678901234567890123456789012345678901234567890"
+	"123456789012345678901234567890123456789012345678901",
+};
+
+static const struct req_setup_data_call req_setup_data_call_invalid_7 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "test.apn",
+	.auth_type = 4,
+};
+
+static const struct req_setup_data_call req_setup_data_call_invalid_8 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "test.apn",
+	.auth_type = RIL_AUTH_BOTH,
+	.protocol = 3,
+};
+
+static const struct req_setup_data_call req_setup_data_call_valid_1 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "test.apn",
+	.username = NULL,
+	.password = NULL,
+	.auth_type = RIL_AUTH_BOTH,
+	.protocol = OFONO_GPRS_PROTO_IP,
+
+};
+
+static const struct req_setup_data_call req_setup_data_call_valid_2 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "test.apn",
+	.username = "",
+	.password = "",
+	.auth_type = RIL_AUTH_NONE,
+	.protocol = OFONO_GPRS_PROTO_IP,
+};
+
+static const struct req_setup_data_call req_setup_data_call_valid_3 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "test.apn",
+	.username = "phablet",
+	.password = "phablet",
+	.auth_type = RIL_AUTH_BOTH,
+	.protocol = OFONO_GPRS_PROTO_IPV4V6,
+};
+
+static const struct req_setup_data_call req_setup_data_call_valid_4 = {
+	.tech = RADIO_TECH_GPRS,
+	.data_profile = RIL_DATA_PROFILE_DEFAULT,
+	.apn = "test.apn",
+	.username = "phablet",
+	.password = "phablet",
+	.auth_type = RIL_AUTH_BOTH,
+	.protocol = OFONO_GPRS_PROTO_IPV6,
+};
+
+static void test_deactivate_data_call_invalid(gconstpointer data)
+{
+	const struct req_deactivate_data_call *request = data;
+	gboolean result;
+	struct parcel rilp;
+	struct ofono_error error;
+
+	/*
+	 * No parcel_init needed, as these tests all fail during
+	 * param validation
+	 */
+	result = g_ril_request_deactivate_data_call(NULL, request, &rilp, &error);
+	g_assert(result == FALSE);
+	g_assert(error.type == OFONO_ERROR_TYPE_FAILURE &&
+			error.error == -EINVAL);
+}
+
+static void test_deactivate_data_call_valid(gconstpointer data)
+{
+	const struct request_test_data *test_data = data;
+	const struct req_deactivate_data_call *request = test_data->request;
+	gboolean result;
+	struct parcel rilp;
+	struct ofono_error error;
+
+	result = g_ril_request_deactivate_data_call(NULL, request, &rilp, &error);
+	g_assert(result == TRUE);
+	g_assert(error.type == OFONO_ERROR_TYPE_NO_ERROR &&
+			error.error == 0);
+
+	g_assert(!memcmp(rilp.data, test_data->parcel_data, test_data->parcel_size));
+
+	parcel_free(&rilp);
+}
+
+static void test_request_setup_data_call_invalid(gconstpointer data)
+{
+	const struct req_setup_data_call *request = data;
+	gboolean result;
+	struct parcel rilp;
+	struct ofono_error error;
+
+	/*
+	 * No parcel_init needed, as these tests all fail during
+	 * param validation
+	 */
+	result = g_ril_request_setup_data_call(NULL, request, &rilp, &error);
+	g_assert(result == FALSE);
+	g_assert(error.type == OFONO_ERROR_TYPE_FAILURE &&
+			error.error == -EINVAL);
+}
+
+static void test_request_setup_data_call_valid(gconstpointer data)
+{
+	const struct req_setup_data_call *request = data;
+	gboolean result;
+	struct parcel rilp;
+	struct ofono_error error;
+
+	result = g_ril_request_setup_data_call(NULL, request, &rilp, &error);
+	g_assert(result == TRUE);
+	g_assert(error.type == OFONO_ERROR_TYPE_NO_ERROR &&
+			error.error == 0);
+
+	parcel_free(&rilp);
+
+	/* TODO: add unit 3 tests to validate binary parcel result */
+}
+
+int main(int argc, char **argv)
+{
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid DEACTIVATE_DATA_CALL Test 1",
+				&req_deact_data_call_invalid_1,
+				test_deactivate_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid DEACTIVATE_DATA_CALL Test 1",
+				&deact_data_call_valid_test_1,
+				test_deactivate_data_call_valid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 1",
+				&req_setup_data_call_invalid_1,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 2",
+				&req_setup_data_call_invalid_2,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 3",
+				&req_setup_data_call_invalid_3,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 4",
+				&req_setup_data_call_invalid_4,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 5",
+				&req_setup_data_call_invalid_5,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 6",
+				&req_setup_data_call_invalid_6,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 7",
+				&req_setup_data_call_invalid_7,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid SETUP_DATA_CALL Test 8",
+				&req_setup_data_call_invalid_8,
+				test_request_setup_data_call_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid SETUP_DATA_CALL Test 1",
+				&req_setup_data_call_valid_1,
+				test_request_setup_data_call_valid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid SETUP_DATA_CALL Test 2",
+				&req_setup_data_call_valid_2,
+				test_request_setup_data_call_valid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid SETUP_DATA_CALL Test 3",
+				&req_setup_data_call_valid_3,
+				test_request_setup_data_call_valid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid SETUP_DATA_CALL Test 4",
+				&req_setup_data_call_valid_4,
+				test_request_setup_data_call_valid);
+
+	return g_test_run();
+}

=== added file 'unit/test-grilunsol.c'
--- unit/test-grilunsol.c	1970-01-01 00:00:00 +0000
+++ unit/test-grilunsol.c	2013-07-28 19:18:23 +0000
@@ -0,0 +1,138 @@
+/*
+ *
+ *  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 <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include <glib.h>
+#include <errno.h>
+
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+#include <ofono/types.h>
+
+#include "gril.h"
+#include "grilunsol.h"
+
+/*
+ * TODO: It may make sense to split this file into
+ * domain-specific files ( eg. test-grilrequest-gprs-context.c )
+ * once more tests are added.
+ */
+
+static const struct ril_msg unsol_data_call_list_changed_invalid_1 = {
+	.buf = "",
+	.buf_len = 0,
+	.unsolicited = TRUE,
+	.req = RIL_UNSOL_DATA_CALL_LIST_CHANGED,
+	.serial_no = 0,
+	.error = 0,
+};
+
+/*
+ * The following hexadecimal data represents a serialized Binder parcel
+ * instance containing a valid RIL_UNSOL_DATA_CALL_LIST_CHANGED message
+ * with the following parameters:
+ *
+ * (version=7,num=1 [status=0,retry=-1,cid=0,active=1,type=IP,
+ * ifname=rmnet_usb0,address=10.209.114.102/30,
+ * dns=172.16.145.103 172.16.145.103,gateways=10.209.114.101]}
+ */
+static const guchar unsol_data_call_list_changed_parcel1[216] = {
+	0x00, 0x00, 0x00, 0xd4, 0x01, 0x00, 0x00, 0x00, 0xf2, 0x03, 0x00, 0x00,
+	0x07, 0x00, 0x00, 0x00,	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,	0x01, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x49, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0a, 0x00, 0x00, 0x00, 0x72, 0x00, 0x6d, 0x00, 0x6e, 0x00, 0x65, 0x00,
+	0x74, 0x00, 0x5f, 0x00,	0x75, 0x00, 0x73, 0x00, 0x62, 0x00, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,	0x31, 0x00, 0x30, 0x00,
+	0x2e, 0x00, 0x32, 0x00, 0x30, 0x00, 0x39, 0x00, 0x2e, 0x00, 0x31, 0x00,
+	0x31, 0x00, 0x34, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x30, 0x00, 0x32, 0x00,
+	0x2f, 0x00, 0x33, 0x00,	0x30, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00,
+	0x31, 0x00, 0x37, 0x00, 0x32, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x36, 0x00,
+	0x2e, 0x00, 0x31, 0x00, 0x34, 0x00, 0x35, 0x00, 0x2e, 0x00, 0x31, 0x00,
+	0x30, 0x00, 0x33, 0x00, 0x20, 0x00, 0x31, 0x00, 0x37, 0x00, 0x32, 0x00,
+	0x2e, 0x00, 0x31, 0x00,	0x36, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x35, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x30, 0x00,	0x33, 0x00, 0x00, 0x00,
+	0x0e, 0x00, 0x00, 0x00, 0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x32, 0x00,
+	0x30, 0x00, 0x39, 0x00, 0x2e, 0x00, 0x31, 0x00, 0x31, 0x00, 0x34, 0x00,
+	0x2e, 0x00, 0x31, 0x00,	0x30, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct ril_msg unsol_data_call_list_changed_valid_1 = {
+	.buf = (gchar *) &unsol_data_call_list_changed_parcel1,
+	.buf_len = 216,
+	.unsolicited = TRUE,
+	.req = RIL_UNSOL_DATA_CALL_LIST_CHANGED,
+	.serial_no = 0,
+	.error = 0,
+};
+
+static void test_unsol_data_call_list_changed_invalid(gconstpointer data)
+{
+	/* TODO: fix de-const cast... */
+	const struct ril_msg *message = (struct ril_msg *) data;
+	struct ofono_error error;
+	struct unsol_data_call_list *unsol;
+
+        unsol = g_ril_unsol_parse_data_call_list(NULL, message, &error);
+	g_assert(unsol != NULL);
+	g_ril_unsol_free_data_call_list(unsol);
+
+	g_assert(error.type == OFONO_ERROR_TYPE_FAILURE &&
+			error.error == -EINVAL);
+}
+
+static void test_unsol_data_call_list_changed_valid(gconstpointer data)
+{
+	/* TODO: fix de-const cast... */
+	const struct ril_msg *message = (struct ril_msg *) data;
+	struct ofono_error error;
+	struct unsol_data_call_list *unsol;
+
+        unsol = g_ril_unsol_parse_data_call_list(NULL, message, &error);
+	g_assert(unsol != NULL);
+	g_ril_unsol_free_data_call_list(unsol);
+
+	g_assert(error.type == OFONO_ERROR_TYPE_NO_ERROR &&
+			error.error == 0);
+}
+
+int main(int argc, char **argv)
+{
+	g_test_init(&argc, &argv, NULL);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"invalid DATA_CALL_LIST_CHANGED Test 1",
+				&unsol_data_call_list_changed_invalid_1,
+				test_unsol_data_call_list_changed_invalid);
+
+	g_test_add_data_func("/testgrilrequest/gprs-context: "
+				"valid DATA_CALL_LIST_CHANGED Test 1",
+				&unsol_data_call_list_changed_valid_1,
+				test_unsol_data_call_list_changed_valid);
+
+	return g_test_run();
+}