Merge pull request #241 from jpoutiai/master

[RILMODEM] PB crash fix

ofono/AUTHORS

@@ -92,3 +92,7 @@ Jesper Larsen <jesper.larsen@ixonos.com>
 Slava Monich <slava.monich@jolla.com>
 Andrew Earl <andrewx.earl@intel.com>
 Krzysztof Wilk <krzysztofx.wilk@intel.com>
+Tony Espy <espy@canonical.com>
+Martin Pitt <martin.pitt@ubuntu.com>
+Alfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com>
+Jussi Pakkanen <jussi.pakkanen@canonical.com>

ofono/Makefile.am

@@ -142,7 +142,9 @@ builtin_sources += drivers/rilmodem/rilmodem.h \
 			drivers/rilmodem/call-settings.c \
 			drivers/rilmodem/call-forwarding.c \
 			drivers/rilmodem/cbs.c \
-			drivers/rilmodem/oemraw-messages.c
+			drivers/rilmodem/oemraw-messages.c \
+			drivers/rilmodem/call-barring.c \
+			drivers/rilmodem/stk.c
 
 endif
 
@@ -512,7 +514,7 @@ if PROVISION
 builtin_sources += plugins/mbpi.h plugins/mbpi.c
 
 builtin_modules += provision
-builtin_sources += plugins/provision.c
+builtin_sources += plugins/provision.h plugins/provision.c
 
 builtin_modules += cdma_provision
 builtin_sources += plugins/cdma-provision.c
@@ -547,6 +549,13 @@ builtin_sources += plugins/smart-messaging.c
 builtin_modules += push_notification
 builtin_sources += plugins/push-notification.c
 
+if PUSHFORWARDER
+builtin_modules += push_forwarder
+builtin_sources += plugins/push-forwarder.c
+builtin_cflags += @WSPCODEC_CFLAGS@
+builtin_libadd += @WSPCODEC_LIBS@
+endif
+
 builtin_modules += sms_history
 builtin_sources += plugins/smshistory.c
 
@@ -578,7 +587,7 @@ src_ofonod_SOURCES = $(builtin_sources) src/ofono.ver \
 			src/cdma-provision.c src/handsfree.c \
 			src/handsfree-audio.c src/bluetooth.h \
 			src/hfp.h src/sim-mnclength.c src/oemraw.c \
-			src/siri.c
+			src/siri.c src/voicecallagent.c
 
 src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
@@ -711,13 +720,16 @@ test_scripts = test/backtrace \
 		test/set-context-property \
 		test/test-gnss \
 		test/swap-calls \
+		test/transfer-call \
 		test/release-and-answer \
 		test/release-and-swap \
 		test/hold-and-answer \
 		test/hangup-multiparty \
 		test/hangup-call \
 		test/display-icon \
-		test/set-msisdn
+		test/set-msisdn \
+		test/test-voicecallagent \
+		test/get-network-time
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -738,7 +750,8 @@ unit_tests = unit/test-common unit/test-util unit/test-idmap \
 				unit/test-grilrequest \
 				unit/test-grilreply \
 				unit/test-grilunsol \
-				unit/test-sms unit/test-cdmasms
+				unit/test-sms unit/test-cdmasms \
+				unit/test-provision
 
 noinst_PROGRAMS = $(unit_tests) \
 			unit/test-sms-root unit/test-mux unit/test-caif
@@ -805,6 +818,13 @@ unit_test_grilunsol_SOURCES = unit/test-grilunsol.c $(gril_sources) \
 unit_test_grilunsol_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_grilunsol_OBJECTS)
 
+unit_test_provision_SOURCES = unit/test-provision.c \
+				plugins/provision.h plugins/provision.c \
+				plugins/mbpi.c src/gprs-provision.c \
+				src/log.c
+unit_test_provision_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_provision_OBJECTS)
+
 TESTS = $(unit_tests)
 
 if TOOLS

ofono/configure.ac

@@ -192,7 +192,10 @@ AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
 AC_ARG_ENABLE(nettime, AC_HELP_STRING([--disable-nettime],
                                 [disable Nettime plugin]),
                                         [enable_nettime=${enableval}])
-AM_CONDITIONAL(NETTIME, test "${enable_netttime}" != "no")
+if (test "${enable_nettime}" != "no"); then
+	AC_SEARCH_LIBS([clock_gettime], [rt])
+fi
+AM_CONDITIONAL(NETTIME, test "${enable_nettime}" != "no")
 
 AC_ARG_WITH([provisiondb], AC_HELP_STRING([--with-provisiondb=FILE],
 	[location of provision database]), [path_provisiondb=${withval}])
@@ -223,6 +226,17 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 					[enable_datafiles=${enableval}])
 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
 
+AC_ARG_ENABLE(pushforwarder, AC_HELP_STRING([--disable-pushforwarder],
+                                [disable Push Forwarder plugin]),
+                                        [enable_pushforwarder=${enableval}])
+AM_CONDITIONAL(PUSHFORWARDER, test "${enable_pushforwarder}" != "no")
+if (test "${enable_pushforwarder}" != "no"); then
+	PKG_CHECK_MODULES(WSPCODEC, libwspcodec >= 2.0, dummy=yes,
+		AC_MSG_ERROR(WSP decoder is required))
+	AC_SUBST(WSPCODEC_CFLAGS)
+	AC_SUBST(WSPCODEC_LIBS)
+fi
+
 if (test "${prefix}" = "NONE"); then
 	dnl no prefix and no localstatedir, so default to /var
 	if (test "$localstatedir" = '${prefix}/var'); then

ofono/doc/handsfree-api.txt

@@ -45,6 +45,12 @@ Properties	array{string} Features [readonly]
 				"voice-recognition"
 				"attach-voice-tag"
 				"echo-canceling-and-noise-reduction"
+				"three-way-calling"
+				"release-all-held"
+				"release-specified-active-call"
+				"private-chat"
+				"create-multiparty"
+				"transfer"
 
 		boolean InbandRinging [readonly]
 
@@ -70,3 +76,7 @@ Properties	array{string} Features [readonly]
 
 			The current charge level of the battery.  The value
 			can be between 0 and 5 respectively.
+
+		array{string} SubscriberNumbers [readonly]
+
+			List of subscriber numbers provided by the AG.

ofono/doc/voicecallmanager-api.txt

@@ -198,6 +198,25 @@ Methods		dict GetProperties()
 					 [service].Error.InvalidFormat
 					 [service].Error.Failed
 
+		void RegisterVoicecallAgent(object path)
+
+			Registers an agent which will be called whenever a
+			specific voice call related event requiring a client
+			action occurs. Currently, the only such action is
+			playing a ringback tone locally.
+
+			Possible Errors: [service].Error.InProgress
+					 [service].Error.InvalidArguments
+					 [service].Error.InvalidFormat
+					 [service].Error.Failed
+
+		void UnregisterVoicecallAgent(object path)
+
+			Unregisters an agent.
+
+			Possible Errors: [service].Error.InvalidArguments
+					 [service].Error.Failed
+
 Signals		CallAdded(object path, dict properties)
 
 			Signal that is sent when a new call is added.  It
@@ -257,3 +276,26 @@ Properties	array{string} EmergencyNumbers [readonly]
 			of numbers provided by the specification and any
 			extra numbers provisioned by the carrier on the
 			SIM.
+
+VoiceCallAgent Hierarchy
+========================
+
+Service		unique name
+Interface	org.ofono.VoiceCallAgent
+Object path	freely definable
+
+Methods		void RingbackTone(boolean playTone)
+
+			Requests the client to generate an alerting tone locally
+			(3GPP 24.008; 5.2.1.5). This can happen when an outgoing
+			voice call is made and network is not providing the
+			alerting tone. Value 0 stands for "stop playing ringback
+			tone" and 1 for "start playing ringback tone".
+
+		void Release() [noreply]
+
+			Agent is being released, possibly because of oFono
+			terminating, voicecall interface is being torn down or
+			modem is switched off. No UnregisterVoicecallAgent
+			call is needed.
+

ofono/drivers/hfpmodem/handsfree.c

@@ -49,6 +49,7 @@ static const char *bvra_prefix[] = { "+BVRA:", NULL };
 struct hf_data {
 	GAtChat *chat;
 	unsigned int ag_features;
+	unsigned int ag_chld_features;
 	int battchg_index;
 	guint register_source;
 };
@@ -124,6 +125,87 @@ static void ciev_notify(GAtResult *result, gpointer user_data)
 	ofono_handsfree_battchg_notify(hf, value);
 }
 
+static void cnum_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_handsfree_cnum_query_cb_t cb = cbd->cb;
+	GAtResultIter iter;
+	struct ofono_phone_number *list = NULL;
+	int num = 0;
+	struct ofono_error error;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok)
+		goto out;
+
+	g_at_result_iter_init(&iter, result);
+
+	while (g_at_result_iter_next(&iter, "+CNUM:"))
+		num++;
+
+	if (num == 0)
+		goto out;
+
+	list = g_new0(struct ofono_phone_number, num);
+
+	g_at_result_iter_init(&iter, result);
+
+	for (num = 0; g_at_result_iter_next(&iter, "+CNUM:"); ) {
+		const char *number;
+		int service;
+		int type;
+
+		if (!g_at_result_iter_skip_next(&iter))
+			continue;
+
+		if (!g_at_result_iter_next_string(&iter, &number))
+			continue;
+
+		if (!g_at_result_iter_next_number(&iter, &type))
+			continue;
+
+		if (!g_at_result_iter_skip_next(&iter))
+			continue;
+
+		if (!g_at_result_iter_next_number(&iter, &service))
+			continue;
+
+		/* We are only interested in Voice services */
+		if (service != 4)
+			continue;
+
+		strncpy(list[num].number, number,
+				OFONO_MAX_PHONE_NUMBER_LENGTH);
+		list[num].number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
+		list[num].type = type;
+
+		DBG("cnum_notify:%s", list[num].number);
+		num++;
+	}
+
+out:
+	cb(&error, num, list, cbd->data);
+
+	g_free(list);
+
+}
+
+static void hfp_cnum_query(struct ofono_handsfree *hf,
+				ofono_handsfree_cnum_query_cb_t cb, void *data)
+{
+	struct hf_data *hd = ofono_handsfree_get_data(hf);
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	if (g_at_chat_send(hd->chat, "AT+CNUM", NULL,
+					cnum_query_cb, cbd, g_free) > 0)
+		return;
+
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, -1, NULL, data);
+}
+
 static gboolean hfp_handsfree_register(gpointer user_data)
 {
 	struct ofono_handsfree *hf = user_data;
@@ -139,6 +221,7 @@ static gboolean hfp_handsfree_register(gpointer user_data)
 		ofono_handsfree_set_inband_ringing(hf, TRUE);
 
 	ofono_handsfree_set_ag_features(hf, hd->ag_features);
+	ofono_handsfree_set_ag_chld_features(hf, hd->ag_chld_features);
 	ofono_handsfree_register(hf);
 
 	return FALSE;
@@ -154,6 +237,7 @@ static int hfp_handsfree_probe(struct ofono_handsfree *hf,
 	hd = g_new0(struct hf_data, 1);
 	hd->chat = g_at_chat_clone(info->chat);
 	hd->ag_features = info->ag_features;
+	hd->ag_chld_features = info->ag_mpty_features;
 
 	ofono_handsfree_set_data(hf, hd);
 
@@ -280,6 +364,7 @@ static struct ofono_handsfree_driver driver = {
 	.name			= "hfpmodem",
 	.probe			= hfp_handsfree_probe,
 	.remove			= hfp_handsfree_remove,
+	.cnum_query		= hfp_cnum_query,
 	.request_phone_number	= hfp_request_phone_number,
 	.voice_recognition	= hfp_voice_recognition,
 	.disable_nrec		= hfp_disable_nrec,

ofono/drivers/hfpmodem/slc.c

@@ -128,19 +128,19 @@ static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)
 
 	while (g_at_result_iter_next_unquoted_string(&iter, &str)) {
 		if (!strcmp(str, "0"))
-			ag_mpty_feature |= AG_CHLD_0;
+			ag_mpty_feature |= HFP_AG_CHLD_0;
 		else if (!strcmp(str, "1"))
-			ag_mpty_feature |= AG_CHLD_1;
+			ag_mpty_feature |= HFP_AG_CHLD_1;
 		else if (!strcmp(str, "1x"))
-			ag_mpty_feature |= AG_CHLD_1x;
+			ag_mpty_feature |= HFP_AG_CHLD_1x;
 		else if (!strcmp(str, "2"))
-			ag_mpty_feature |= AG_CHLD_2;
+			ag_mpty_feature |= HFP_AG_CHLD_2;
 		else if (!strcmp(str, "2x"))
-			ag_mpty_feature |= AG_CHLD_2x;
+			ag_mpty_feature |= HFP_AG_CHLD_2x;
 		else if (!strcmp(str, "3"))
-			ag_mpty_feature |= AG_CHLD_3;
+			ag_mpty_feature |= HFP_AG_CHLD_3;
 		else if (!strcmp(str, "4"))
-			ag_mpty_feature |= AG_CHLD_4;
+			ag_mpty_feature |= HFP_AG_CHLD_4;
 	}
 
 	if (!g_at_result_iter_close_list(&iter))

ofono/drivers/hfpmodem/slc.h

@@ -19,14 +19,6 @@
  *
  */
 
-#define AG_CHLD_0	0x01
-#define AG_CHLD_1	0x02
-#define AG_CHLD_1x	0x04
-#define AG_CHLD_2	0x08
-#define AG_CHLD_2x	0x10
-#define AG_CHLD_3	0x20
-#define AG_CHLD_4	0x40
-
 enum hfp_indicator {
 	HFP_INDICATOR_SERVICE = 0,
 	HFP_INDICATOR_CALL,

ofono/drivers/hfpmodem/voicecall.c

@@ -37,6 +37,7 @@
 #include <ofono/voicecall.h>
 
 #include "common.h"
+#include "hfp.h"
 
 #include "hfpmodem.h"
 #include "slc.h"
@@ -447,7 +448,7 @@ static void hfp_hold_all_active(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 
-	if (vd->ag_mpty_features & AG_CHLD_2) {
+	if (vd->ag_mpty_features & HFP_AG_CHLD_2) {
 		hfp_template("AT+CHLD=2", vc, generic_cb, 0, cb, data);
 		return;
 	}
@@ -461,7 +462,7 @@ static void hfp_release_all_held(struct ofono_voicecall *vc,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int held_status = 1 << CALL_STATUS_HELD;
 
-	if (vd->ag_mpty_features & AG_CHLD_0) {
+	if (vd->ag_mpty_features & HFP_AG_CHLD_0) {
 		hfp_template("AT+CHLD=0", vc, generic_cb, held_status,
 				cb, data);
 		return;
@@ -476,7 +477,7 @@ static void hfp_set_udub(struct ofono_voicecall *vc,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	unsigned int incoming_or_waiting = 1 << CALL_STATUS_WAITING;
 
-	if (vd->ag_mpty_features & AG_CHLD_0) {
+	if (vd->ag_mpty_features & HFP_AG_CHLD_0) {
 		hfp_template("AT+CHLD=0", vc, generic_cb, incoming_or_waiting,
 				cb, data);
 		return;
@@ -528,7 +529,7 @@ static void hfp_release_all_active(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 
-	if (vd->ag_mpty_features & AG_CHLD_1) {
+	if (vd->ag_mpty_features & HFP_AG_CHLD_1) {
 		hfp_template("AT+CHLD=1", vc, release_all_active_cb, 0x1, cb,
 									data);
 		return;
@@ -559,7 +560,7 @@ static void hfp_release_specific(struct ofono_voicecall *vc, int id,
 	struct release_id_req *req = NULL;
 	char buf[32];
 
-	if (!(vd->ag_mpty_features & AG_CHLD_1x))
+	if (!(vd->ag_mpty_features & HFP_AG_CHLD_1x))
 		goto error;
 
 	req = g_try_new0(struct release_id_req, 1);
@@ -590,7 +591,7 @@ static void hfp_private_chat(struct ofono_voicecall *vc, int id,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	char buf[32];
 
-	if (vd->ag_mpty_features & AG_CHLD_2x) {
+	if (vd->ag_mpty_features & HFP_AG_CHLD_2x) {
 		snprintf(buf, sizeof(buf), "AT+CHLD=2%d", id);
 
 		hfp_template(buf, vc, generic_cb, 0, cb, data);
@@ -606,7 +607,7 @@ static void hfp_create_multiparty(struct ofono_voicecall *vc,
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 
-	if (vd->ag_mpty_features & AG_CHLD_3) {
+	if (vd->ag_mpty_features & HFP_AG_CHLD_3) {
 		hfp_template("AT+CHLD=3", vc, generic_cb, 0, cb, data);
 
 		return;
@@ -625,7 +626,7 @@ static void hfp_transfer(struct ofono_voicecall *vc,
 	 */
 	unsigned int transfer = 0x1 | 0x2 | 0x4 | 0x8;
 
-	if (vd->ag_mpty_features & AG_CHLD_4) {
+	if (vd->ag_mpty_features & HFP_AG_CHLD_4) {
 		hfp_template("AT+CHLD=4", vc, generic_cb, transfer, cb, data);
 
 		return;

ofono/drivers/rilmodem/call-barring.c

@@ -0,0 +1,310 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2014 Jolla Ltd
+ *  Contact: Miia Leinonen
+ *
+ *  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
+ *
+ */
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+
+#include "common.h"
+#include "gril.h"
+#include "call-barring.h"
+#include "rilmodem.h"
+#include "ril_constants.h"
+
+/* See 3GPP 27.007 7.4 for possible values */
+#define RIL_MAX_SERVICE_LENGTH 3
+
+/*
+ * ril.h does not state that string count must be given, but that is
+ * still expected by the modem
+ */
+#define RIL_QUERY_STRING_COUNT 4
+#define RIL_SET_STRING_COUNT 5
+#define RIL_SET_PW_STRING_COUNT 3
+
+#define RIL_LENGTH_ZERO 0
+
+struct barring_data {
+	GRil *ril;
+	guint timer_id;
+};
+
+static void ril_call_barring_query_cb(struct ril_msg *message,
+					gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct parcel rilp;
+	struct ofono_error error;
+	ofono_call_barring_query_cb_t cb = cbd->cb;
+	int bearer_class = 0;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("Call Barring query failed, err: %i",
+			message->error);
+		decode_ril_error(&error, "FAIL");
+		goto out;
+	}
+
+	ril_util_init_parcel(message, &rilp);
+
+	/*
+	 * Services for which the specified barring facility is active.
+	 * "0" means "disabled for all, -1 if unknown"
+	 */
+	parcel_r_int32(&rilp); /* count - we know there is only 1 */
+	bearer_class = parcel_r_int32(&rilp);
+	DBG("Active services: %i", bearer_class);
+
+	decode_ril_error(&error, "OK");
+
+out:
+	cb(&error, bearer_class, cbd->data);
+}
+
+static void ril_call_barring_query(struct ofono_call_barring *cb,
+					const char *lock, int cls,
+					ofono_call_barring_query_cb_t callback,
+					void *data)
+{
+	struct barring_data *bd = ofono_call_barring_get_data(cb);
+	struct cb_data *cbd = cb_data_new(callback, data);
+	struct parcel rilp;
+	int ret = 0;
+	char cls_textual[RIL_MAX_SERVICE_LENGTH];
+
+	DBG("lock: %s, services to query: %i", lock, cls);
+
+	/*
+	 * RIL modems do not support 7 as default bearer class. According to
+	 * the 22.030 Annex C: When service code is not given it corresponds to
+	 * "All tele and bearer services"
+	 */
+	if (cls == BEARER_CLASS_DEFAULT)
+		cls = SERVICE_CLASS_NONE;
+
+	sprintf(cls_textual, "%d", cls);
+
+	/*
+	 * See 3GPP 27.007 7.4 for parameter descriptions.
+	 * According to ril.h password should be empty string "" when not
+	 * needed, but in reality we only need to give string length as 0
+	 */
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, RIL_QUERY_STRING_COUNT);	/* Nbr of strings */
+	parcel_w_string(&rilp, (char *) lock);		/* Facility code */
+	parcel_w_int32(&rilp, RIL_LENGTH_ZERO);		/* Password length */
+	parcel_w_string(&rilp, (char *) cls_textual);
+	parcel_w_string(&rilp, NULL); /* AID (for FDN, not yet supported) */
+
+	ret = g_ril_send(bd->ril, RIL_REQUEST_QUERY_FACILITY_LOCK,
+			rilp.data, rilp.size, ril_call_barring_query_cb,
+			cbd, g_free);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		ofono_error("Sending Call Barring query failed, err: %i", ret);
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(callback, -1, data);
+	}
+}
+
+static void ril_call_barring_set_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_error error;
+	ofono_call_barring_set_cb_t cb = cbd->cb;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("Call Barring Set request failed, err: %i",
+				message->error);
+		decode_ril_error(&error, "FAIL");
+		goto out;
+	}
+
+	decode_ril_error(&error, "OK");
+
+out:
+	cb(&error, cbd->data);
+}
+
+static void ril_call_barring_set(struct ofono_call_barring *cb,
+				const char *lock, int enable,
+				const char *passwd, int cls,
+				ofono_call_barring_set_cb_t callback,
+				void *data)
+{
+	struct barring_data *bd = ofono_call_barring_get_data(cb);
+	struct cb_data *cbd = cb_data_new(callback, data);
+	struct parcel rilp;
+	int ret = 0;
+	char cls_textual[RIL_MAX_SERVICE_LENGTH];
+
+	DBG("lock: %s, enable: %i, bearer class: %i", lock, enable, cls);
+
+	/*
+	 * RIL modem does not support 7 as default bearer class. According to
+	 * the 22.030 Annex C: When service code is not given it corresponds to
+	 * "All tele and bearer services"
+	 */
+	if (cls == BEARER_CLASS_DEFAULT)
+		cls = SERVICE_CLASS_NONE;
+
+	sprintf(cls_textual, "%d", cls);
+
+	/* See 3GPP 27.007 7.4 for parameter descriptions */
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, RIL_SET_STRING_COUNT);	/* Nbr of strings */
+	parcel_w_string(&rilp, (char *) lock);		/* Facility code */
+
+	if (enable)
+		parcel_w_string(&rilp, RIL_FACILITY_LOCK);
+	else
+		parcel_w_string(&rilp, RIL_FACILITY_UNLOCK);
+
+	parcel_w_string(&rilp, (char *) passwd);
+	parcel_w_string(&rilp, (char *) cls_textual);
+	parcel_w_string(&rilp, NULL);	/* AID (for FDN, not yet supported) */
+
+	ret = g_ril_send(bd->ril, RIL_REQUEST_SET_FACILITY_LOCK,
+			rilp.data, rilp.size, ril_call_barring_set_cb,
+			cbd, g_free);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		ofono_error("Sending Call Barring Set request failed, err: %i",
+				ret);
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(callback, data);
+	}
+}
+
+static void ril_call_barring_set_passwd_cb(struct ril_msg *message,
+						gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_error error;
+	ofono_call_barring_set_cb_t cb = cbd->cb;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("Call Barring Set PW req failed, err: %i",
+				message->error);
+		decode_ril_error(&error, "FAIL");
+		goto out;
+	}
+
+	decode_ril_error(&error, "OK");
+
+out:
+	cb(&error, cbd->data);
+}
+
+static void ril_call_barring_set_passwd(struct ofono_call_barring *barr,
+					const char *lock,
+					const char *old_passwd,
+					const char *new_passwd,
+					ofono_call_barring_set_cb_t cb,
+					void *data)
+{
+	struct barring_data *bd = ofono_call_barring_get_data(barr);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int ret = 0;
+
+	DBG("");
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, RIL_SET_PW_STRING_COUNT);	/* Nbr of strings */
+	parcel_w_string(&rilp, (char *) lock);		/* Facility code */
+	parcel_w_string(&rilp, (char *) old_passwd);
+	parcel_w_string(&rilp, (char *) new_passwd);
+
+	ret = g_ril_send(bd->ril, RIL_REQUEST_CHANGE_BARRING_PASSWORD,
+			rilp.data, rilp.size, ril_call_barring_set_passwd_cb,
+			cbd, g_free);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		ofono_error("Sending Call Barring Set PW req failed, err: %i",
+				ret);
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
+static gboolean ril_delayed_register(gpointer user_data)
+{
+	struct ofono_call_barring *cb = user_data;
+	struct barring_data *bd = ofono_call_barring_get_data(cb);
+
+	bd->timer_id = 0;
+
+	ofono_call_barring_register(cb);
+	return FALSE;
+}
+
+static int ril_call_barring_probe(struct ofono_call_barring *cb,
+					unsigned int vendor, void *user)
+{
+	GRil *ril = user;
+	struct barring_data *bd = g_try_new0(struct barring_data, 1);
+
+	bd->ril = g_ril_clone(ril);
+	ofono_call_barring_set_data(cb, bd);
+	bd->timer_id = g_timeout_add_seconds(2, ril_delayed_register, cb);
+
+	return 0;
+}
+
+static void ril_call_barring_remove(struct ofono_call_barring *cb)
+{
+	struct barring_data *data = ofono_call_barring_get_data(cb);
+	ofono_call_barring_set_data(cb, NULL);
+
+	if (data->timer_id > 0)
+		g_source_remove(data->timer_id);
+
+	g_ril_unref(data->ril);
+	g_free(data);
+}
+
+static struct ofono_call_barring_driver driver = {
+	.name			= "rilmodem",
+	.probe			= ril_call_barring_probe,
+	.remove			= ril_call_barring_remove,
+	.query			= ril_call_barring_query,
+	.set			= ril_call_barring_set,
+	.set_passwd		= ril_call_barring_set_passwd
+};
+
+void ril_call_barring_init(void)
+{
+	ofono_call_barring_driver_register(&driver);
+}
+
+void ril_call_barring_exit(void)
+{
+	ofono_call_barring_driver_unregister(&driver);
+}

ofono/drivers/rilmodem/call-forwarding.c

@@ -3,7 +3,7 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
- *  Copyright (C) 2013 Jolla Ltd
+ *  Copyright (C) 2013-2014 Jolla Ltd
  *  Contact: Jussi Kangas <jussi.kangas@tieto.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -94,11 +94,10 @@ static void ril_registration(struct ofono_call_forwarding *cf, int type,
 	 * or settings made with bearer class
 	 * BEARER_CLASS_DEFAULT. Design decision: If given
 	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * SERVICE_CLASS_NONE as with it e.g. ./send-ussd '*21*<phone_number>#'
-	 * returns cls:53 i.e. 1+4+16+32 as service class.
+	 * BEARER_CLASS_VOICE as per RIL design.
 	*/
 	if (cls == BEARER_CLASS_DEFAULT)
-		cls = SERVICE_CLASS_NONE;
+		cls = BEARER_CLASS_VOICE;
 
 	parcel_w_int32(&rilp, cls);
 
@@ -140,11 +139,10 @@ static void ril_send_forward_cmd(struct ofono_call_forwarding *cf,
 	 * or settings made with bearer class
 	 * BEARER_CLASS_DEFAULT. Design decision: If given
 	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * SERVICE_CLASS_NONE as with it e.g. ./send-ussd '*21*<phone_number>#'
-	 * returns cls:53 i.e. 1+4+16+32 as service class.
+	 * BEARER_CLASS_VOICE as per RIL design.
 	*/
 	if (cls == BEARER_CLASS_DEFAULT)
-		cls = SERVICE_CLASS_NONE;
+		cls = BEARER_CLASS_VOICE;
 
 	parcel_w_int32(&rilp, cls);			/* Service class */
 
@@ -237,9 +235,8 @@ static void ril_query_cb(struct ril_msg *message, gpointer user_data)
 				list[i].phone_number.number[
 					OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
 
-				list[i].time = parcel_r_int32(&rilp);
 			}
-
+			list[i].time = parcel_r_int32(&rilp);
 		}
 
 		CALLBACK_WITH_SUCCESS(cb, nmbr_of_resps, list, cbd->data);
@@ -273,8 +270,7 @@ static void ril_query(struct ofono_call_forwarding *cf, int type, int cls,
 	 * or settings made with bearer class
 	 * BEARER_CLASS_DEFAULT. Design decision: If given
 	 * class is BEARER_CLASS_DEFAULT let's map it to
-	 * SERVICE_CLASS_NONE as with it e.g. ./send-ussd '*21*<phone_number>#'
-	 * returns cls:53 i.e. 1+4+16+32 as service class.
+	 * SERVICE_CLASS_NONE as per RIL design.
 	*/
 	if (cls == BEARER_CLASS_DEFAULT)
 		cls = SERVICE_CLASS_NONE;

ofono/drivers/rilmodem/devinfo.c

@@ -98,6 +98,7 @@ static void query_revision_cb(struct ril_msg *message, gpointer user_data)
 	revision = parcel_r_string(&rilp);
 
 	cb(&error, revision, cbd->data);
+	g_free(revision);
 }
 
 static void ril_query_revision(struct ofono_devinfo *info,
@@ -137,10 +138,10 @@ static void query_serial_cb(struct ril_msg *message, gpointer user_data)
 	}
 
 	ril_util_init_parcel(message, &rilp);
-
 	imei = parcel_r_string(&rilp);
 
 	cb(&error, imei, cbd->data);
+	g_free(imei);
 }
 
 static void ril_query_serial(struct ofono_devinfo *info,

ofono/drivers/rilmodem/gprs-context.c

@@ -45,6 +45,12 @@
 
 #include "rilmodem.h"
 
+enum data_call_state {
+	DATA_CALL_INACTIVE,
+	DATA_CALL_LINK_DOWN,
+	DATA_CALL_ACTIVE,
+};
+
 enum state {
 	STATE_IDLE,
 	STATE_ENABLING,
@@ -60,24 +66,13 @@ struct gprs_context_data {
 	guint regid;
 };
 
-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)
 {
@@ -85,7 +80,6 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	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 *iterator = NULL;
 	struct ofono_error error;
@@ -100,19 +94,62 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	for (iterator = unsol->call_list; iterator; iterator = iterator->next) {
 		call = (struct data_call *) iterator->data;
 
-		if (call->cid == gcd->active_rild_cid) {
-			active_cid_found = TRUE;
+		/*
+		 * Every context receives notifications about all data calls
+		 * but should only handle its own.
+		 */
+		if (call->cid != gcd->active_rild_cid)
+			continue;
 
-			if (call->active == 0) {
-				disconnect = TRUE;
-				ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
+		if (call->status != 0)
+			ofono_info("data call status:%d", call->status);
+
+		if (call->active == DATA_CALL_INACTIVE) {
+			disconnect = TRUE;
+			ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
+			break;
+		}
+
+		if (call->active == DATA_CALL_ACTIVE) {
+			char **dns_addresses;
+
+			if (call->ifname) {
+				ofono_gprs_context_set_interface(gc,
+								call->ifname);
 			}
 
+			if (call->addresses) {
+				char **split_ip_addr;
+				ofono_gprs_context_set_ipv4_netmask(gc,
+					ril_util_get_netmask(call->addresses));
+
+				split_ip_addr = g_strsplit(call->addresses,
+									"/", 2);
+				ofono_gprs_context_set_ipv4_address(gc,
+							split_ip_addr[0], TRUE);
+				g_strfreev(split_ip_addr);
+			}
+
+			if (call->gateways) {
+				ofono_gprs_context_set_ipv4_gateway(gc,
+								call->gateways);
+			}
+
+
+			if (call->dnses)
+				DBG("dnses:%s", call->dnses);
+
+			dns_addresses =	(call->dnses ?
+				g_strsplit(call->dnses, " ", 3)	: NULL);
+
+			ofono_gprs_context_set_ipv4_dns_servers(gc,
+						(const char**)dns_addresses);
+			g_strfreev(dns_addresses);
 			break;
 		}
 	}
 
-	if (disconnect || active_cid_found == FALSE) {
+	if (disconnect) {
 		ofono_error("Clearing active context");
 		set_context_disconnected(gcd);
 	}
@@ -149,10 +186,7 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	gcd->active_rild_cid = reply->cid;
 
 	if (error.type != OFONO_ERROR_TYPE_NO_ERROR) {
-		if (gcd->active_rild_cid != -1) {
-			ofono_error("no active context. disconnect");
-			disconnect_context(gc);
-		}
+		ofono_error("no active context. disconnect");
 		goto error;
 	}
 
@@ -164,7 +198,6 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 		error.type = OFONO_ERROR_TYPE_FAILURE;
 		error.error = reply->status;
 
-		set_context_disconnected(gcd);
 		goto error;
 	}
 
@@ -172,7 +205,7 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	 * TODO: consier moving this into parse_data_reply
 	 *
 	 * Note - the address may optionally include a prefix size
-	 * ( Eg. "/30" ).  As this confuses NetworkManager, we
+	 * ( Eg. "/30" ).  As this may confuse client, we
 	 * explicitly strip any prefix after calculating the netmask.
 	 */
 	split_ip_addr = g_strsplit(reply->ip_addrs[0], "/", 2);
@@ -209,7 +242,7 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	ofono_gprs_context_set_ipv4_gateway(gc, reply->gateways[0]);
 
 	ofono_gprs_context_set_ipv4_dns_servers(gc,
-						(const char **) reply->dns_addresses);
+					(const char **) reply->dns_addresses);
 
 error:
 	g_ril_reply_free_setup_data_call(reply);
@@ -219,8 +252,8 @@ error:
 }
 
 static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
-						const struct ofono_gprs_primary_context *ctx,
-						ofono_gprs_context_cb_t cb, void *data)
+				const struct ofono_gprs_primary_context *ctx,
+				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);
@@ -284,7 +317,8 @@ error:
 	}
 }
 
-static void ril_deactivate_data_call_cb(struct ril_msg *message, gpointer user_data)
+static void ril_deactivate_data_call_cb(struct ril_msg *message,
+						gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_gprs_context_cb_t cb = cbd->cb;
@@ -322,7 +356,8 @@ static void ril_deactivate_data_call_cb(struct ril_msg *message, gpointer user_d
 
 static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
 						unsigned int id,
-						ofono_gprs_context_cb_t cb, void *data)
+						ofono_gprs_context_cb_t cb,
+						void *data)
 {
 	struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
 	struct cb_data *cbd = NULL;
@@ -375,6 +410,7 @@ error:
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_DEACTIVATE_DATA_CALL failed.");
 		g_free(cbd);
+
 		if (cb)
 			CALLBACK_WITH_FAILURE(cb, data);
 	}
@@ -402,7 +438,6 @@ static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
 	set_context_disconnected(gcd);
 
 	ofono_gprs_context_set_data(gc, gcd);
-	gcd->regid = -1;
 
 	gcd->regid = g_ril_register(gcd->ril, RIL_UNSOL_DATA_CALL_LIST_CHANGED,
 					ril_gprs_context_call_list_changed, gc);
@@ -415,14 +450,13 @@ static void ril_gprs_context_remove(struct ofono_gprs_context *gc)
 
 	DBG("");
 
-	if (gcd->state != STATE_IDLE) {
+	if (gcd->state != STATE_IDLE)
 		ril_gprs_context_detach_shutdown(gc, 0);
-	}
 
 	ofono_gprs_context_set_data(gc, NULL);
-	
+
 	if (gcd->regid != -1)
-		g_ril_unregister(gcd->ril,gcd->regid);
+		g_ril_unregister(gcd->ril, gcd->regid);
 
 	g_ril_unref(gcd->ril);
 	g_free(gcd);
@@ -432,9 +466,9 @@ static struct ofono_gprs_context_driver driver = {
 	.name			= RILMODEM,
 	.probe			= ril_gprs_context_probe,
 	.remove			= ril_gprs_context_remove,
-	.activate_primary       = ril_gprs_context_activate_primary,
-	.deactivate_primary     = ril_gprs_context_deactivate_primary,
-	.detach_shutdown        = ril_gprs_context_detach_shutdown,
+	.activate_primary	= ril_gprs_context_activate_primary,
+	.deactivate_primary	= ril_gprs_context_deactivate_primary,
+	.detach_shutdown	= ril_gprs_context_detach_shutdown,
 };
 
 void ril_gprs_context_init(void)

ofono/drivers/rilmodem/gprs.c

@@ -45,6 +45,8 @@
 #include "rilmodem.h"
 
 #include <ofono/netreg.h>
+#include <ofono/sim.h>
+#include "storage.h"
 
 /*
  * This module is the ofono_gprs_driver implementation for rilmodem.
@@ -63,16 +65,23 @@
  *    +CREG ( see 27.003 7.2 ).
  */
 
+#define FAKE_STATE_TIMER 5
+
 struct gprs_data {
 	GRil *ril;
 	gboolean ofono_attached;
 	int max_cids;
 	int rild_status;
+	int true_status;
 	gboolean notified;
 	guint registerid;
 	guint timer_id;
+	guint fake_timer_id;
 };
 
+/*if we have called ofono_gprs_register or not*/
+static gboolean registered;
+
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb,
 					void *data);
@@ -81,7 +90,10 @@ static void ril_gprs_state_change(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_gprs *gprs = user_data;
 
-	g_assert(message->req == RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);
+	g_assert(message->req ==
+				RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED);
+
+	DBG("");
 
 	/* We need to notify core always to cover situations when
 	 * connection drops temporarily for example when user is
@@ -97,6 +109,7 @@ static gboolean ril_gprs_set_attached_callback(gpointer user_data)
 	ofono_gprs_cb_t cb = cbd->cb;
 	struct ofono_gprs *gprs = cbd->user;
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
+
 	DBG("");
 
 	gd->timer_id = 0;
@@ -129,11 +142,12 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 	* are met.
 	*/
 
+	gd->notified = (gd->ofono_attached == attached) ? TRUE : FALSE;
+
 	gd->ofono_attached = attached;
 
 	cbd->user = gprs;
 
-	ril_gprs_registration_status(gprs, NULL, NULL);
 	/*
 	* However we cannot respond immediately, since core sets the
 	* value of driver_attached after calling set_attached and that
@@ -144,6 +158,42 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 						cbd);
 }
 
+static gboolean ril_fake_response(gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_gprs *gprs = cbd->user;
+	struct gprs_data *gd = ofono_gprs_get_data(gprs);
+
+	DBG("");
+
+	ofono_gprs_status_notify(gprs, gd->true_status);
+	g_free(cbd);
+	return FALSE;
+}
+
+static gboolean ril_roaming_allowed()
+{
+	GError *error;
+	error = NULL;
+	GKeyFile *settings;
+	struct ofono_sim *sim;
+
+	sim = get_sim();
+	const char *imsi = ofono_sim_get_imsi(sim);
+	settings = storage_open(imsi, "gprs");
+	gboolean roaming_allowed = g_key_file_get_boolean(settings,
+							"Settings",
+							"RoamingAllowed",
+							&error);
+
+	if (error)
+		g_error_free(error);
+
+	storage_close(imsi, "gprs", settings, FALSE);
+
+	return roaming_allowed;
+}
+
 static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -153,7 +203,8 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 	struct ofono_error error;
 	int status, lac, ci, tech;
 	int max_cids = 1;
-	int id = RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED;
+
+	DBG("");
 
 	if (gd && message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
@@ -174,12 +225,20 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 		goto error;
 	}
 
-	if (gd->rild_status == -1) {
-		ofono_gprs_register(gprs);
+	if ((gd->fake_timer_id > 0) &&
+			((status == (NETWORK_REGISTRATION_STATUS_REGISTERED
+			|| NETWORK_REGISTRATION_STATUS_ROAMING)) ||
+			!(gd->ofono_attached))) {
+		g_source_remove(gd->fake_timer_id);
+		gd->true_status = -1;
+	}
 
-		DBG("Starting to listen network status");
-		gd->registerid = g_ril_register(gd->ril,
-			id, ril_gprs_state_change, gprs);
+	if (status > 10)
+		status = status - 10;
+
+	if (!registered) {
+		ofono_gprs_register(gprs);
+		registered = TRUE;
 	}
 
 	if (max_cids > gd->max_cids) {
@@ -193,63 +252,130 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
 		status = check_if_really_roaming(status);
 
-	if (gd->ofono_attached && !gd->notified) {
-		if (status == NETWORK_REGISTRATION_STATUS_ROAMING ||
-			status == NETWORK_REGISTRATION_STATUS_REGISTERED) {
-			DBG("connection becomes available");
-			gd->ofono_attached = TRUE;
+	DBG(" attached:%d, status:%d", gd->ofono_attached, status);
+
+	if (!gd->ofono_attached) {
+		if (status == NETWORK_REGISTRATION_STATUS_ROAMING) {
+			if (!gd->notified && cb) {
+				if (ril_roaming_allowed() == FALSE)
+					ofono_gprs_detached_notify(gprs);
+
+				/*
+				 * This prevents core ending
+				 * into eternal loop with driver
+				 */
+				decode_ril_error(&error, "FAIL");
+
+				ofono_gprs_status_notify(gprs, status);
+			}
+		} else {
+			if (status == NETWORK_REGISTRATION_STATUS_SEARCHING &&
+								!gd->notified &&
+								cb)
+				/*
+				 * This is a hack that prevents core ending
+				 * into eternal loop with driver
+				 */
+				decode_ril_error(&error, "FAIL");
+
 			ofono_gprs_status_notify(gprs, status);
-			gd->notified = TRUE;
-			gd->rild_status = status;
 		}
+
+		if (cb)
+			gd->notified = TRUE;
+
+		gd->rild_status = status;
 		goto error;
 	}
 
-	if (gd->ofono_attached &&
-			status != NETWORK_REGISTRATION_STATUS_SEARCHING) {
-		DBG("ofono attached, start faking responses");
-		if (status != NETWORK_REGISTRATION_STATUS_ROAMING) {
-			/*
-			* Only core can succesfully drop the connection
-			* If we drop the connection from here it leads
-			* to race situation where core asks context
-			* deactivation and at the same time we get
-			* Registered notification from modem.
-			*/
-			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
-		}
-
-		if (gd->registerid != -1)
-			g_ril_unregister(gd->ril, gd->registerid);
-		gd->registerid = -1;
-	} else {
-		/*
-		 * Client is not approving succesful result
-		 * This covers the situation when context is
-		 * active in roaming situation and client closes
-		 * it directly by calling RoamingAllowed in API
-		 */
-		DBG("data registration status is %d", status);
-
-		if (status != NETWORK_REGISTRATION_STATUS_SEARCHING) {
-			DBG("ofono not attached, notify core");
-			status = NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
-			ofono_gprs_detached_notify(gprs);
-			gd->notified = FALSE;
-			gd->ofono_attached = FALSE;
-		} else if (gd->notified) {
-			DBG("hide the searching state");
-			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING ||
+		status == NETWORK_REGISTRATION_STATUS_REGISTERED) {
 			ofono_gprs_status_notify(gprs, status);
-			gd->ofono_attached = TRUE;
+			gd->rild_status = status;
+	} else {
+		if (gd->fake_timer_id <= 0) {
+			struct cb_data *fake_cbd = cb_data_new(NULL, NULL);
+
+			fake_cbd->user = gprs;
+			gd->fake_timer_id = g_timeout_add_seconds(
+						FAKE_STATE_TIMER,
+						ril_fake_response, fake_cbd);
 		}
+
+		gd->true_status = status;
+
+		if (gd->rild_status == NETWORK_REGISTRATION_STATUS_ROAMING)
+			status = NETWORK_REGISTRATION_STATUS_ROAMING;
+		else
+			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
+
+		gd->rild_status = status;
 	}
 
+error:
+	ofono_info("data registration status is %d", status);
+
+	if (cb)
+		cb(&error, status, cbd->data);
+}
+
+static void ril_data_probe_reg_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_gprs *gprs = cbd->user;
+	struct gprs_data *gd = ofono_gprs_get_data(gprs);
+	struct ofono_error error;
+	int status, lac, ci, tech;
+	int max_cids = 1;
+	int id = RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED;
+
+	DBG("");
+
+	if (!(gd && message->error == RIL_E_SUCCESS)) {
+		ofono_error("ril_data_reg_cb: reply failure: %s",
+				ril_error_to_string(message->error));
+		decode_ril_error(&error, "FAIL");
+		error.error = message->error;
+		status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+		goto out;
+	}
+
+	decode_ril_error(&error, "OK");
+	status = -1;
+
+	if (ril_util_parse_reg(gd->ril, message, &status,
+				&lac, &ci, &tech, &max_cids) == FALSE) {
+		ofono_error("Failure parsing data registration response.");
+		decode_ril_error(&error, "FAIL");
+
+		if (status == -1)
+			status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+
+		goto out;
+	}
+
+	ofono_gprs_register(gprs);
+
+	registered = TRUE;
+
+	if (max_cids > gd->max_cids) {
+		DBG("Setting max cids to %d", max_cids);
+		gd->max_cids = max_cids;
+		ofono_gprs_set_cid_range(gprs, 1, max_cids);
+	}
+
+	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
+		status = check_if_really_roaming(status);
+
+out:
+	ofono_info("data registration status is %d", status);
+
+	DBG("Starting to listen network status");
+	gd->registerid = g_ril_register(gd->ril,
+			id, ril_gprs_state_change, gprs);
+
 	gd->rild_status = status;
 
-error:
-	if (cb)
-		cb(&error, status, cbd->data);
 }
 
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
@@ -261,20 +387,27 @@ static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 	int request = RIL_REQUEST_DATA_REGISTRATION_STATE;
 	guint ret;
 
+	DBG("");
+
 	if (gd == NULL || cbd == NULL)
 		return;
 
 	cbd->user = gprs;
 
 	ret = g_ril_send(gd->ril, request,
-				NULL, 0, ril_data_reg_cb, cbd, g_free);
+				NULL, 0,
+				((gd->rild_status == -1)
+				? ril_data_probe_reg_cb
+				: ril_data_reg_cb), cbd, g_free);
 
 	g_ril_print_request_no_args(gd->ril, ret, request);
 
 	if (ret <= 0) {
-		ofono_error("Send RIL_REQUEST_DATA_RESTISTRATION_STATE failed.");
+		ofono_error("Send RIL_REQUEST_DATA_RESTISTRATION_STATE fail.");
 		g_free(cbd);
-		CALLBACK_WITH_FAILURE(cb, -1, data);
+
+		if (cb)
+			CALLBACK_WITH_FAILURE(cb, -1, data);
 	}
 }
 
@@ -292,9 +425,13 @@ static int ril_gprs_probe(struct ofono_gprs *gprs,
 	gd->ofono_attached = FALSE;
 	gd->max_cids = 0;
 	gd->rild_status = -1;
+	gd->true_status = -1;
 	gd->notified = FALSE;
 	gd->registerid = -1;
 	gd->timer_id = 0;
+
+	registered = FALSE;
+
 	ofono_gprs_set_data(gprs, gd);
 
 	ril_gprs_registration_status(gprs, NULL, NULL);
@@ -316,6 +453,9 @@ static void ril_gprs_remove(struct ofono_gprs *gprs)
 	if (gd->timer_id > 0)
 		g_source_remove(gd->timer_id);
 
+	if (gd->fake_timer_id > 0)
+		g_source_remove(gd->fake_timer_id);
+
 	g_ril_unref(gd->ril);
 	g_free(gd);
 }

ofono/drivers/rilmodem/network-registration.c

@@ -573,6 +573,17 @@ error:
 	ofono_error("Unable to notify ofono about nitz");
 }
 
+gboolean check_if_ok_to_attach()
+{
+	int status = NETWORK_REGISTRATION_STATUS_SEARCHING;
+	status = ofono_netreg_get_status(current_netreg);
+	if (status == NETWORK_REGISTRATION_STATUS_SEARCHING
+		|| status == NETWORK_REGISTRATION_STATUS_ROAMING
+		|| status == NETWORK_REGISTRATION_STATUS_REGISTERED)
+		return TRUE;
+	return FALSE;
+}
+
 gint check_if_really_roaming(gint status)
 {
 	const char *net_mcc = ofono_netreg_get_mcc(current_netreg);
@@ -658,6 +669,7 @@ static void ril_netreg_remove(struct ofono_netreg *netreg)
 		g_source_remove(nd->nitz_timeout);
 
 	ofono_netreg_set_data(netreg, NULL);
+	current_netreg = NULL;
 
 	if (nd->timer_id > 0)
 		g_source_remove(nd->timer_id);

ofono/drivers/rilmodem/oemraw-messages.c

@@ -38,14 +38,18 @@
 struct oem_raw_data {
 	GRil *ril;
 	unsigned int vendor;
+	guint timer_id;
 };
 
 static gboolean ril_oemraw_delayed_register(gpointer user_data)
 {
 	struct ofono_oem_raw *raw = user_data;
+	struct oem_raw_data *od = ofono_oem_raw_get_data(raw);
 
 	DBG("");
 
+	od->timer_id = 0;
+
 	ofono_oem_raw_dbus_register(raw);
 	return FALSE; /* This makes the timeout a single-shot */
 }
@@ -64,7 +68,8 @@ static int ril_oemraw_probe(struct ofono_oem_raw *raw, unsigned int vendor,
 	od->vendor = vendor;
 	ofono_oem_raw_set_data(raw, od);
 
-	g_timeout_add_seconds(1, ril_oemraw_delayed_register, raw);
+	od->timer_id = g_timeout_add_seconds(1, ril_oemraw_delayed_register,
+									raw);
 
 	return 0;
 }
@@ -79,6 +84,9 @@ static void ril_oemraw_remove(struct ofono_oem_raw *raw)
 
 	ofono_oem_raw_set_data(raw, NULL);
 
+	if (od->timer_id)
+		g_source_remove(od->timer_id);
+
 	g_ril_unref(od->ril);
 	g_free(od);
 }

ofono/drivers/rilmodem/phonebook.c

@@ -6,7 +6,6 @@
  *  Copyright (C) ST-Ericsson SA 2010.
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
  *  Copyright (C) 2013 Jolla Ltd
- *  Contact: Jussi Kangas <jussi.kangas@tieto.com>
  *
  *  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
@@ -162,11 +161,18 @@ void handle_adn(size_t len, char *name, const unsigned char *msg,
 		char *number, struct pb_file_info *next_file,
 		struct pb_data *pbd)
 {
-	const uint8_t name_length = len - 14;
-	const uint8_t number_start = name_length;
+	uint8_t name_length;
+	uint8_t number_start;
 	uint8_t number_length = 0;
 	uint8_t extension_record = UNUSED;
 	uint8_t i, prefix;
+
+	if (len < 14)
+		return;
+
+	name_length = len - 14;
+	number_start = name_length;
+
 	name = sim_string_to_utf8(msg, name_length);
 	/* Length contains also TON&NPI */
 	number_length = msg[number_start];
@@ -256,15 +262,19 @@ void handle_adn(size_t len, char *name, const unsigned char *msg,
 	}
 }
 
-void handle_sne(size_t len,
-				const unsigned char *msg,
-				char *sne)
+void handle_sne(size_t len, const unsigned char *msg, char *sne)
 {
-	const uint8_t sne_length = len - 2;
-	uint8_t phonebook_entry_nbr = msg[len - 1];
+	uint8_t sne_length;
+	uint8_t phonebook_entry_nbr;
 
 	DBG("SNE");
 
+	if (len < 2)
+		return;
+
+	sne_length = len - 2;
+	phonebook_entry_nbr = msg[len - 1];
+
 	sne = sim_string_to_utf8(msg, sne_length);
 
 	if (sne) {
@@ -299,20 +309,26 @@ void handle_sne(size_t len,
 	}
 }
 
-void handle_anr(size_t len,
-				const unsigned char *msg,
-				char *anr,
-				struct pb_file_info *next_file,
-				struct pb_data *pbd)
+void handle_anr(size_t len,const unsigned char *msg,char *anr,
+			struct pb_file_info *next_file, struct pb_data *pbd)
 {
 	uint8_t number_length = 0;
 	uint8_t extension_record = UNUSED;
 	uint8_t aas_record = UNUSED;
 	uint8_t i, prefix;
-	uint8_t phonebook_entry_nbr = msg[len - 1];
+	uint8_t phonebook_entry_nbr;
 	GSList *list_entry;
 
 	DBG("ANR");
+
+	if (!msg)
+		return;
+
+	if (len < 1)
+		return;
+
+	phonebook_entry_nbr = msg[len - 1];
+
 	if (msg[0] == UNUSED)
 		return;
 
@@ -398,11 +414,18 @@ void handle_anr(size_t len,
 	}
 }
 
-void handle_email(size_t len,
-			const unsigned char *msg,
-			char *email)
+void handle_email(size_t len, const unsigned char *msg, char *email)
 {
-	uint8_t phonebook_entry_nbr = msg[len - 1];
+	uint8_t phonebook_entry_nbr;
+
+	if (!msg)
+		return;
+
+	if (len < 1)
+		return;
+
+	phonebook_entry_nbr = msg[len - 1];
+
 	email = sim_string_to_utf8(msg, len - 2);
 
 	/* GSlist nth counts from 0, PB entries from 1 */
@@ -434,13 +457,13 @@ void handle_email(size_t len,
 	}
 }
 
-void handle_ext1(struct pb_data *pbd,
-			const unsigned char *msg,
-			char *ext_number,
-			struct pb_file_info *next_file)
+void handle_ext1(struct pb_data *pbd, const unsigned char *msg,
+			char *ext_number, struct pb_file_info *next_file)
 {
 	uint8_t number_length, i, next_extension_record;
 
+	if (!msg)
+		return;
 
 	number_length = msg[1];
 
@@ -799,9 +822,24 @@ static void pb_content_data_cb(const struct ofono_error *error,
 	if (extension_file_info)
 		file_info = decode_read_response(extension_file_info, sdata,
 						 length, pb);
-	else
+	else {
+	/*
+	 * These checks are crash hacks.
+	 * AFAIK there's a possibility that we end up here and pb_next is NULL
+	 * in case remove hase been called while phonebook reading is in
+	 * process. If you find better solution to this issue feel free to
+	 * change this.
+	 */
+		if (pb_next == NULL) {
+			ofono_error("phonebook reading failed");
+			if (cb && cbd && pbd)
+				CALLBACK_WITH_FAILURE(cb, cbd->data);
+			return;
+		}
+
 		file_info =
 			decode_read_response(pb_next->data, sdata, length, pb);
+	}
 
 	if (file_info) {
 		DBG("Reading extension file %04X, record %d, structure %d",
@@ -818,7 +856,7 @@ static void pb_content_data_cb(const struct ofono_error *error,
 		file_info = pb_next->data;
 
 		if (((file_info->structure ==
-		      OFONO_SIM_FILE_STRUCTURE_FIXED) ||
+			OFONO_SIM_FILE_STRUCTURE_FIXED) ||
 			(file_info->structure ==
 			 OFONO_SIM_FILE_STRUCTURE_CYCLIC))
 			&& (file_info->record <
@@ -1107,15 +1145,27 @@ static void pb_reference_data_cb(const struct ofono_error *error,
 			pbd->pb_reference_file_info.record_length)) {
 		pbd->pb_reference_file_info.record++;
 		DBG("Next EFpbr record %d", pbd->pb_reference_file_info.record);
-		pbd->sim_driver->read_file_linear(get_sim(),
-						pbd->pb_reference_file_info.
-						file_id,
-						pbd->pb_reference_file_info.
-						record,
-						pbd->pb_reference_file_info.
-						record_length,
-						NULL, 0,
-						pb_reference_data_cb, cbd);
+		if (RIL_APPTYPE_SIM == ril_get_app_type()) {
+			pbd->sim_driver->read_file_linear(get_sim(),
+					pbd->pb_reference_file_info.
+					file_id,
+					pbd->pb_reference_file_info.
+					record,
+					pbd->pb_reference_file_info.
+					record_length,
+					sim_path, sizeof(sim_path),
+					pb_reference_data_cb, cbd);
+		} else {
+			pbd->sim_driver->read_file_linear(get_sim(),
+					pbd->pb_reference_file_info.
+					file_id,
+					pbd->pb_reference_file_info.
+					record,
+					pbd->pb_reference_file_info.
+					record_length,
+					usim_path, sizeof(usim_path),
+					pb_reference_data_cb, cbd);
+		}
 	} else {
 		struct pb_file_info *file_info;
 		DBG("All EFpbr records read");

ofono/drivers/rilmodem/radio-settings.c

@@ -35,6 +35,7 @@
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/radio-settings.h>
+#include <ofono/sim.h>
 
 #include "gril.h"
 #include "grilutil.h"
@@ -74,7 +75,7 @@ static void ril_set_rat_mode(struct ofono_radio_settings *rs,
 	int pref = rd->ratmode;
 	int ret = 0;
 
-	ofono_info("setting rat mode");
+	ofono_info("setting rat mode:%d", mode);
 
 	parcel_init(&rilp);
 
@@ -200,11 +201,17 @@ static gboolean ril_get_net_config(struct radio_data *rsd)
 {
 	GKeyFile *keyfile;
 	GError *err = NULL;
-	char *path = RIL_CONFIG;
+	char *config_path = RIL_CONFIG_DIR;
 	char **alreadyset = NULL;
 	gboolean needsconfig = FALSE;
 	gboolean value = FALSE;
+	gboolean found = FALSE;
 	rsd->ratmode = PREF_NET_TYPE_GSM_WCDMA_AUTO;
+	GDir *config_dir;
+	const gchar *config_file;
+	gsize length;
+	gchar **codes = NULL;
+	int i;
 
 	/*
 	 * First we need to check should the LTE be on
@@ -215,15 +222,45 @@ static gboolean ril_get_net_config(struct radio_data *rsd)
 
 	g_key_file_set_list_separator(keyfile, ',');
 
-	if (g_key_file_load_from_file(keyfile, path, 0, &err)) {
+	config_dir = g_dir_open(config_path, 0, NULL);
+	while ((config_file = g_dir_read_name(config_dir)) != NULL) {
+		char *path = g_strconcat(RIL_CONFIG_DIR "/", config_file, NULL);
+		DBG("Rilconfig handling %s", path);
+		gboolean ok = g_key_file_load_from_file(keyfile, path, 0, &err);
+
+		g_free(path);
+		if (!ok) {
+			g_error_free(err);
+			DBG("Rilconfig file skipped");
+			continue;
+		}
+
 		if (g_key_file_has_group(keyfile, LTE_FLAG))
+			found = TRUE;
+		else if (g_key_file_has_group(keyfile, MCC_LIST)) {
+			codes = g_key_file_get_string_list(keyfile, MCC_LIST,
+						MCC_KEY, &length, NULL);
+			if (codes) {
+				for (i = 0; codes[i]; i++) {
+					if (g_str_equal(codes[i],
+						ofono_sim_get_mcc(get_sim()))
+							== TRUE) {
+						found = TRUE;
+						break;
+					}
+				}
+				g_strfreev(codes);
+			}
+		}
+
+		if (found) {
 			rsd->ratmode = PREF_NET_TYPE_LTE_GSM_WCDMA;
-	} else {
-		g_error_free(err);
-		needsconfig = TRUE;
+			break;
+		}
 	}
 
 	g_key_file_free(keyfile);
+	g_dir_close(config_dir);
 
 	/* Then we need to check if it already set */
 

ofono/drivers/rilmodem/rilmodem.c

@@ -53,8 +53,10 @@ static int rilmodem_init(void)
 	ril_ussd_init();
 	ril_call_settings_init();
 	ril_call_forwarding_init();
+	ril_call_barring_init();
 	ril_cbs_init();
 	ril_oemraw_init();
+	ril_stk_init();
 
 	return 0;
 }
@@ -76,8 +78,10 @@ static void rilmodem_exit(void)
 	ril_ussd_exit();
 	ril_call_settings_exit();
 	ril_call_forwarding_exit();
+	ril_call_barring_exit();
 	ril_cbs_exit();
 	ril_oemraw_exit();
+	ril_stk_exit();
 }
 
 OFONO_PLUGIN_DEFINE(rilmodem, "RIL modem driver", VERSION,

ofono/drivers/rilmodem/rilmodem.h

@@ -28,9 +28,14 @@
 /* Shared constants */
 #define EF_STATUS_INVALIDATED 0
 #define EF_STATUS_VALID 1
-#define RIL_CONFIG "/etc/ofono/ril_subscription.conf"
+#define RIL_HW_CONFIG "/etc/ofono/ril_subscription.conf"
+#define RIL_CONFIG_DIR "/etc/ofono/"
 #define RIL_STORE "rilmodem"
 #define LTE_FLAG "4gOn"
+#define MCC_LIST "MCC-whitelist"
+#define MCC_KEY "Countries"
+#define UI_LANG "/var/lib/environment/nemo/locale.conf"
+#define CFG_LANG "LANG="
 
 extern void ril_devinfo_init(void);
 extern void ril_devinfo_exit(void);
@@ -68,6 +73,9 @@ extern void ril_call_settings_exit(void);
 extern void ril_call_forwarding_init(void);
 extern void ril_call_forwarding_exit(void);
 
+extern void ril_call_barring_init(void);
+extern void ril_call_barring_exit(void);
+
 extern void ril_cbs_init(void);
 extern void ril_cbs_exit(void);
 
@@ -76,3 +84,7 @@ extern void ril_phonebook_exit(void);
 
 extern void ril_oemraw_init(void);
 extern void ril_oemraw_exit(void);
+
+extern void ril_stk_init(void);
+extern void ril_stk_exit(void);
+

ofono/drivers/rilmodem/rilutil.c

@@ -402,13 +402,25 @@ gboolean ril_util_parse_sim_status(GRil *gril,
 
 		apps[i]->app_type = parcel_r_int32(&rilp);
 		apps[i]->app_state = parcel_r_int32(&rilp);
+
+		/*
+		 * Consider RIL_APPSTATE_ILLEGAL also READY. Even if app state
+		 * is  RIL_APPSTATE_ILLEGAL (-1), ICC operations must be
+		 * permitted. Network access requests will anyway be rejected
+		 * and ME will be in limited service.
+		 */
+		if (apps[i]->app_state == RIL_APPSTATE_ILLEGAL) {
+			DBG("RIL_APPSTATE_ILLEGAL => RIL_APPSTATE_READY");
+			apps[i]->app_state = RIL_APPSTATE_READY;
+		}
+
 		apps[i]->perso_substate = parcel_r_int32(&rilp);
 
 		/* TODO: we need a way to instruct parcel to skip
 		 * a string, without allocating memory...
 		 */
-		apps[i]->aid_str = parcel_r_string(&rilp); /* application ID (AID) */
-		apps[i]->app_str = parcel_r_string(&rilp); /* application label */
+		apps[i]->aid_str = parcel_r_string(&rilp); /* app ID (AID) */
+		apps[i]->app_str = parcel_r_string(&rilp); /* app label */
 
 		apps[i]->pin_replaced = parcel_r_int32(&rilp);
 		apps[i]->pin1_state = parcel_r_int32(&rilp);
@@ -459,7 +471,8 @@ gboolean ril_util_parse_reg(GRil *gril,
 	 *   >= 4 for VOICE_REG reply
 	 *   >= 5 for DATA_REG reply
 	 */
-	if ((tmp = parcel_r_int32(&rilp)) < 4) {
+	tmp = parcel_r_int32(&rilp);
+	if (tmp < 4) {
 		DBG("Size of response array is too small: %d", tmp);
 		goto error;
 	}
@@ -482,10 +495,12 @@ gboolean ril_util_parse_reg(GRil *gril,
 	 * voice & data response.
 	 */
 	if (tmp--) {
-		sreason = parcel_r_string(&rilp);        /* TODO: different use for CDMA */
+		/* TODO: different use for CDMA */
+		sreason = parcel_r_string(&rilp);
 
 		if (tmp--) {
-			smax = parcel_r_string(&rilp);           /* TODO: different use for CDMA */
+			/* TODO: different use for CDMA */
+			smax = parcel_r_string(&rilp);
 
 			if (smax && max_calls)
 				*max_calls = atoi(smax);
@@ -518,7 +533,7 @@ gboolean ril_util_parse_reg(GRil *gril,
 
 	if (tech) {
 		if (stech) {
-			switch(atoi(stech)) {
+			switch (atoi(stech)) {
 			case RADIO_TECH_UNKNOWN:
 				*tech = -1;
 				break;
@@ -659,7 +674,8 @@ gint ril_util_get_signal(GRil *gril, struct ril_msg *message)
 	return -1;
 }
 
-void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps) {
+void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps)
+{
 	guint i;
 
 	for (i = 0; i < num_apps; i++) {

ofono/drivers/rilmodem/rilutil.h

@@ -62,29 +62,6 @@ enum at_util_charset {
 	RIL_UTIL_CHARSET_8859_H =	0x10000,
 };
 
-/* TODO: consider moving these to ril_constants.h */
-enum app_state {
-	APPSTATE_UNKNOWN,
-	APPSTATE_DETECTED,
-	APPSTATE_PIN,
-	APPSTATE_PUK,
-	APPSTATE_SUBSCRIPTION_PERSO,
-	APPSTATE_READY,
-};
-
-enum perso_state {
-	PERSOSUBSTATE_SIM_NETWORK = 3,
-	PERSOSUBSTATE_SIM_NETWORK_SUBSET,
-	PERSOSUBSTATE_SIM_CORPORATE,
-	PERSOSUBSTATE_SIM_SERVICE_PROVIDER,
-	PERSOSUBSTATE_SIM_SIM,
-	PERSOSUBSTATE_SIM_NETWORK_PUK,
-	PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK,
-	PERSOSUBSTATE_SIM_CORPORATE_PUK,
-	PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK,
-	PERSOSUBSTATE_SIM_SIM_PUK,
-};
-
 #define MAX_UICC_APPS 16
 
 struct sim_status {
@@ -146,6 +123,8 @@ struct ofono_sim *get_sim();
 
 gint check_if_really_roaming(gint status);
 
+gboolean check_if_ok_to_attach();
+
 void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps);
 
 struct cb_data {
@@ -170,7 +149,7 @@ static inline struct cb_data *cb_data_new2(void *user, void *cb,
 {
 	struct cb_data *ret;
 
-	ret = g_try_new0(struct cb_data, 1);
+	ret = g_new0(struct cb_data, 1);
 
 	if (ret) {
 		ret->cb = cb;
@@ -193,7 +172,7 @@ static inline int ril_util_convert_signal_strength(int strength)
 	return result;
 }
 
-#define DECLARE_FAILURE(e) 			\
+#define DECLARE_FAILURE(e)			\
 	struct ofono_error e;			\
 	e.type = OFONO_ERROR_TYPE_FAILURE;	\
 	e.error = 0				\

ofono/drivers/rilmodem/sim.c

@@ -4,6 +4,7 @@
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
  *  Copyright (C) 2013 Canonical, Ltd. All rights reserved.
+ *  Copyright (C) 2014 Jolla 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
@@ -74,10 +75,6 @@
 #define ENTER_SIM_PUK_PARAMS 3
 #define CHANGE_SIM_PIN_PARAMS 3
 
-/* RIL_FACILITY_LOCK parameters */
-#define RIL_FACILITY_UNLOCK "0"
-#define RIL_FACILITY_LOCK "1"
-
 /* Current SIM */
 static struct ofono_sim *current_sim;
 /* Current active app */
@@ -106,6 +103,7 @@ struct sim_data {
 	enum ofono_sim_password_type passwd_state;
 	guint card_state;
 	guint idle_id;
+	gboolean removed;
 };
 
 static void ril_pin_change_state_cb(struct ril_msg *message,
@@ -183,6 +181,15 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)
 
 	DBG("");
 
+	/* In case sim card has been removed prior to this callback has been
+	 * called we must not call the core call back method as otherwise the
+	 * core will crash.
+	 */
+	if (sd->removed == TRUE) {
+		ofono_error("RIL_CARDSTATE_ABSENT");
+		return;
+	}
+
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
@@ -217,11 +224,13 @@ static void ril_file_info_cb(struct ril_msg *message, gpointer user_data)
 
 	if (response_len) {
 		if (response[0] == 0x62) {
-			ok = sim_parse_3g_get_response(response, response_len,
-							&flen, &rlen, &str, access, NULL);
+			ok = sim_parse_3g_get_response(
+				response, response_len,
+				&flen, &rlen, &str, access, NULL);
 		} else
-			ok = sim_parse_2g_get_response(response, response_len,
-							&flen, &rlen, &str, access, &file_status);
+			ok = sim_parse_2g_get_response(
+				response, response_len,
+				&flen, &rlen, &str, access, &file_status);
 	}
 
 	if (!ok) {
@@ -240,7 +249,8 @@ error:
 }
 
 static void ril_sim_read_info(struct ofono_sim *sim, int fileid,
-				const unsigned char *path, unsigned int path_len,
+				const unsigned char *path,
+				unsigned int path_len,
 				ofono_sim_file_info_cb_t cb,
 				void *data)
 {
@@ -340,7 +350,8 @@ error:
 
 static void ril_sim_read_binary(struct ofono_sim *sim, int fileid,
 				int start, int length,
-				const unsigned char *path, unsigned int path_len,
+				const unsigned char *path,
+				unsigned int path_len,
 				ofono_sim_read_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
@@ -393,7 +404,8 @@ static void ril_sim_read_binary(struct ofono_sim *sim, int fileid,
 
 static void ril_sim_read_record(struct ofono_sim *sim, int fileid,
 				int record, int length,
-				const unsigned char *path, unsigned int path_len,
+				const unsigned char *path,
+				unsigned int path_len,
 				ofono_sim_read_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
@@ -506,10 +518,10 @@ static void ril_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
 	}
 }
 
-void set_pin_lock_state(struct ofono_sim *sim,struct sim_app *app)
+void set_pin_lock_state(struct ofono_sim *sim, struct sim_app *app)
 {
-	DBG("pin1:%u,pin2:%u",app->pin1_state,app->pin2_state);
-	/* 
+	DBG("pin1:%u,pin2:%u", app->pin1_state, app->pin2_state);
+	/*
 	 * Updates only pin and pin2 state. Other locks are not dealt here. For
 	 * that a RIL_REQUEST_QUERY_FACILITY_LOCK request should be used.
 	 */
@@ -518,10 +530,11 @@ void set_pin_lock_state(struct ofono_sim *sim,struct sim_app *app)
 	case RIL_PINSTATE_ENABLED_VERIFIED:
 	case RIL_PINSTATE_ENABLED_BLOCKED:
 	case RIL_PINSTATE_ENABLED_PERM_BLOCKED:
-		ofono_set_pin_lock_state(sim,OFONO_SIM_PASSWORD_SIM_PIN,TRUE);
+		ofono_set_pin_lock_state(sim, OFONO_SIM_PASSWORD_SIM_PIN, TRUE);
 		break;
 	case RIL_PINSTATE_DISABLED:
-		ofono_set_pin_lock_state(sim,OFONO_SIM_PASSWORD_SIM_PIN,FALSE);
+		ofono_set_pin_lock_state(
+			sim, OFONO_SIM_PASSWORD_SIM_PIN, FALSE);
 		break;
 	default:
 		break;
@@ -531,10 +544,12 @@ void set_pin_lock_state(struct ofono_sim *sim,struct sim_app *app)
 	case RIL_PINSTATE_ENABLED_VERIFIED:
 	case RIL_PINSTATE_ENABLED_BLOCKED:
 	case RIL_PINSTATE_ENABLED_PERM_BLOCKED:
-		ofono_set_pin_lock_state(sim,OFONO_SIM_PASSWORD_SIM_PIN2,TRUE);
+		ofono_set_pin_lock_state(
+			sim, OFONO_SIM_PASSWORD_SIM_PIN2, TRUE);
 		break;
 	case RIL_PINSTATE_DISABLED:
-		ofono_set_pin_lock_state(sim,OFONO_SIM_PASSWORD_SIM_PIN2,FALSE);
+		ofono_set_pin_lock_state(
+			sim, OFONO_SIM_PASSWORD_SIM_PIN2, FALSE);
 		break;
 	default:
 		break;
@@ -552,42 +567,42 @@ static void configure_active_app(struct sim_data *sd,
 
 	DBG("setting aid_str (AID) to: %s", sd->aid_str);
 	switch (app->app_state) {
-	case APPSTATE_PIN:
+	case RIL_APPSTATE_PIN:
 		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PIN;
 		break;
-	case APPSTATE_PUK:
+	case RIL_APPSTATE_PUK:
 		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PUK;
 		break;
-	case APPSTATE_SUBSCRIPTION_PERSO:
+	case RIL_APPSTATE_SUBSCRIPTION_PERSO:
 		switch (app->perso_substate) {
-		case PERSOSUBSTATE_SIM_NETWORK:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNET_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_NETWORK_SUBSET:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNETSUB_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_CORPORATE:
+		case RIL_PERSOSUBSTATE_SIM_CORPORATE:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHCORP_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_SERVICE_PROVIDER:
+		case RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSP_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_SIM:
+		case RIL_PERSOSUBSTATE_SIM_SIM:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSIM_PIN;
 			break;
-		case PERSOSUBSTATE_SIM_NETWORK_PUK:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNET_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK:
+		case RIL_PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHNETSUB_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_CORPORATE_PUK:
+		case RIL_PERSOSUBSTATE_SIM_CORPORATE_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHCORP_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK:
+		case RIL_PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHSP_PUK;
 			break;
-		case PERSOSUBSTATE_SIM_SIM_PUK:
+		case RIL_PERSOSUBSTATE_SIM_SIM_PUK:
 			sd->passwd_state = OFONO_SIM_PASSWORD_PHFSIM_PUK;
 			break;
 		default:
@@ -595,11 +610,11 @@ static void configure_active_app(struct sim_data *sd,
 			break;
 		};
 		break;
-	case APPSTATE_READY:
+	case RIL_APPSTATE_READY:
 		sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
 		break;
-	case APPSTATE_UNKNOWN:
-	case APPSTATE_DETECTED:
+	case RIL_APPSTATE_UNKNOWN:
+	case RIL_APPSTATE_DETECTED:
 	default:
 		sd->passwd_state = OFONO_SIM_PASSWORD_INVALID;
 		break;
@@ -642,7 +657,7 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 		if (sd->sim_registered == FALSE) {
 			ofono_sim_register(sim);
 			sd->sim_registered = TRUE;
-		} else
+		} else {
 			/* TODO: There doesn't seem to be any other
 			 * way to force the core SIM code to
 			 * recheck the PIN.
@@ -650,15 +665,17 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 			 * more appropriate call here??
 			 * __ofono_sim_refresh(sim, NULL, TRUE, TRUE);
 			 */
-			DBG("sd->card_state:%u",sd->card_state);
+			DBG("sd->card_state:%u", sd->card_state);
 			if (sd->card_state != RIL_CARDSTATE_PRESENT) {
 				ofono_sim_inserted_notify(sim, TRUE);
 				sd->card_state = RIL_CARDSTATE_PRESENT;
+				sd->removed = FALSE;
 			}
+		}
 
 		if (current_passwd) {
 			if (!strcmp(current_passwd, defaultpasswd)) {
-			__ofono_sim_recheck_pin(sim);
+				__ofono_sim_recheck_pin(sim);
 			} else if (sd->passwd_state !=
 						OFONO_SIM_PASSWORD_SIM_PIN) {
 				__ofono_sim_recheck_pin(sim);
@@ -690,6 +707,7 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 			parcel_w_int32(&rilp, 1);
 			parcel_w_int32(&rilp, 1);
 
+			ofono_info("RIL_REQUEST_RADIO_POWER ON");
 			g_ril_send(sd->ril,
 					RIL_REQUEST_RADIO_POWER,
 					rilp.data,
@@ -709,7 +727,10 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 		if (status.card_state == RIL_CARDSTATE_ABSENT) {
 			DBG("sd->card_state:%u,status.card_state:%u,",
 				sd->card_state, status.card_state);
+			ofono_info("RIL_CARDSTATE_ABSENT");
 			ofono_sim_inserted_notify(sim, FALSE);
+			if (sd->card_state == RIL_CARDSTATE_PRESENT)
+				sd->removed = TRUE;
 			sd->card_state = RIL_CARDSTATE_ABSENT;
 
 			if (current_passwd)
@@ -787,8 +808,8 @@ static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
 	retries[passwd_type] = retry_count;
 	sd->retries[passwd_type] = retries[passwd_type];
 
-	/* TODO: re-bfactor to not use macro for FAILURE; doesn't return error! */
-
+	DBG("result=%d passwd_type=%d retry_count=%d",
+		message->error, passwd_type, retry_count);
 	if (message->error == RIL_E_SUCCESS) {
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
 		g_ril_print_response_no_args(sd->ril, message);
@@ -837,11 +858,53 @@ static void ril_pin_send(struct ofono_sim *sim, const char *passwd,
 	}
 }
 
-static void ril_pin_change_state(struct ofono_sim *sim,
-					enum ofono_sim_password_type passwd_type,
-					int enable, const char *passwd,
-					ofono_sim_lock_unlock_cb_t cb, void *data)
+static int ril_perso_change_state(struct ofono_sim *sim,
+				enum ofono_sim_password_type passwd_type,
+				int enable, const char *passwd,
+				ofono_sim_lock_unlock_cb_t cb, void *data)
 {
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int request = 0;
+	int ret = 0;
+	sd->passwd_type = passwd_type;
+	cbd->user = sd;
+
+	parcel_init(&rilp);
+
+	switch (passwd_type) {
+	case OFONO_SIM_PASSWORD_PHNET_PIN:
+		if (enable) {
+			DBG("Not supported, enable=%d", enable);
+			goto end;
+		}
+		request = RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION;
+		parcel_w_int32(&rilp, RIL_PERSOSUBSTATE_SIM_NETWORK);
+		parcel_w_string(&rilp, (char *) passwd);
+		break;
+	default:
+		DBG("Not supported, type=%d", passwd_type);
+		goto end;
+	}
+
+	ret = g_ril_send(sd->ril, request,
+				rilp.data, rilp.size, ril_pin_change_state_cb,
+				cbd, g_free);
+
+	g_ril_print_request(sd->ril, ret, request);
+
+end:
+	parcel_free(&rilp);
+	return ret;
+}
+
+static void ril_pin_change_state(struct ofono_sim *sim,
+				enum ofono_sim_password_type passwd_type,
+				int enable, const char *passwd,
+				ofono_sim_lock_unlock_cb_t cb, void *data)
+{
+	DBG("passwd_type=%d", passwd_type);
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
 	struct parcel rilp;
@@ -879,9 +942,9 @@ static void ril_pin_change_state(struct ofono_sim *sim,
 		parcel_w_string(&rilp, "P2");
 		break;
 	case OFONO_SIM_PASSWORD_PHNET_PIN:
-		g_ril_append_print_buf(sd->ril, "(PN,");
-		parcel_w_string(&rilp, "PN");
-		break;
+		ret = ril_perso_change_state(sim, passwd_type, enable, passwd,
+						cb, data);
+		goto end;
 	case OFONO_SIM_PASSWORD_PHNETSUB_PIN:
 		g_ril_append_print_buf(sd->ril, "(PU,");
 		parcel_w_string(&rilp, "PU");
@@ -895,8 +958,7 @@ static void ril_pin_change_state(struct ofono_sim *sim,
 		parcel_w_string(&rilp, "PC");
 		break;
 	default:
-		CALLBACK_WITH_FAILURE(cb, data);
-		return;
+		goto end;
 	}
 
 	if (enable)
@@ -923,6 +985,7 @@ static void ril_pin_change_state(struct ofono_sim *sim,
 
 	g_ril_print_request(sd->ril, ret, request);
 
+end:
 	parcel_free(&rilp);
 
 	if (ret <= 0) {
@@ -1052,6 +1115,7 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 	sd->passwd_type = OFONO_SIM_PASSWORD_NONE;
 	sd->sim_registered = FALSE;
 	sd->card_state = RIL_CARDSTATE_ABSENT;
+	sd->removed = FALSE;
 
 	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
 		sd->retries[i] = -1;
@@ -1085,6 +1149,8 @@ static void ril_sim_remove(struct ofono_sim *sim)
 	if (sd->idle_id > 0)
 		g_source_remove(sd->idle_id);
 
+	g_free(sd->aid_str);
+	g_free(sd->app_str);
 	g_ril_unref(sd->ril);
 	g_free(sd);
 }
@@ -1105,17 +1171,6 @@ static struct ofono_sim_driver driver = {
 	.change_passwd		= ril_change_passwd,
 	.query_pin_retries	= ril_query_pin_retries,
 /*
- * TODO: Implmenting PIN/PUK support requires defining
- * the following driver methods.
- *
- * In the meanwhile, as long as the SIM card is present,
- * and unlocked, the core SIM code will check for the
- * presence of query_passwd_state, and if null, then the
- * function sim_initialize_after_pin() is called.
- *
- *	.query_pin_retries	= ril_pin_retries_query,
- *	.query_locked		= ril_pin_query_enabled,
- *
  * TODO: Implementing SIM write file IO support requires
  * the following functions to be defined.
  *

ofono/drivers/rilmodem/sms.c

@@ -38,10 +38,18 @@
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/sms.h>
+#include <ofono/types.h>
+#include <ofono/sim.h>
+
 #include "smsutil.h"
 #include "util.h"
-
 #include "rilmodem.h"
+#include "simutil.h"
+
+#define SIM_EFSMS_FILEID	0x6F3C
+#define EFSMS_LENGTH		176
+
+unsigned char path[4] = {0x3F, 0x00, 0x7F, 0x10};
 
 struct sms_data {
 	GRil *ril;
@@ -168,10 +176,14 @@ static void submit_sms_cb(struct ril_msg *message, gpointer user_data)
 	int mr;
 
 	if (message->error == RIL_E_SUCCESS) {
-		ofono_info("sms sending succesful");
+		ofono_info("sms sending successful");
 		decode_ril_error(&error, "OK");
+	} else if (message->error == RIL_E_GENERIC_FAILURE) {
+		ofono_info("not allowed by MO SMS control, do not retry");
+		error.type = OFONO_ERROR_TYPE_CMS;
+		error.error = 500;
 	} else {
-		ofono_error("sms sending failed");
+		ofono_error("sms sending failed, retry");
 		decode_ril_error(&error, "FAIL");
 	}
 
@@ -248,19 +260,21 @@ static void ril_ack_delivery_cb(struct ril_msg *message, gpointer user_data)
 			"SMS acknowledgement failed: Further SMS reception is not guaranteed");
 }
 
-static void ril_ack_delivery(struct ofono_sms *sms)
+static void ril_ack_delivery(struct ofono_sms *sms, int error)
 {
 	struct sms_data *sd = ofono_sms_get_data(sms);
 	struct parcel rilp;
 	int ret;
 	int request = RIL_REQUEST_SMS_ACKNOWLEDGE;
+	int code = 0;
+
+	if (!error)
+		code = 0xFF;
 
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 2); /* Number of int32 values in array */
-	parcel_w_int32(&rilp, 1); /* Successful receipt */
-	parcel_w_int32(&rilp, 0); /* error code */
-
-	/* TODO: should ACK be sent for either of the error cases? */
+	parcel_w_int32(&rilp, error); /* Successful (1)/Failed (0) receipt */
+	parcel_w_int32(&rilp, code); /* error code */
 
 	/* ACK the incoming NEW_SMS */
 	ret = g_ril_send(sd->ril, request,
@@ -329,14 +343,107 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 						ril_buf_len - smsc_len);
 	}
 
-	ril_ack_delivery(sms);
+	ril_ack_delivery(sms, TRUE);
 
 	return;
 
 error:
+	ril_ack_delivery(sms, FALSE);
+
 	ofono_error("Unable to parse NEW_SMS notification");
 }
 
+static void ril_new_sms_on_sim_cb(struct ril_msg *message, gpointer user_data)
+{
+	DBG("");
+	if (message->error == RIL_E_SUCCESS)
+		ofono_info("sms deleted from sim");
+	else
+		ofono_error("deleting sms from sim failed");
+}
+
+static void ril_request_delete_sms_om_sim(struct ofono_sms *sms,int record)
+{
+	struct sms_data *data = ofono_sms_get_data(sms);
+	struct parcel rilp;
+	int request = RIL_REQUEST_DELETE_SMS_ON_SIM;
+	int ret;
+
+	DBG("Deleting record: %d", record);
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, 1); /* Number of int32 values in array */
+	parcel_w_int32(&rilp, record);
+
+	ret = g_ril_send(data->ril, request, rilp.data,
+				rilp.size, ril_new_sms_on_sim_cb, NULL, NULL);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0)
+		ofono_error("cannot delete sms from sim");
+}
+
+static void ril_read_sms_on_sim_cb(const struct ofono_error *error,
+					const unsigned char *sdata,
+					int length, void *data)
+{
+	struct cb_data *cbd = data;
+	struct ofono_sms *sms = cbd->user;
+	int record;
+	unsigned int smsc_len;
+
+	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+		ofono_error("cannot read sms from sim");
+		goto exit;
+	}
+
+	/*
+	 * It seems when reading EFsms RIL returns the whole record including
+	 * the first status byte therefore we ignore that as we are only
+	 * interested of the following pdu
+	 */
+	/* The first octect in the pdu contains the SMSC address length
+	 * which is the X following octects it reads. We add 1 octet to
+	 * the read length to take into account this read octet in order
+	 * to calculate the proper tpdu length.
+	 */
+	smsc_len = sdata[1] + 1;
+
+	ofono_sms_deliver_notify(sms, sdata + 1, length - 1,
+				 length - smsc_len - 1);
+
+	record = (int)cbd->data;
+	ril_request_delete_sms_om_sim(sms,record);
+
+exit:
+	g_free(cbd);
+}
+
+static void ril_new_sms_on_sim(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_sms *sms = user_data;
+	struct parcel rilp;
+	int record;
+
+	ofono_info("new sms on sim");
+
+	ril_util_init_parcel(message, &rilp);
+
+	/* data length of the response */
+	record = parcel_r_int32(&rilp);
+
+	if (record > 0) {
+		record = parcel_r_int32(&rilp);
+		struct cb_data *cbd = cb_data_new2(sms, NULL, (void*)record);
+		DBG(":%d", record);
+		get_sim_driver()->read_file_linear(get_sim(), SIM_EFSMS_FILEID,
+						record, EFSMS_LENGTH, path,
+						sizeof(path),
+						ril_read_sms_on_sim_cb, cbd);
+	}
+}
+
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_sms *sms = user_data;
@@ -352,6 +459,8 @@ static gboolean ril_delayed_register(gpointer user_data)
 			ril_sms_notify, sms);
 	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS_STATUS_REPORT,
 			ril_sms_notify, sms);
+	g_ril_register(data->ril, RIL_UNSOL_RESPONSE_NEW_SMS_ON_SIM,
+			ril_new_sms_on_sim, sms);
 
 	/* This makes the timeout a single-shot */
 	return FALSE;

ofono/drivers/rilmodem/stk.c

@@ -0,0 +1,337 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2014 Jolla Ltd
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/stk.h>
+
+#include "gril.h"
+#include "util.h"
+
+#include "rilmodem.h"
+#include "ril_constants.h"
+
+struct stk_data {
+	GRil *ril;
+};
+
+gboolean subscribed;
+
+static void ril_envelope_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_stk_envelope_cb_t cb = cbd->cb;
+	struct ofono_error error;
+
+	DBG("");
+
+	if (message->error == RIL_E_SUCCESS) {
+		decode_ril_error(&error, "OK");
+	} else {
+		DBG("Envelope reply failure: %s",
+				ril_error_to_string(message->error));
+		decode_ril_error(&error, "FAIL");
+	}
+
+	cb(&error, NULL, 0, cbd->data);
+}
+
+static void ril_stk_envelope(struct ofono_stk *stk, int length,
+				const unsigned char *command,
+				ofono_stk_envelope_cb_t cb, void *data)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	char *hex_envelope = NULL;
+	int request = RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND;
+	guint ret;
+
+	DBG("");
+
+	hex_envelope = encode_hex(command, length, 0);
+
+	DBG("rilmodem envelope: %s", hex_envelope);
+
+	parcel_init(&rilp);
+	parcel_w_string(&rilp, hex_envelope);
+
+	ret = g_ril_send(sd->ril, request,
+				rilp.data, rilp.size, ril_envelope_cb,
+				cbd, g_free);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+			g_free(cbd);
+			CALLBACK_WITH_FAILURE(cb, NULL, -1, data);
+		}
+}
+
+static void ril_tr_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_stk_generic_cb_t cb = cbd->cb;
+	struct ofono_error error;
+
+	DBG("");
+
+	if (message->error == RIL_E_SUCCESS) {
+		decode_ril_error(&error, "OK");
+	} else {
+		DBG("Error in sending terminal response");
+		ofono_error("Error in sending terminal response");
+		decode_ril_error(&error, "FAIL");
+	}
+
+	cb(&error, cbd->data);
+}
+
+static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
+					const unsigned char *resp,
+					ofono_stk_generic_cb_t cb, void *data)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	char *hex_tr = NULL;
+	int request = RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE;
+	guint ret;
+
+	DBG("");
+
+	hex_tr = encode_hex(resp, length, 0);
+
+	DBG("rilmodem terminal response: %s", hex_tr);
+
+	parcel_init(&rilp);
+	parcel_w_string(&rilp, hex_tr);
+
+	ret = g_ril_send(sd->ril, request,
+				rilp.data, rilp.size, ril_tr_cb,
+				cbd, g_free);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+			g_free(cbd);
+			CALLBACK_WITH_FAILURE(cb, data);
+		}
+}
+
+static void ril_stk_user_confirmation(struct ofono_stk *stk,
+					ofono_bool_t confirm)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+	struct parcel rilp;
+	int request = RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM;
+	int ret;
+
+	DBG("");
+
+	/* Only pcmd needing user confirmation is call set up
+	 * RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM
+	 */
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, 1);		/* size of array */
+	parcel_w_int32(&rilp, confirm);	/* yes/no */
+
+	/* fire and forget i.e. not waiting for the callback*/
+	ret = g_ril_send(sd->ril, request, rilp.data,
+		 rilp.size, NULL, NULL, NULL);
+
+	g_ril_print_request_no_args(sd->ril, ret, request);
+
+	parcel_free(&rilp);
+}
+
+static void ril_stk_pcmd_notify(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_stk *stk = user_data;
+	struct parcel rilp;
+	char *pcmd = NULL;
+	guchar *pdu = NULL;
+	long len;
+
+	DBG("");
+
+	ril_util_init_parcel(message, &rilp);
+	pcmd = parcel_r_string(&rilp);
+	DBG("pcmd: %s", pcmd);
+
+	pdu = decode_hex((const char *) pcmd,
+			strlen(pcmd),
+			&len, -1);
+
+	ofono_stk_proactive_command_notify(stk, len, (const guchar *)pdu);
+}
+
+static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_stk *stk = user_data;
+	struct parcel rilp;
+	char *pcmd = NULL;
+	guchar *pdu = NULL;
+	long len;
+
+	DBG("");
+
+	/* Proactive command has been handled by the modem. */
+	ril_util_init_parcel(message, &rilp);
+	pcmd = parcel_r_string(&rilp);
+	DBG("pcmd: %s", pcmd);
+
+	pdu = decode_hex((const char *) pcmd,
+			strlen(pcmd),
+			&len, -1);
+
+	ofono_stk_proactive_command_handled_notify(stk, len,
+			(const guchar *)pdu);
+}
+
+static void ril_stk_session_end_notify(struct ril_msg *message,
+					gpointer user_data)
+{
+	struct ofono_stk *stk = user_data;
+
+	DBG("");
+
+	ofono_stk_proactive_session_end_notify(stk);
+}
+
+static void ril_stk_agent_ready(struct ofono_stk *stk)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+	int request = RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING;
+	int ret;
+
+	DBG("");
+
+	if (!subscribed) {
+		DBG("Subscribing notifications");
+		g_ril_register(sd->ril, RIL_UNSOL_STK_PROACTIVE_COMMAND,
+				ril_stk_pcmd_notify, stk);
+
+		g_ril_register(sd->ril, RIL_UNSOL_STK_SESSION_END,
+				ril_stk_session_end_notify, stk);
+
+		g_ril_register(sd->ril, RIL_UNSOL_STK_EVENT_NOTIFY,
+				ril_stk_event_notify, stk);
+		subscribed = TRUE;
+	}
+
+	/* fire and forget i.e. not waiting for the callback*/
+	ret = g_ril_send(sd->ril, request, NULL, 0,
+		 NULL, NULL, NULL);
+
+	g_ril_print_request_no_args(sd->ril, ret, request);
+}
+
+void ril_stk_set_lang()
+{
+	gchar *contents;
+	GError *err = NULL;
+
+	if (!g_file_get_contents(UI_LANG, &contents, NULL, &err)) {
+		if (err)
+			ofono_error("cannot open %s error: %d: message: %s",
+					UI_LANG, err->code, err->message);
+		g_error_free(err);
+	} else {
+		gchar *pch = g_strrstr(contents, CFG_LANG);
+		/* Set System UI lang to env LANG */
+		if (pch) {
+			setenv("LANG", pch + strlen(CFG_LANG), 1);
+			DBG("LANG %s", getenv("LANG"));
+		}
+		g_free(contents);
+	}
+}
+
+static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor, void *data)
+{
+	GRil *ril = data;
+	struct stk_data *sd;
+
+	DBG("");
+
+	sd = g_try_new0(struct stk_data, 1);
+	if (sd == NULL)
+		return -ENOMEM;
+
+	sd->ril = g_ril_clone(ril);
+	ofono_stk_set_data(stk, sd);
+
+	/* Register interface in this phase for stk agent */
+	ofono_stk_register(stk);
+
+	subscribed = FALSE;
+
+	/* UI language for local info */
+	ril_stk_set_lang();
+
+	return 0;
+}
+
+static void ril_stk_remove(struct ofono_stk *stk)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+
+	DBG("");
+
+	ofono_stk_set_data(stk, NULL);
+
+	g_ril_unref(sd->ril);
+	g_free(sd);
+}
+
+static struct ofono_stk_driver driver = {
+	.name			= "rilmodem",
+	.probe			= ril_stk_probe,
+	.remove			= ril_stk_remove,
+	.envelope		= ril_stk_envelope,
+	.terminal_response	= ril_stk_terminal_response,
+	.user_confirmation	= ril_stk_user_confirmation,
+	.ready			= ril_stk_agent_ready
+};
+
+void ril_stk_init(void)
+{
+	ofono_stk_driver_register(&driver);
+}
+
+void ril_stk_exit(void)
+{
+	ofono_stk_driver_unregister(&driver);
+}

ofono/drivers/rilmodem/ussd.c

@@ -75,12 +75,30 @@ static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
 		if (charset == SMS_CHARSET_7BIT) {
 			unsigned char unpacked_buf[182] = "";
 			long written;
+			int length;
 
 			unpack_7bit_own_buf(pdu, len, 0, TRUE,
 					sizeof(unpacked_buf), &written, 0,
 					unpacked_buf);
 
 			if (written >= 1) {
+				/*
+				 * When USSD was packed, additional CR
+				   might have been added (according to
+				   23.038 6.1.2.3.1). So if the last
+				   character is CR, it should be removed
+				   here. And in addition written doesn't
+				   contain correct length...
+
+				   Over 2 characters long USSD string must
+				   end with # (checked in
+				   valid_ussd_string() ), so it should be
+				   safe to remove extra CR.
+				*/
+				length = strlen((char *)unpacked_buf);
+				if (length > 2 &&
+				    unpacked_buf[length-1] == '\r')
+					unpacked_buf[length-1] = 0;
 				struct parcel rilp;
 				parcel_init(&rilp);
 				parcel_w_string(&rilp, (char *)unpacked_buf);

ofono/drivers/rilmodem/voicecall.c

@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
  *  Copyright (C) 2012 Canonical Ltd.
- *  Copyright (C) 2013 Jolla Ltd.
+ *  Copyright (C) 2014 Jolla 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
@@ -86,6 +86,21 @@ struct lastcause_req {
 static void send_one_dtmf(struct voicecall_data *vd);
 static void clear_dtmf_queue(struct voicecall_data *vd);
 
+/*
+ * structs ofono_voicecall and voicecall are fully defined
+ * in src/voicecall.c; we need (read) access to the
+ * call objects, so partially redefine them here.
+ */
+struct ofono_voicecall {
+	GSList *call_list;
+	/* ... */
+};
+
+struct voicecall {
+	struct ofono_call *call;
+	/* ... */
+};
+
 static void lastcause_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct lastcause_req *reqdata = user_data;
@@ -99,11 +114,38 @@ static void lastcause_cb(struct ril_msg *message, gpointer user_data)
 	if (parcel_r_int32(&rilp) > 0)
 		last_cause = parcel_r_int32(&rilp);
 
+	/*
+	 * Not all call control cause values specified in 3GPP TS 24.008
+	 * "Mobile radio interface Layer 3 specification; Core network protocols",
+	 * Annex H, are properly reflected in the RIL API. For example, cause
+	 * #21 "call rejected" is mapped to CALL_FAIL_ERROR_UNSPECIFIED, and
+	 * thus indistinguishable from a network failure.
+	 * We signal disconnect reason "remote" for cause values
+	 *   - #16 "normal call clearing"
+	 *   - #17 "user busy"
+	 *   - UNSPECIFIED for MO calls that are not yet connected
+	 * , and disconnect reason "network" otherwise.
+	 */
 	ofono_info("Call %d ended with RIL cause %d", id, last_cause);
 	if (last_cause == CALL_FAIL_NORMAL || last_cause == CALL_FAIL_BUSY) {
 		reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
 	}
 
+	if (last_cause == CALL_FAIL_ERROR_UNSPECIFIED) {
+		GSList *l;
+		struct voicecall *v;
+		for (l = vc->call_list; l; l = l->next) {
+			v = l->data;
+			if (v->call->id == id) {
+				if (v->call->status == CALL_STATUS_DIALING
+					|| v->call->status == CALL_STATUS_ALERTING) {
+					reason = OFONO_DISCONNECT_REASON_REMOTE_HANGUP;
+				}
+				break;
+			}
+		}
+	}
+
 	ofono_voicecall_disconnected(vc, id, reason, NULL);
 }
 
@@ -236,6 +278,8 @@ static void generic_cb(struct ril_msg *message, gpointer user_data)
 	int request = RIL_REQUEST_GET_CURRENT_CALLS;
 	int ret;
 
+	ofono_info("request:%d",message->req);
+
 	if (message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
 	} else {
@@ -634,6 +678,13 @@ static void ril_create_multiparty(struct ofono_voicecall *vc,
 		cb(&error, data);
 }
 
+static void ril_transfer(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	ril_template(RIL_REQUEST_EXPLICIT_CALL_TRANSFER, vc, generic_cb, 0,
+				NULL, 0, cb, data);
+}
+
 static void private_chat_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_error error;
@@ -727,6 +778,23 @@ static gboolean enable_supp_svc(gpointer user_data)
 	return FALSE;
 }
 
+static void ril_ringback_tone_notify(struct ril_msg *message,
+	gpointer user_data)
+{
+	struct parcel rilp;
+	struct ofono_voicecall *vc = user_data;
+	gboolean playTone = FALSE;
+
+	ril_util_init_parcel(message, &rilp);
+
+	if (message->req == RIL_UNSOL_RINGBACK_TONE) {
+		if (parcel_r_int32(&rilp) > 0)
+			playTone = parcel_r_int32(&rilp);
+		DBG("play ringback tone: %d", playTone);
+		ofono_voicecall_ringback_tone_notify(vc, playTone);
+	}
+}
+
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_voicecall *vc = user_data;
@@ -747,6 +815,10 @@ static gboolean ril_delayed_register(gpointer user_data)
 	g_ril_register(vd->ril, RIL_UNSOL_SUPP_SVC_NOTIFICATION,
 			ril_ss_notify, vc);
 
+	/* Register for ringback tone notifications */
+	g_ril_register(vd->ril, RIL_UNSOL_RINGBACK_TONE,
+			ril_ringback_tone_notify, vc);
+
 	/* request supplementary service notifications*/
 	enable_supp_svc(vc);
 
@@ -803,6 +875,7 @@ static void ril_voicecall_remove(struct ofono_voicecall *vc)
 	if (vd->timer_id > 0)
 		g_source_remove(vd->timer_id);
 
+	g_free(vd->tone_queue);
 	g_ril_unref(vd->ril);
 	g_free(vd);
 }
@@ -817,12 +890,13 @@ static struct ofono_voicecall_driver driver = {
 	.release_specific		= ril_hangup_specific,
 	.send_tones			= ril_send_dtmf,
 	.create_multiparty		= ril_create_multiparty,
+	.transfer			= ril_transfer,
 	.private_chat			= ril_private_chat,
 	.swap_without_accept		= ril_swap_without_accept,
 	.hold_all_active		= ril_hold_all_active,
 	.release_all_held		= ril_release_all_held,
 	.set_udub			= ril_set_udub,
-	.release_all_active	= ril_release_all_active,
+	.release_all_active		= ril_release_all_active,
 };
 
 void ril_voicecall_init(void)

ofono/dundee/dundee.service.in

@@ -1,6 +1,7 @@
 [Unit]
 Description=DUN service
-After=syslog.target
+Requires=dbus.service
+After=dbus.service
 
 [Service]
 Type=dbus

ofono/gatchat/gatchat.c

@@ -835,6 +835,9 @@ static gboolean can_write_data(gpointer data)
 	gsize len;
 	char *cr;
 	gboolean wakeup_first = FALSE;
+#ifdef WRITE_SCHEDULER_DEBUG
+	int limiter;
+#endif
 
 	/* Grab the first command off the queue and write as
 	 * much of it as we can
@@ -886,13 +889,20 @@ static gboolean can_write_data(gpointer data)
 		towrite = cr - (cmd->cmd + chat->cmd_bytes_written) + 1;
 
 #ifdef WRITE_SCHEDULER_DEBUG
-	if (towrite > 5)
-		towrite = 5;
+	limiter = towrite;
+
+	if (limiter > 5)
+		limiter = 5;
 #endif
 
 	bytes_written = g_at_io_write(chat->io,
 					cmd->cmd + chat->cmd_bytes_written,
-					towrite);
+#ifdef WRITE_SCHEDULER_DEBUG
+					limiter
+#else
+					towrite
+#endif
+					);
 
 	if (bytes_written == 0)
 		return FALSE;

ofono/gdbus/client.c

@@ -56,6 +56,8 @@ struct GDBusClient {
 	void *signal_data;
 	GDBusProxyFunction proxy_added;
 	GDBusProxyFunction proxy_removed;
+	GDBusClientFunction ready;
+	void *ready_data;
 	GDBusPropertyFunction property_changed;
 	void *user_data;
 	GList *proxy_list;
@@ -725,6 +727,93 @@ gboolean g_dbus_proxy_set_property_basic(GDBusProxy *proxy,
 	return TRUE;
 }
 
+gboolean g_dbus_proxy_set_property_array(GDBusProxy *proxy,
+				const char *name, int type, const void *value,
+				size_t size, GDBusResultFunction function,
+				void *user_data, GDBusDestroyFunction destroy)
+{
+	struct set_property_data *data;
+	GDBusClient *client;
+	DBusMessage *msg;
+	DBusMessageIter iter, variant, array;
+	DBusPendingCall *call;
+	char array_sig[3];
+	char type_sig[2];
+
+	if (!proxy || !name || !value)
+		return FALSE;
+
+	if (!dbus_type_is_basic(type))
+		return FALSE;
+
+	client = proxy->client;
+	if (!client)
+		return FALSE;
+
+	data = g_try_new0(struct set_property_data, 1);
+	if (!data)
+		return FALSE;
+
+	data->function = function;
+	data->user_data = user_data;
+	data->destroy = destroy;
+
+	msg = dbus_message_new_method_call(client->service_name,
+						proxy->obj_path,
+						DBUS_INTERFACE_PROPERTIES,
+						"Set");
+	if (!msg) {
+		g_free(data);
+		return FALSE;
+	}
+
+	array_sig[0] = DBUS_TYPE_ARRAY;
+	array_sig[1] = (char) type;
+	array_sig[2] = '\0';
+
+	type_sig[0] = (char) type;
+	type_sig[1] = '\0';
+
+	dbus_message_iter_init_append(msg, &iter);
+	dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING,
+							&proxy->interface);
+	dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &name);
+
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT,
+							array_sig, &variant);
+
+	dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY,
+							type_sig, &array);
+
+	if (dbus_type_is_fixed(type))
+		dbus_message_iter_append_fixed_array(&array, type, &value,
+									size);
+	else if (type == DBUS_TYPE_STRING || type == DBUS_TYPE_OBJECT_PATH) {
+		const char **str = (const char **) value;
+		size_t i;
+
+		for (i = 0; i < size; i++)
+			dbus_message_iter_append_basic(&array, type, &str[i]);
+	}
+
+	dbus_message_iter_close_container(&variant, &array);
+	dbus_message_iter_close_container(&iter, &variant);
+
+	if (g_dbus_send_message_with_reply(client->dbus_conn, msg,
+							&call, -1) == FALSE) {
+		dbus_message_unref(msg);
+		g_free(data);
+		return FALSE;
+	}
+
+	dbus_pending_call_set_notify(call, set_property_reply, data, g_free);
+	dbus_pending_call_unref(call);
+
+	dbus_message_unref(msg);
+
+	return TRUE;
+}
+
 struct method_call_data {
 	GDBusReturnFunction function;
 	void *user_data;
@@ -982,6 +1071,9 @@ static void parse_managed_objects(GDBusClient *client, DBusMessage *msg)
 
 		dbus_message_iter_next(&dict);
 	}
+
+	if (client->ready)
+		client->ready(client, client->ready_data);
 }
 
 static void get_managed_objects_reply(DBusPendingCall *call, void *user_data)
@@ -1243,6 +1335,18 @@ gboolean g_dbus_client_set_signal_watch(GDBusClient *client,
 	return TRUE;
 }
 
+gboolean g_dbus_client_set_ready_watch(GDBusClient *client,
+				GDBusClientFunction ready, void *user_data)
+{
+	if (client == NULL)
+		return FALSE;
+
+	client->ready = ready;
+	client->ready_data = user_data;
+
+	return TRUE;
+}
+
 gboolean g_dbus_client_set_proxy_handlers(GDBusClient *client,
 					GDBusProxyFunction proxy_added,
 					GDBusProxyFunction proxy_removed,

ofono/gdbus/gdbus.h

@@ -329,6 +329,11 @@ gboolean g_dbus_proxy_set_property_basic(GDBusProxy *proxy,
 				GDBusResultFunction function, void *user_data,
 				GDBusDestroyFunction destroy);
 
+gboolean g_dbus_proxy_set_property_array(GDBusProxy *proxy,
+				const char *name, int type, const void *value,
+				size_t size, GDBusResultFunction function,
+				void *user_data, GDBusDestroyFunction destroy);
+
 typedef void (* GDBusSetupFunction) (DBusMessageIter *iter, void *user_data);
 typedef void (* GDBusReturnFunction) (DBusMessage *message, void *user_data);
 
@@ -337,6 +342,7 @@ gboolean g_dbus_proxy_method_call(GDBusProxy *proxy, const char *method,
 				GDBusReturnFunction function, void *user_data,
 				GDBusDestroyFunction destroy);
 
+typedef void (* GDBusClientFunction) (GDBusClient *client, void *user_data);
 typedef void (* GDBusProxyFunction) (GDBusProxy *proxy, void *user_data);
 typedef void (* GDBusPropertyFunction) (GDBusProxy *proxy, const char *name,
 					DBusMessageIter *iter, void *user_data);
@@ -359,7 +365,8 @@ gboolean g_dbus_client_set_disconnect_watch(GDBusClient *client,
 				GDBusWatchFunction function, void *user_data);
 gboolean g_dbus_client_set_signal_watch(GDBusClient *client,
 				GDBusMessageFunction function, void *user_data);
-
+gboolean g_dbus_client_set_ready_watch(GDBusClient *client,
+				GDBusClientFunction ready, void *user_data);
 gboolean g_dbus_client_set_proxy_handlers(GDBusClient *client,
 					GDBusProxyFunction proxy_added,
 					GDBusProxyFunction proxy_removed,

ofono/gdbus/mainloop.c

@@ -30,8 +30,6 @@
 
 #include "gdbus.h"
 
-#define DISPATCH_TIMEOUT  0
-
 #define info(fmt...)
 #define error(fmt...)
 #define debug(fmt...)
@@ -70,8 +68,6 @@ static gboolean message_dispatch(void *data)
 {
 	DBusConnection *conn = data;
 
-	dbus_connection_ref(conn);
-
 	/* Dispatch messages */
 	while (dbus_connection_dispatch(conn) == DBUS_DISPATCH_DATA_REMAINS);
 
@@ -84,7 +80,7 @@ static inline void queue_dispatch(DBusConnection *conn,
 						DBusDispatchStatus status)
 {
 	if (status == DBUS_DISPATCH_DATA_REMAINS)
-		g_timeout_add(DISPATCH_TIMEOUT, message_dispatch, conn);
+		g_idle_add(message_dispatch, dbus_connection_ref(conn));
 }
 
 static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
@@ -92,9 +88,6 @@ static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
 	struct watch_info *info = data;
 	unsigned int flags = 0;
 	DBusDispatchStatus status;
-	DBusConnection *conn;
-
-	conn = dbus_connection_ref(info->conn);
 
 	if (cond & G_IO_IN)  flags |= DBUS_WATCH_READABLE;
 	if (cond & G_IO_OUT) flags |= DBUS_WATCH_WRITABLE;
@@ -103,10 +96,8 @@ static gboolean watch_func(GIOChannel *chan, GIOCondition cond, gpointer data)
 
 	dbus_watch_handle(info->watch, flags);
 
-	status = dbus_connection_get_dispatch_status(conn);
-	queue_dispatch(conn, status);
-
-	dbus_connection_unref(conn);
+	status = dbus_connection_get_dispatch_status(info->conn);
+	queue_dispatch(info->conn, status);
 
 	return TRUE;
 }

ofono/gdbus/object.c

@@ -1253,6 +1253,8 @@ static struct generic_data *object_path_ref(DBusConnection *connection,
 
 	if (!dbus_connection_register_object_path(connection, path,
 						&generic_table, data)) {
+		dbus_connection_unref(data->conn);
+		g_free(data->path);
 		g_free(data->introspect);
 		g_free(data);
 		return NULL;

ofono/gril/gril.c

@@ -355,7 +355,8 @@ static void handle_response(struct ril_s *p, struct ril_msg *message)
 	int i;
 	guint len, id;
 
-	g_assert(count > 0);
+	if (!count)
+		return;
 
 	for (i = 0; i < count; i++) {
 		req = g_queue_peek_nth(p->command_queue, i);
@@ -373,13 +374,13 @@ static void handle_response(struct ril_s *p, struct ril_msg *message)
 							message->error));
 
 			req = g_queue_pop_nth(p->command_queue, i);
-			if (req->callback) {
+			if (req->callback)
 				req->callback(message, req->user_data);
-			}
 
 			len = g_queue_get_length(p->out_queue);
 			for (i = 0; i < len; i++) {
-				id = *(guint *) g_queue_peek_nth(p->out_queue, i);
+				id = *(guint *) g_queue_peek_nth(
+							p->out_queue, i);
 				if (id == req->id) {
 					g_queue_pop_nth(p->out_queue, i);
 					break;
@@ -403,14 +404,21 @@ static void handle_response(struct ril_s *p, struct ril_msg *message)
 
 }
 
+static void notify_call_callback(gpointer data, gpointer user_data)
+{
+	struct ril_notify_node *node = data;
+	struct ril_msg *message = user_data;
+
+	node->callback(message, node->user_data);
+}
+
 static void handle_unsol_req(struct ril_s *p, struct ril_msg *message)
 {
 	GHashTableIter iter;
 	struct ril_notify *notify;
 	int req_key;
 	gpointer key, value;
-	GList *list_item;
-	struct ril_notify_node *node;
+	GSList *list_item;
 	gboolean found = FALSE;
 
 	if (p->notify_list == NULL)
@@ -430,15 +438,12 @@ static void handle_unsol_req(struct ril_s *p, struct ril_msg *message)
 		if (req_key != message->req)
 			continue;
 
-		list_item = (GList *) notify->nodes;
+		list_item = notify->nodes;
 
-		while (list_item != NULL) {
-			node = list_item->data;
-
-			node->callback(message, node->user_data);
+		if (list_item)
 			found = TRUE;
-			list_item = (GList *) g_slist_next(list_item);
-		}
+
+		g_slist_foreach(notify->nodes, notify_call_callback, message);
 	}
 
 	/* Only log events not being listended for... */
@@ -582,9 +587,8 @@ static void new_bytes(struct ring_buffer *rbuf, gpointer user_data)
 	while (p->suspended == FALSE && (p->read_so_far < len)) {
 		gsize rbytes = MIN(len - p->read_so_far, wrap - p->read_so_far);
 
-		if (rbytes < 4) {
+		if (rbytes < 4)
 			return;
-		}
 
 		/* this function attempts to read the next full length
 		 * fixed message from the stream.  if not all bytes are
@@ -595,9 +599,8 @@ static void new_bytes(struct ring_buffer *rbuf, gpointer user_data)
 		message = read_fixed_record(p, buf, &rbytes);
 
 		/* wait for the rest of the record... */
-		if (message == NULL) {
+		if (message == NULL)
 			break;
-		}
 
 		buf += rbytes;
 		p->read_so_far += rbytes;
@@ -642,7 +645,8 @@ static gboolean can_write_data(gpointer data)
 		for (i = 0; i < qlen; i++) {
 			req = g_queue_peek_nth(ril->command_queue, i);
 			if (req) {
-				id = *(guint *) g_queue_peek_head(ril->out_queue);
+				id = *(guint *) g_queue_peek_head(
+							ril->out_queue);
 				if (req->id == id)
 					goto out;
 			} else {

ofono/gril/ril_constants.h

@@ -191,6 +191,7 @@
 #define RIL_PERSOSUBSTATE_RUIM_RUIM_PUK 24
 
 /* SIM - App states */
+#define RIL_APPSTATE_ILLEGAL -1
 #define RIL_APPSTATE_UNKNOWN 0
 #define RIL_APPSTATE_DETECTED 1
 #define RIL_APPSTATE_PIN 2
@@ -387,4 +388,8 @@
 /* Suplementary services Service class*/
 #define SERVICE_CLASS_NONE 0
 
+/* RIL_FACILITY_LOCK parameters */
+#define RIL_FACILITY_UNLOCK "0"
+#define RIL_FACILITY_LOCK "1"
+
 #endif /*__RIL_CONSTANTS_H*/

ofono/include/dbus.h

@@ -80,29 +80,29 @@ extern "C" {
 DBusConnection *ofono_dbus_get_connection(void);
 
 void ofono_dbus_dict_append(DBusMessageIter *dict, const char *key, int type,
-				void *value);
+				const void *value);
 
 void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key,
-					int type, void *val);
+					int type, const void *val);
 
 void ofono_dbus_dict_append_dict(DBusMessageIter *dict, const char *key,
-					int type, void *val);
+					int type, const void *val);
 
 int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path,
 					const char *interface, const char *name,
-					int type, void *value);
+					int type, const void *value);
 
 int ofono_dbus_signal_array_property_changed(DBusConnection *conn,
 						const char *path,
 						const char *interface,
 						const char *name, int type,
-						void *value);
+						const void *value);
 
 int ofono_dbus_signal_dict_property_changed(DBusConnection *conn,
 						const char *path,
 						const char *interface,
 						const char *name, int type,
-						void *value);
+						const void *value);
 
 #ifdef __cplusplus
 }

ofono/include/gprs-provision.h

@@ -31,6 +31,8 @@ extern "C" {
 struct ofono_gprs_provision_data {
 	enum ofono_gprs_context_type type;
 	enum ofono_gprs_proto proto;
+	char *provider_name;
+	ofono_bool_t provider_primary;
 	char *name;
 	char *apn;
 	char *username;

ofono/include/handsfree.h

@@ -36,12 +36,18 @@ typedef void (*ofono_handsfree_cb_t)(const struct ofono_error *error,
 typedef void (*ofono_handsfree_phone_cb_t)(const struct ofono_error *error,
 					const struct ofono_phone_number *number,
 					void *data);
+typedef void (*ofono_handsfree_cnum_query_cb_t)(const struct ofono_error *error,
+				int total,
+				const struct ofono_phone_number *numbers,
+				void *data);
 
 struct ofono_handsfree_driver {
 	const char *name;
 	int (*probe)(struct ofono_handsfree *hf, unsigned int vendor,
 			void *data);
 	void (*remove)(struct ofono_handsfree *hf);
+	void (*cnum_query)(struct ofono_handsfree *hf,
+				ofono_handsfree_cnum_query_cb_t cb, void *data);
 	void (*request_phone_number) (struct ofono_handsfree *hf,
 					ofono_handsfree_phone_cb_t cb,
 					void *data);
@@ -54,6 +60,8 @@ struct ofono_handsfree_driver {
 
 void ofono_handsfree_set_ag_features(struct ofono_handsfree *hf,
 					unsigned int ag_features);
+void ofono_handsfree_set_ag_chld_features(struct ofono_handsfree *hf,
+					unsigned int ag_chld_features);
 void ofono_handsfree_set_inband_ringing(struct ofono_handsfree *hf,
 						ofono_bool_t enabled);
 void ofono_handsfree_voice_recognition_notify(struct ofono_handsfree *hf,

ofono/include/stk.h

@@ -48,6 +48,7 @@ struct ofono_stk_driver {
 					int length, const unsigned char *resp,
 					ofono_stk_generic_cb_t cb, void *data);
 	void (*user_confirmation)(struct ofono_stk *stk, ofono_bool_t confirm);
+	void (*ready)(struct ofono_stk *stk);
 };
 
 int ofono_stk_driver_register(const struct ofono_stk_driver *d);

ofono/include/voicecall.h

@@ -3,6 +3,7 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2014 Jolla 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
@@ -171,6 +172,9 @@ void ofono_voicecall_ssn_mt_notify(struct ofono_voicecall *vc, unsigned int id,
 					int code, int index,
 					const struct ofono_phone_number *ph);
 
+void ofono_voicecall_ringback_tone_notify(struct ofono_voicecall *vc,
+						const ofono_bool_t playTone);
+
 #ifdef __cplusplus
 }
 #endif

ofono/plugins/he910.c

@@ -59,6 +59,7 @@
 #include <drivers/atmodem/vendor.h>
 
 static const char *none_prefix[] = { NULL };
+static const char *qss_prefix[] = { "#QSS:", NULL };
 
 struct he910_data {
 	GAtChat *chat;		/* AT chat */
@@ -101,7 +102,7 @@ static GAtChat *open_device(struct ofono_modem *modem,
 	if (channel == NULL)
 		return NULL;
 
-	syntax = g_at_syntax_new_gsmv1();
+	syntax = g_at_syntax_new_gsm_permissive();
 	chat = g_at_chat_new(channel, syntax);
 	g_at_syntax_unref(syntax);
 	g_io_channel_unref(channel);
@@ -167,6 +168,31 @@ static void he910_qss_notify(GAtResult *result, gpointer user_data)
 	switch_sim_state_status(modem, status);
 }
 
+static void qss_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	int status, mode;
+	GAtResultIter iter;
+
+	DBG("%p", modem);
+
+	if (!ok)
+		return;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "#QSS:"))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &mode))
+		return;
+
+	if (!g_at_result_iter_next_number(&iter, &status))
+		return;
+
+	switch_sim_state_status(modem, status);
+}
+
 static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -204,6 +230,15 @@ static void cfun_enable_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	g_at_chat_send(data->chat, "AT#AUTOATT=0", none_prefix,
 				NULL, NULL, NULL);
 
+	/* Follow sim state */
+	g_at_chat_register(data->chat, "#QSS:", he910_qss_notify,
+				FALSE, modem, NULL);
+
+	/* Enable sim state notification */
+	g_at_chat_send(data->chat, "AT#QSS=2", none_prefix, NULL, NULL, NULL);
+
+	g_at_chat_send(data->chat, "AT#QSS?", qss_prefix,
+			qss_query_cb, modem, NULL);
 }
 
 static int he910_enable(struct ofono_modem *modem)
@@ -232,13 +267,6 @@ static int he910_enable(struct ofono_modem *modem)
 	g_at_chat_send(data->chat, "ATE0 +CMEE=1", none_prefix,
 				NULL, NULL, NULL);
 
-	/* Follow sim state */
-	g_at_chat_register(data->chat, "#QSS:", he910_qss_notify,
-				FALSE, modem, NULL);
-
-	/* Enable sim state notification */
-	g_at_chat_send(data->chat, "AT#QSS=2", none_prefix, NULL, NULL, NULL);
-
 	/* Set phone functionality */
 	g_at_chat_send(data->chat, "AT+CFUN=1", none_prefix,
 				cfun_enable_cb, modem, NULL);

ofono/plugins/mbpi.c

@@ -53,6 +53,8 @@ enum MBPI_ERROR {
 struct gsm_data {
 	const char *match_mcc;
 	const char *match_mnc;
+	char *provider_name;
+	gboolean provider_primary;
 	GSList *apns;
 	gboolean match_found;
 	gboolean allow_duplicates;
@@ -84,6 +86,7 @@ static GQuark mbpi_error_quark(void)
 
 void mbpi_ap_free(struct ofono_gprs_provision_data *ap)
 {
+	g_free(ap->provider_name);
 	g_free(ap->name);
 	g_free(ap->apn);
 	g_free(ap->username);
@@ -117,6 +120,7 @@ static void text_handler(GMarkupParseContext *context,
 {
 	char **string = userdata;
 
+        g_free(*string);
 	*string = g_strndup(text, text_len);
 }
 
@@ -190,7 +194,9 @@ static void apn_end(GMarkupParseContext *context, const gchar *element_name,
 {
 	if (g_str_equal(element_name, "name") ||
 			g_str_equal(element_name, "username") ||
-			g_str_equal(element_name, "password"))
+			g_str_equal(element_name, "password") ||
+			g_str_equal(element_name, "mmsc") ||
+			g_str_equal(element_name, "mmsproxy"))
 		g_markup_parse_context_pop(context);
 }
 
@@ -286,6 +292,9 @@ static void apn_handler(GMarkupParseContext *context, struct gsm_data *gsm,
 	}
 
 	ap = g_new0(struct ofono_gprs_provision_data, 1);
+	ap->provider_name = g_strdup(gsm->provider_name);
+	ap->provider_primary = gsm->provider_primary;
+
 	ap->apn = g_strdup(apn);
 	ap->type = OFONO_GPRS_CONTEXT_TYPE_INTERNET;
 	ap->proto = OFONO_GPRS_PROTO_IP;
@@ -452,27 +461,68 @@ static const GMarkupParser provider_parser = {
 	NULL,
 };
 
-static void toplevel_gsm_start(GMarkupParseContext *context,
+static void gsm_provider_start(GMarkupParseContext *context,
 					const gchar *element_name,
-					const gchar **atribute_names,
+					const gchar **attribute_names,
 					const gchar **attribute_values,
 					gpointer userdata, GError **error)
 {
 	struct gsm_data *gsm = userdata;
 
-	if (g_str_equal(element_name, "gsm")) {
+	if (g_str_equal(element_name, "name")) {
+		g_free(gsm->provider_name);
+		gsm->provider_name = NULL;
+		g_markup_parse_context_push(context, &text_parser,
+						&gsm->provider_name);
+	} else if (g_str_equal(element_name, "gsm")) {
 		gsm->match_found = FALSE;
 		g_markup_parse_context_push(context, &gsm_parser, gsm);
 	} else if (g_str_equal(element_name, "cdma"))
 		g_markup_parse_context_push(context, &skip_parser, NULL);
 }
 
+static void gsm_provider_end(GMarkupParseContext *context,
+					const gchar *element_name,
+					gpointer userdata, GError **error)
+{
+	if (g_str_equal(element_name, "name") ||
+				g_str_equal(element_name, "gsm") ||
+				g_str_equal(element_name, "cdma"))
+		g_markup_parse_context_pop(context);
+}
+
+static const GMarkupParser gsm_provider_parser = {
+	gsm_provider_start,
+	gsm_provider_end,
+	NULL,
+	NULL,
+	NULL,
+};
+
+static void toplevel_gsm_start(GMarkupParseContext *context,
+					const gchar *element_name,
+					const gchar **attribute_names,
+					const gchar **attribute_values,
+					gpointer userdata, GError **error)
+{
+	struct gsm_data *gsm = userdata;
+
+	if (g_str_equal(element_name, "provider")) {
+		g_markup_collect_attributes(element_name, attribute_names,
+				attribute_values, error,
+				G_MARKUP_COLLECT_BOOLEAN | G_MARKUP_COLLECT_OPTIONAL,
+				"primary", &gsm->provider_primary,
+				G_MARKUP_COLLECT_INVALID);
+
+		g_markup_parse_context_push(context, &gsm_provider_parser, gsm);
+	}
+}
+
 static void toplevel_gsm_end(GMarkupParseContext *context,
 					const gchar *element_name,
 					gpointer userdata, GError **error)
 {
-	if (g_str_equal(element_name, "gsm") ||
-			g_str_equal(element_name, "cdma"))
+	if (g_str_equal(element_name, "provider"))
 		g_markup_parse_context_pop(context);
 }
 
@@ -486,7 +536,7 @@ static const GMarkupParser toplevel_gsm_parser = {
 
 static void toplevel_cdma_start(GMarkupParseContext *context,
 					const gchar *element_name,
-					const gchar **atribute_names,
+					const gchar **attribute_names,
 					const gchar **attribute_values,
 					gpointer userdata, GError **error)
 {
@@ -589,6 +639,7 @@ GSList *mbpi_lookup_apn(const char *mcc, const char *mnc,
 		gsm.apns = NULL;
 	}
 
+	g_free(gsm.provider_name);
 	return gsm.apns;
 }
 

ofono/plugins/nettime.c

@@ -188,11 +188,11 @@ static int nettime_probe(struct ofono_nettime_context *context)
 					NULL, // GDBusPropertyTable *properties
 					NULL, // user data
 					NULL)) { // GDBusDestroyFunction destroy
-		ofono_error("Networkt time: Could not register interface %s, path %s",
+		ofono_error("Network time: Could not register interface %s, path %s",
 				OFONO_NETWORK_TIME_INTERFACE, path);
 		return 1;
 	} else {
-		ofono_info("Network time: Registered inteface %s, path %s",
+		ofono_info("Network time: Registered interface %s, path %s",
 				OFONO_NETWORK_TIME_INTERFACE, path);
 	}
 
@@ -235,6 +235,12 @@ static void nettime_info_received(struct ofono_nettime_context *context,
 
 	netreg = __ofono_atom_get_data(__ofono_modem_find_atom(
 						context->modem, OFONO_ATOM_TYPE_NETREG));
+
+	if (!(ofono_netreg_get_mcc(netreg) && ofono_netreg_get_mnc(netreg))) {
+		DBG("Incomplete network time received, ignoring");
+		return;
+	}
+
 	ntd->path = ofono_modem_get_path(context->modem);
 	ntd->mcc = ofono_netreg_get_mcc(netreg);
 	ntd->mnc = ofono_netreg_get_mnc(netreg);

ofono/plugins/phonesim.c

@@ -1071,6 +1071,7 @@ done:
 static int phonesim_init(void)
 {
 	int err;
+	char *conf_override = getenv("OFONO_PHONESIM_CONFIG");
 
 	err = ofono_modem_driver_register(&phonesim_driver);
 	if (err < 0)
@@ -1081,7 +1082,10 @@ static int phonesim_init(void)
 	ofono_gprs_context_driver_register(&context_driver);
 	ofono_ctm_driver_register(&ctm_driver);
 
-	parse_config(CONFIGDIR "/phonesim.conf");
+	if (conf_override)
+		parse_config(conf_override);
+	else
+		parse_config(CONFIGDIR "/phonesim.conf");
 
 	return 0;
 }

ofono/plugins/provision.c

@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#define _GNU_SOURCE
 #include <errno.h>
 #include <string.h>
 
@@ -36,9 +37,134 @@
 #include <ofono/modem.h>
 #include <ofono/gprs-provision.h>
 
+#include "provision.h"
 #include "mbpi.h"
 
-static int provision_get_settings(const char *mcc, const char *mnc,
+/* Returns the list containing exactly one INTERNET and one MMS access point */
+static GSList *provision_normalize_apn_list(GSList *apns, const char* spn)
+{
+	struct ofono_gprs_provision_data *best_internet = NULL;
+	struct ofono_gprs_provision_data *best_mms = NULL;
+	struct ofono_gprs_provision_data *second_best_internet = NULL;
+	struct ofono_gprs_provision_data *second_best_mms = NULL;
+	GSList *best_apns = NULL;
+	GSList *l;
+
+	/* 1. save the first found internet APN and the first MMS APN */
+	l = apns;
+	while (l != NULL) {
+		GSList *next = l->next;
+		struct ofono_gprs_provision_data *ap = l->data;
+
+		if (ap->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET
+				&& !best_internet) {
+			best_internet = ap;
+		} else if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS
+				&& !best_mms) {
+			best_mms = ap;
+		}
+		l = next;
+	}
+
+	/*
+	 * 2. look for a "primary" provider (i.e. an MNO, not
+	 * an MVNO on the same radio network)
+	 */
+	second_best_internet = best_internet;
+	best_internet = NULL;
+	second_best_mms = best_mms;
+	best_mms = NULL;
+
+	l = apns;
+	while (l != NULL) {
+		GSList *next = l->next;
+		struct ofono_gprs_provision_data *ap = l->data;
+
+		if (ap->provider_primary) {
+			if (ap->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET
+					&& !best_internet) {
+				best_internet = ap;
+			} else if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS
+					&& !best_mms) {
+				best_mms = ap;
+			}
+		}
+		l = next;
+	}
+
+	/* no better match found */
+	if (!best_internet)
+		best_internet = second_best_internet;
+	if (!best_mms)
+		best_mms = second_best_mms;
+
+	/*
+	 * 3. if there is an SPN given, save the first internet APN and the
+	 * first MMS APN matching the SPN (partially, case-insensitively)
+	 * */
+	if (spn) {
+		second_best_internet = best_internet;
+		best_internet = NULL;
+		second_best_mms = best_mms;
+		best_mms = NULL;
+
+		l = apns;
+		while (l != NULL) {
+			GSList *next = l->next;
+			struct ofono_gprs_provision_data *ap = l->data;
+
+			if ((ap->provider_name && strcasestr(ap->provider_name, spn))
+				|| (ap->name && strcasestr(ap->name, spn))
+				|| (ap->apn && strcasestr(ap->apn, spn))) {
+				if (ap->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET
+						&& !best_internet) {
+					best_internet = ap;
+				} else if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS
+						&& !best_mms) {
+					best_mms = ap;
+				}
+			}
+			l = next;
+		}
+
+		/* no better match found */
+		if (!best_internet)
+			best_internet = second_best_internet;
+		if (!best_mms)
+			best_mms = second_best_mms;
+	}
+
+	/* 4. if none found yet, create APNs with default values */
+	if (!best_internet) {
+		best_internet = g_try_new0(struct ofono_gprs_provision_data, 1);
+		if (best_internet) {
+			best_internet->type =
+				OFONO_GPRS_CONTEXT_TYPE_INTERNET;
+			best_internet->name =
+				g_strdup("Internet");
+			best_internet->apn =
+				g_strdup("internet");
+		}
+	}
+
+	if (!best_mms) {
+		best_mms = g_try_new0(struct ofono_gprs_provision_data, 1);
+		if (best_mms) {
+			best_mms->type =
+				OFONO_GPRS_CONTEXT_TYPE_MMS;
+			best_mms->name =
+				g_strdup("MMS");
+			best_mms->apn =
+				g_strdup("mms");
+		}
+	}
+
+	best_apns = g_slist_append(best_apns, best_internet);
+	best_apns = g_slist_append(best_apns, best_mms);
+	return best_apns;
+}
+
+int provision_get_settings(const char *mcc, const char *mnc,
 				const char *spn,
 				struct ofono_gprs_provision_data **settings,
 				int *count)
@@ -49,36 +175,26 @@ static int provision_get_settings(const char *mcc, const char *mnc,
 	int ap_count;
 	int i;
 
-	DBG("Provisioning for MCC %s, MNC %s, SPN '%s'", mcc, mnc, spn);
+	ofono_info("Provisioning for MCC %s, MNC %s, SPN '%s'", mcc, mnc, spn);
 
 	/*
-	 * TODO: review with upstream.  Default behavior was to
-	 * disallow duplicate APN entries, which unfortunately exist
-	 * in the mobile-broadband-provider-info db.
+	 * Passing FALSE to mbpi_lookup_apn() would return
+	 * an empty list if duplicates are found.
 	 */
 	apns = mbpi_lookup_apn(mcc, mnc, TRUE, &error);
-	if (apns == NULL) {
-		if (error != NULL) {
-			ofono_error("%s", error->message);
-			g_error_free(error);
-		}
-
-		return -ENOENT;
+	if (error != NULL) {
+		ofono_error("%s", error->message);
+		g_error_free(error);
 	}
 
+	ofono_info("Found %d APs in MBPI", g_slist_length(apns));
+	apns = provision_normalize_apn_list(apns, spn);
+	if (apns == NULL)
+		return -ENOENT;
+
 	ap_count = g_slist_length(apns);
 
-	ofono_info("GPRS Provisioning found %d matching APNs for SPN: %s MCC: %s MNC: %s",
-			ap_count, spn, mcc, mnc);
-	/*
-	 * Only keep the first APN found.
-	 *
-	 * This allows auto-provisioning to work most of the time vs.
-	 * passing FALSE to mbpi_lookup_apn() which would return an
-	 * an empty list if duplicates are found.
-	 */
-	if (ap_count > 1)
-		ap_count = 1;
+	ofono_info("Provisioning %d APs", ap_count);
 
 	*settings = g_try_new0(struct ofono_gprs_provision_data, ap_count);
 	if (*settings == NULL) {
@@ -97,25 +213,16 @@ static int provision_get_settings(const char *mcc, const char *mnc,
 	for (l = apns, i = 0; l; l = l->next, i++) {
 		struct ofono_gprs_provision_data *ap = l->data;
 
-		/*
-		 * Only create a data context for the first matching APN.
-		 * See comment above that restricts restricts apn_count.
-		 */
-		if (i == 0) {
-			ofono_info("Name: '%s'", ap->name);
-			ofono_info("APN: '%s'", ap->apn);
-			ofono_info("Type: %s", mbpi_ap_type(ap->type));
-			ofono_info("Username: '%s'", ap->username);
-			ofono_info("Password: '%s'", ap->password);
+		ofono_info("Name: '%s'", ap->name);
+		ofono_info("APN: '%s'", ap->apn);
+		ofono_info("Type: %s", mbpi_ap_type(ap->type));
+		ofono_info("Username: '%s'", ap->username);
+		ofono_info("Password: '%s'", ap->password);
 
-			memcpy(*settings + i, ap,
-				sizeof(struct ofono_gprs_provision_data));
-
-			g_free(ap);
-		} else {
-			mbpi_ap_free(ap);
-		}
+		memcpy(*settings + i, ap,
+			sizeof(struct ofono_gprs_provision_data));
 
+		g_free(ap);
 	}
 
 	g_slist_free(apns);

ofono/plugins/provision.h

@@ -0,0 +1,28 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2014 Jolla. All rights reserved.
+ *
+ *  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
+ *
+ */
+
+struct ofono_gprs_provision_data;
+
+int provision_get_settings(const char *mcc, const char *mnc,
+				const char *spn,
+				struct ofono_gprs_provision_data **settings,
+				int *count);
+

ofono/plugins/push-forwarder.c

@@ -0,0 +1,541 @@
+/*
+ *  Copyright (C) 2013-2014 Jolla 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.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/inotify.h>
+#include <wspcodec.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono.h>
+#include <plugin.h>
+
+/*
+ * Push forwarder plugin is looking for configuration files in
+ * /etc/ofono/push_forwarder.d directory. Confiration files are
+ * glib key files that look like this:
+ *
+ *   [Jolla MMS Handler]
+ *   ContentType = application/vnd.wap.mms-message
+ *   Interface = com.jolla.MmsEngine.
+ *   Service = com.jolla.MmsEngine
+ *   Method = HandlePush
+ *   Path = /
+ *
+ * Only files with .conf suffix are loaded. In addition to the keys
+ * from the above example, SourcePort and DestinationPort port keys
+ * are supported. All other keys are ignored. One file may describe
+ * several push handlers. See pf_parse_config() function for details.
+ *
+ * When push fowarder receives a WAP push, it goes through the list
+ * of registered handlers and invokes all of them that match content
+ * type and/or port numbers. The rest is up to the D-Bus service
+ * handling the call.
+ */
+
+#define PF_CONFIG_DIR CONFIGDIR "/push_forwarder.d"
+
+struct pf_modem {
+	struct ofono_modem *modem;
+	struct ofono_sms *sms;
+	struct ofono_sim *sim;
+	unsigned int sim_watch_id;
+	unsigned int sms_watch_id;
+	unsigned int push_watch_id;
+};
+
+struct push_datagram_handler {
+	char *name;
+	char *content_type;
+	char *interface;
+	char *service;
+	char *method;
+	char *path;
+	int dst_port;
+	int src_port;
+};
+
+static GSList *handlers;
+static GSList *modems;
+static unsigned int modem_watch_id;
+static int inotify_fd = -1;
+static int inotify_watch_id = -1;
+static guint inotify_watch_source_id;
+static GIOChannel *inotify_watch_channel;
+
+static void pf_notify_handler(struct push_datagram_handler *h,
+		const char *imsi, const char *from, const struct tm *remote,
+		const struct tm *local, int dst, int src,
+		const char *ct, const void *data, unsigned int len)
+{
+	struct tm remote_tm = *remote;
+	struct tm local_tm = *local;
+	dbus_uint32_t remote_time_arg = mktime(&remote_tm);
+	dbus_uint32_t local_time_arg = mktime(&local_tm);
+	dbus_int32_t dst_arg = dst;
+	dbus_int32_t src_arg = src;
+	DBusMessageIter iter, array;
+	DBusMessage *msg = dbus_message_new_method_call(h->service,
+			h->path, h->interface, h->method);
+
+	dbus_message_append_args(msg,
+				 DBUS_TYPE_STRING, &imsi,
+				 DBUS_TYPE_STRING, &from,
+				 DBUS_TYPE_UINT32, &remote_time_arg,
+				 DBUS_TYPE_UINT32, &local_time_arg,
+				 DBUS_TYPE_INT32,  &dst_arg,
+				 DBUS_TYPE_INT32,  &src_arg,
+				 DBUS_TYPE_STRING, &ct,
+				 DBUS_TYPE_INVALID);
+	dbus_message_iter_init_append(msg, &iter);
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+					DBUS_TYPE_BYTE_AS_STRING, &array);
+	dbus_message_iter_append_fixed_array(&array,
+						DBUS_TYPE_BYTE, &data, len);
+	dbus_message_iter_close_container(&iter, &array);
+	dbus_message_set_no_reply(msg, TRUE);
+	dbus_connection_send(ofono_dbus_get_connection(), msg, NULL);
+	dbus_message_unref(msg);
+}
+
+static gboolean pf_match_port(int port, int expected_port)
+{
+	if (expected_port < 0)
+		return TRUE;
+
+	if (expected_port == port)
+		return TRUE;
+
+	return FALSE;
+}
+
+static gboolean pf_match_handler(struct push_datagram_handler *h,
+	const char *ct, int dst, int src)
+{
+	if (pf_match_port(dst, h->dst_port) == FALSE)
+		return FALSE;
+
+	if (pf_match_port(src, h->src_port) == FALSE)
+		return FALSE;
+
+	if (h->content_type == NULL)
+		return TRUE;
+
+	if (strcmp(h->content_type, ct) == 0)
+		return TRUE;
+
+	return FALSE;
+}
+
+static void pf_handle_datagram(const char *from,
+		const struct tm *remote, const struct tm *local, int dst,
+		int src, const unsigned char *buffer, unsigned int len,
+		void *userdata)
+{
+	struct pf_modem *pm = userdata;
+	guint remain;
+	const guint8 *data;
+	unsigned int hdrlen;
+	unsigned int off;
+	const void *ct;
+	const char *imsi;
+	GSList *link;
+
+	DBG("received push of size: %u", len);
+
+	if (pm->sim == NULL)
+		return;
+
+	imsi = ofono_sim_get_imsi(pm->sim);
+	if (len < 3)
+		return;
+
+	if (buffer[1] != 6)
+		return;
+
+	remain = len - 2;
+	data = buffer + 2;
+
+	if (wsp_decode_uintvar(data, remain, &hdrlen, &off) == FALSE)
+		return;
+
+	if ((off + hdrlen) > remain)
+		return;
+
+	data += off;
+	remain -= off;
+
+	DBG("  WAP header %u bytes", hdrlen);
+
+	if (wsp_decode_content_type(data, hdrlen, &ct, &off, NULL) == FALSE)
+		return;
+
+	data += hdrlen;
+	remain -= hdrlen;
+
+	DBG("  content type %s", (char *)ct);
+	DBG("  imsi %s", imsi);
+	DBG("  data size %u", remain);
+
+	link = handlers;
+
+	while (link) {
+		struct push_datagram_handler *h = link->data;
+
+		if (pf_match_handler(h, ct, dst, src) != FALSE) {
+			DBG("notifying %s", h->name);
+			pf_notify_handler(h, imsi, from, remote, local, dst,
+					src, ct, data, remain);
+		}
+		link = link->next;
+	}
+}
+
+static void pf_sms_watch(struct ofono_atom *atom,
+			enum ofono_atom_watch_condition cond, void *userdata)
+{
+	struct pf_modem *pm = userdata;
+
+	if (cond == OFONO_ATOM_WATCH_CONDITION_REGISTERED) {
+		DBG("registered");
+		pm->sms = __ofono_atom_get_data(atom);
+		pm->push_watch_id = __ofono_sms_datagram_watch_add(pm->sms,
+			pf_handle_datagram, -1, -1, pm, NULL);
+	} else if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) {
+		DBG("unregistered");
+		pm->sms = NULL;
+		pm->push_watch_id = 0;
+	}
+}
+
+static void pf_sms_watch_done(void *userdata)
+{
+	struct pf_modem *pm = userdata;
+
+	pm->sms_watch_id = 0;
+}
+
+static void pf_sim_watch(struct ofono_atom *atom,
+			enum ofono_atom_watch_condition cond, void *userdata)
+{
+	struct pf_modem *pm = userdata;
+
+	if (cond == OFONO_ATOM_WATCH_CONDITION_REGISTERED) {
+		DBG("registered");
+		pm->sim = __ofono_atom_get_data(atom);
+	} else if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) {
+		DBG("unregistered");
+		pm->sim = NULL;
+	}
+}
+
+static void pf_sim_watch_done(void *userdata)
+{
+	struct pf_modem *pm = userdata;
+
+	pm->sim_watch_id = 0;
+}
+
+static void pf_free_modem(struct pf_modem *pm)
+{
+	if (pm == NULL)
+		return;
+
+	if (pm->push_watch_id != 0)
+		__ofono_sms_datagram_watch_remove(pm->sms, pm->push_watch_id);
+
+	if (pm->sim_watch_id != 0)
+		__ofono_modem_remove_atom_watch(pm->modem, pm->sim_watch_id);
+
+	if (pm->sms_watch_id != 0)
+		__ofono_modem_remove_atom_watch(pm->modem, pm->sms_watch_id);
+
+	g_free(pm);
+}
+
+static void pf_modem_watch(struct ofono_modem *modem,
+						gboolean added, void *userdata)
+{
+	DBG("modem: %p, added: %d", modem, added);
+	if (added != FALSE) {
+		struct pf_modem *pm;
+
+		pm = g_try_new0(struct pf_modem, 1);
+		if (pm == NULL)
+			return;
+
+		pm->modem = modem;
+		pm->sms_watch_id = __ofono_modem_add_atom_watch(modem,
+			OFONO_ATOM_TYPE_SMS, pf_sms_watch, pm,
+			pf_sms_watch_done);
+		pm->sim_watch_id = __ofono_modem_add_atom_watch(modem,
+			OFONO_ATOM_TYPE_SIM, pf_sim_watch, pm,
+			pf_sim_watch_done);
+		modems = g_slist_append(modems, pm);
+	} else {
+		GSList *link = modems;
+
+		while (link) {
+			struct pf_modem *pm = link->data;
+
+			if (pm->modem == modem) {
+				modems = g_slist_delete_link(modems, link);
+				pf_free_modem(pm);
+				break;
+			}
+			link = link->next;
+		}
+	}
+}
+
+static void pf_modem_init(struct ofono_modem *modem,
+						void *userdata)
+{
+	pf_modem_watch(modem, TRUE, NULL);
+}
+
+static void pf_free_handler(void *data)
+{
+	struct push_datagram_handler *h = data;
+
+	g_free(h->content_type);
+	g_free(h->interface);
+	g_free(h->service);
+	g_free(h->method);
+	g_free(h->path);
+	g_free(h->name);
+	g_free(h);
+}
+
+static void pf_parse_handler(GKeyFile *conf, const char *g)
+{
+	GError *err = NULL;
+	struct push_datagram_handler *h;
+	char *interface;
+	char *service;
+	char *method;
+	char *path;
+
+	interface = g_key_file_get_string(conf, g, "Interface", NULL);
+	if (interface == NULL)
+		goto no_interface;
+
+	service = g_key_file_get_string(conf, g, "Service", NULL);
+	if (service == NULL)
+		goto no_service;
+
+	method = g_key_file_get_string(conf, g, "Method", NULL);
+	if (method == NULL)
+		goto no_method;
+
+	path = g_key_file_get_string(conf, g, "Path", NULL);
+	if (path == NULL)
+		goto no_path;
+
+	h = g_try_new0(struct push_datagram_handler, 1);
+	if (h == NULL)
+		goto no_memory;
+
+	h->name = g_strdup(g);
+	h->interface = interface;
+	h->service = service;
+	h->method = method;
+	h->path = path;
+	h->content_type = g_key_file_get_string(conf, g, "ContentType", NULL);
+	h->dst_port = g_key_file_get_integer(conf, g, "DestinationPort", &err);
+	if (h->dst_port == 0 && err != NULL) {
+		h->dst_port = -1;
+		g_error_free(err);
+		err = NULL;
+	}
+	h->src_port = g_key_file_get_integer(conf, g, "SourcePort", &err);
+	if (h->src_port == 0 && err != NULL) {
+		h->src_port = -1;
+		g_error_free(err);
+		err = NULL;
+	}
+	DBG("registered %s", h->name);
+	if (h->content_type != NULL)
+		DBG("  ContentType: %s", h->content_type);
+	if (h->dst_port >= 0)
+		DBG("  DestinationPort: %d", h->dst_port);
+	if (h->src_port >= 0)
+		DBG("  SourcePort: %d", h->src_port);
+	DBG("  Interface: %s", interface);
+	DBG("  Service: %s", service);
+	DBG("  Method: %s", method);
+	DBG("  Path: %s", path);
+	handlers = g_slist_append(handlers, h);
+	return;
+
+no_memory:
+	g_free(path);
+
+no_path:
+	g_free(method);
+
+no_method:
+	g_free(service);
+
+no_service:
+	g_free(interface);
+
+no_interface:
+	return;
+}
+
+static void pf_parse_config(void)
+{
+	GDir *dir;
+	const gchar *file;
+
+	g_slist_free_full(handlers, pf_free_handler);
+	handlers = NULL;
+
+	dir = g_dir_open(PF_CONFIG_DIR, 0, NULL);
+	if (dir == NULL) {
+		DBG(PF_CONFIG_DIR " not found.");
+		return;
+	}
+
+	DBG("loading configuration from " PF_CONFIG_DIR);
+	while ((file = g_dir_read_name(dir)) != NULL) {
+		GError *err;
+		GKeyFile *conf;
+		char *path;
+
+		if (g_str_has_suffix(file, ".conf") == FALSE)
+			continue;
+
+		err = NULL;
+		conf = g_key_file_new();
+		path = g_strconcat(PF_CONFIG_DIR "/", file, NULL);
+		DBG("reading %s", file);
+
+		if (g_key_file_load_from_file(conf, path, 0, &err) != FALSE) {
+			gsize i, n;
+			char **names = g_key_file_get_groups(conf, &n);
+
+			for (i = 0; i < n; i++)
+				pf_parse_handler(conf, names[i]);
+			g_strfreev(names);
+		} else {
+			ofono_warn("%s", err->message);
+			g_error_free(err);
+		}
+
+		g_key_file_free(conf);
+		g_free(path);
+	}
+
+	g_dir_close(dir);
+}
+
+static gboolean pf_inotify(GIOChannel *gio, GIOCondition c, gpointer data)
+{
+	int avail;
+	gsize len;
+	void *buf;
+	GError *error;
+
+	if (ioctl(inotify_fd, FIONREAD, &avail) < 0)
+		return FALSE;
+
+	buf = g_try_malloc(avail);
+	if (buf == NULL)
+		return FALSE;
+
+	error = NULL;
+	if (g_io_channel_read_chars(gio, buf, avail, &len, &error) !=
+							G_IO_STATUS_NORMAL) {
+		g_free(buf);
+		return FALSE;
+	}
+
+	pf_parse_config();
+	g_free(buf);
+	return TRUE;
+}
+
+static int pf_plugin_init(void)
+{
+	DBG("");
+	pf_parse_config();
+	modem_watch_id = __ofono_modemwatch_add(pf_modem_watch, NULL, NULL);
+	__ofono_modem_foreach(pf_modem_init, NULL);
+	inotify_fd = inotify_init();
+	if (inotify_fd < 0)
+		return 0;
+
+	inotify_watch_id = inotify_add_watch(inotify_fd,
+					PF_CONFIG_DIR,
+					IN_CLOSE_WRITE | IN_DELETE | IN_MOVE);
+	if (inotify_watch_id < 0)
+		goto no_inotify_watch_id;
+
+	inotify_watch_channel = g_io_channel_unix_new(inotify_fd);
+	if (inotify_watch_channel == NULL)
+		goto no_inotify_watch_channel;
+
+	g_io_channel_set_encoding(inotify_watch_channel, NULL, NULL);
+	g_io_channel_set_buffered(inotify_watch_channel, FALSE);
+	inotify_watch_source_id = g_io_add_watch(inotify_watch_channel,
+						G_IO_IN, pf_inotify, NULL);
+	if (inotify_watch_source_id != 0)
+		return 0;
+
+	g_io_channel_unref(inotify_watch_channel);
+	inotify_watch_channel = NULL;
+
+no_inotify_watch_channel:
+	inotify_rm_watch(inotify_fd, inotify_watch_id);
+	inotify_watch_id = -1;
+
+no_inotify_watch_id:
+	close(inotify_fd);
+	inotify_fd = -1;
+	return 0;
+}
+
+static void pf_plugin_exit(void)
+{
+	DBG("");
+	__ofono_modemwatch_remove(modem_watch_id);
+	modem_watch_id = 0;
+	g_slist_free_full(modems, (GDestroyNotify)pf_free_modem);
+	modems = NULL;
+	g_slist_free_full(handlers, pf_free_handler);
+	handlers = NULL;
+	if (inotify_watch_source_id == 0)
+		return;
+
+	g_source_remove(inotify_watch_source_id);
+	inotify_watch_source_id = 0;
+	g_io_channel_unref(inotify_watch_channel);
+	inotify_watch_channel = NULL;
+	inotify_rm_watch(inotify_fd, inotify_watch_id);
+	inotify_watch_id = -1;
+	close(inotify_fd);
+	inotify_fd = -1;
+}
+
+OFONO_PLUGIN_DEFINE(push_forwarder, "Push Forwarder Plugin", VERSION,
+		OFONO_PLUGIN_PRIORITY_DEFAULT, pf_plugin_init,
+		pf_plugin_exit)

ofono/plugins/ril.c

@@ -63,6 +63,7 @@
 #include <ofono/types.h>
 #include <ofono/message-waiting.h>
 #include <ofono/oemraw.h>
+#include <ofono/stk.h>
 
 #include "drivers/rilmodem/rilmodem.h"
 
@@ -97,10 +98,10 @@ struct ril_data {
 static guint mce_daemon_watch;
 static guint signal_watch;
 static DBusConnection *connection;
+gboolean reconnecting = FALSE;
 
 static int ril_init(void);
-guint reconnect_timer;
-
+static void ril_exit(void);
 static int send_get_sim_status(struct ofono_modem *modem);
 
 static void ril_debug(const char *str, void *user_data)
@@ -112,13 +113,12 @@ static void ril_debug(const char *str, void *user_data)
 
 static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 {
+	DBG("error=%d", message->error);
 	struct ofono_modem *modem = user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct sim_status status;
 	struct sim_app *apps[MAX_UICC_APPS];
 
-	DBG("");
-
 	/*
 	 * ril.h claims this should NEVER fail!
 	 * However this isn't quite true.  So,
@@ -154,9 +154,12 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 		} else {
 			ofono_warn("No SIM card present.");
 		}
-		// We cannot power on modem, but we need to get
-		// certain interfaces up to be able to make emergency calls
-		// in offline mode and without SIM
+
+		/*
+		 * We cannot power on modem, but we need to get
+		 * certain interfaces up to be able to make emergency calls
+		 * in offline mode and without SIM
+		 */
 		ofono_modem_set_powered(modem, TRUE);
 	}
 }
@@ -185,6 +188,7 @@ static int send_get_sim_status(struct ofono_modem *modem)
 
 static int ril_probe(struct ofono_modem *modem)
 {
+	DBG("");
 	struct ril_data *ril = NULL;
 
 	ril = g_try_new0(struct ril_data, 1);
@@ -207,9 +211,9 @@ error:
 
 static void ril_remove(struct ofono_modem *modem)
 {
+	DBG("");
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
-
 	ofono_modem_set_data(modem, NULL);
 
 	if (!ril)
@@ -218,9 +222,6 @@ static void ril_remove(struct ofono_modem *modem)
 	if (ril->timer_id > 0)
 		g_source_remove(ril->timer_id);
 
-	if (reconnect_timer > 0)
-		g_source_remove(ril->timer_id);
-
 	g_ril_unref(ril->modem);
 
 	g_free(ril);
@@ -228,7 +229,7 @@ static void ril_remove(struct ofono_modem *modem)
 
 static void ril_pre_sim(struct ofono_modem *modem)
 {
-	DBG("enter");
+	DBG("");
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct ofono_sim *sim;
 
@@ -241,6 +242,7 @@ static void ril_pre_sim(struct ofono_modem *modem)
 
 static void ril_post_sim(struct ofono_modem *modem)
 {
+	DBG("");
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
@@ -258,7 +260,7 @@ static void ril_post_sim(struct ofono_modem *modem)
 					ril->modem);
 			if (gc == NULL)
 				break;
-				
+
 			ofono_gprs_add_context(gprs, gc);
 		}
 	}
@@ -266,6 +268,8 @@ static void ril_post_sim(struct ofono_modem *modem)
 	ofono_radio_settings_create(modem, 0, "rilmodem", ril->modem);
 	ofono_phonebook_create(modem, 0, "rilmodem", ril->modem);
 	ofono_call_forwarding_create(modem, 0, "rilmodem", ril->modem);
+	ofono_call_barring_create(modem, 0, "rilmodem", ril->modem);
+	ofono_stk_create(modem, 0, "rilmodem", ril->modem);
 
 	mw = ofono_message_waiting_create(modem);
 	if (mw)
@@ -274,7 +278,7 @@ static void ril_post_sim(struct ofono_modem *modem)
 
 static void ril_post_online(struct ofono_modem *modem)
 {
-	DBG("enter");
+	DBG("");
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
 	ofono_call_volume_create(modem, 0, "rilmodem", ril->modem);
@@ -282,19 +286,17 @@ static void ril_post_online(struct ofono_modem *modem)
 	ofono_netreg_create(modem, 0, "rilmodem", ril->modem);
 	ofono_ussd_create(modem, 0, "rilmodem", ril->modem);
 	ofono_call_settings_create(modem, 0, "rilmodem", ril->modem);
-	ofono_cbs_create(modem, 0, "rilmodem", ril->modem);
 	ofono_oem_raw_create(modem, 0, "rilmodem", ril->modem);
 }
 
 static void ril_set_online_cb(struct ril_msg *message, gpointer user_data)
 {
-	DBG("enter");
+	DBG("");
 	struct cb_data *cbd = user_data;
 	ofono_modem_online_cb_t cb = cbd->cb;
 
-	if (message->error == RIL_E_SUCCESS) {
+	if (message->error == RIL_E_SUCCESS)
 		CALLBACK_WITH_SUCCESS(cb, cbd->data);
-	}
 	else
 		CALLBACK_WITH_FAILURE(cb, cbd->data);
 }
@@ -311,12 +313,13 @@ static void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 1);	/* Number of params */
 	parcel_w_int32(&rilp, online);	/* Radio ON = 1, Radio OFF = 0 */
-	DBG("1");
+
+	ofono_info("RIL_REQUEST_RADIO_POWER %d", online);
 	ret = g_ril_send(ril->modem, RIL_REQUEST_RADIO_POWER, rilp.data,
 				rilp.size, ril_set_online_cb, cbd, g_free);
 
 	parcel_free(&rilp);
-	DBG("2");
+	DBG("RIL_REQUEST_RADIO_POWER done");
 	if (ret <= 0) {
 		g_free(cbd);
 		CALLBACK_WITH_FAILURE(callback, data);
@@ -354,6 +357,7 @@ static int ril_screen_state(struct ofono_modem *modem, ofono_bool_t state)
 static gboolean display_changed(DBusConnection *conn,
 					DBusMessage *message, void *user_data)
 {
+	DBG("");
 	struct ofono_modem *modem = user_data;
 	DBusMessageIter iter;
 	const char *value;
@@ -376,6 +380,7 @@ static gboolean display_changed(DBusConnection *conn,
 
 static void mce_connect(DBusConnection *conn, void *user_data)
 {
+	DBG("");
 	signal_watch = g_dbus_add_signal_watch(conn,
 						MCE_SERVICE, NULL,
 						MCE_SIGNAL_IF,
@@ -386,12 +391,15 @@ static void mce_connect(DBusConnection *conn, void *user_data)
 
 static void mce_disconnect(DBusConnection *conn, void *user_data)
 {
+	DBG("");
 	g_dbus_remove_watch(conn, signal_watch);
 	signal_watch = 0;
 }
 
 static void ril_connected(struct ril_msg *message, gpointer user_data)
 {
+	DBG("");
+
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
@@ -406,25 +414,35 @@ static void ril_connected(struct ril_msg *message, gpointer user_data)
 
 	connection = ofono_dbus_get_connection();
 	mce_daemon_watch = g_dbus_add_service_watch(connection, MCE_SERVICE,
-					mce_connect, mce_disconnect, modem, NULL);
+				mce_connect, mce_disconnect, modem, NULL);
 }
 
 static gboolean ril_re_init(gpointer user_data)
 {
-	ril_init();
-	return FALSE;
+	DBG("");
+	if (reconnecting) {
+		ril_init();
+		return TRUE;
+	} else {
+		return FALSE;
+	}
 }
 
 static void gril_disconnected(gpointer user_data)
 {
-	/* Signal clients modem going down */
+	/* Signal clients modem going down
+	 */
 	struct ofono_modem *modem = user_data;
 	DBusConnection *conn = ofono_dbus_get_connection();
 
-	if (modem) {
+	if (ofono_modem_is_registered(modem)) {
 		ofono_modem_remove(modem);
 		mce_disconnect(conn, user_data);
-		reconnect_timer = g_timeout_add_seconds(2, ril_re_init, NULL);
+	}
+
+	if (!reconnecting) {
+		reconnecting = TRUE;
+		g_timeout_add_seconds(2, ril_re_init, NULL);
 	}
 }
 
@@ -434,10 +452,10 @@ void ril_switchUser()
 		ofono_error("prctl(PR_SET_KEEPCAPS) failed:%s,%d",
 							strerror(errno), errno);
 
-	if (setgid(RADIO_ID) < 0 )
+	if (setgid(RADIO_ID) < 0)
 		ofono_error("setgid(%d) failed:%s,%d",
 				RADIO_ID, strerror(errno), errno);
-	if (setuid(RADIO_ID) < 0 )
+	if (setuid(RADIO_ID) < 0)
 		ofono_error("setuid(%d) failed:%s,%d",
 				RADIO_ID, strerror(errno), errno);
 
@@ -457,7 +475,7 @@ void ril_switchUser()
 
 static int ril_enable(struct ofono_modem *modem)
 {
-	DBG("enter");
+	DBG("%p", modem);
 	struct ril_data *ril = ofono_modem_get_data(modem);
 
 	ril->have_sim = FALSE;
@@ -482,6 +500,8 @@ static int ril_enable(struct ofono_modem *modem)
 		return -EIO;
 	}
 
+	reconnecting = FALSE;
+
 	if (getenv("OFONO_RIL_TRACE"))
 		g_ril_set_trace(ril->modem, TRUE);
 
@@ -498,17 +518,18 @@ static int ril_enable(struct ofono_modem *modem)
 
 static int ril_disable(struct ofono_modem *modem)
 {
+	DBG("%p", modem);
+
 	struct ril_data *ril = ofono_modem_get_data(modem);
 	struct parcel rilp;
 	int request = RIL_REQUEST_RADIO_POWER;
 	guint ret;
 
-	DBG("%p", modem);
-
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 1); /* size of array */
 	parcel_w_int32(&rilp, 0); /* POWER=OFF */
 
+	ofono_info("RIL_REQUEST_RADIO_POWER OFF");
 	/* fire and forget i.e. not waiting for the callback*/
 	ret = g_ril_send(ril->modem, request, rilp.data,
 			 rilp.size, NULL, NULL, NULL);
@@ -552,7 +573,7 @@ static struct ofono_modem_driver ril_driver = {
  */
 static int ril_init(void)
 {
-	DBG("enter");
+	DBG("");
 	int retval = 0;
 	struct ofono_modem *modem;
 
@@ -577,23 +598,6 @@ static int ril_init(void)
 	retval = ofono_modem_register(modem);
 	DBG("ofono_modem_register returned: %d", retval);
 
-	/* kickstart the modem:
-	 * causes core modem code to call
-	 * - set_powered(TRUE) - which in turn
-	 *   calls driver->enable()
-	 *
-	 * - driver->pre_sim()
-	 *
-	 * Could also be done via:
-	 *
-	 * - a DBus call to SetProperties w/"Powered=TRUE" *1
-	 * - sim_state_watch ( handles SIM removal? LOCKED states? **2
-	 * - ofono_modem_set_powered()
-	 */
-	ofono_modem_reset(modem);
-
-	reconnect_timer = 0;
-
 	return retval;
 }
 

ofono/src/call-forwarding.c

@@ -411,9 +411,12 @@ static void set_new_cond_list(struct ofono_call_forwarding *cf,
 				number = phone_number_to_string(
 							&lc->phone_number);
 
+			snprintf(attr, sizeof(attr), "%s%s",
+				bearer_class_to_string(lc->cls), cf_type_lut[i]);
+
 			ofono_dbus_signal_property_changed(conn, path,
 						OFONO_CALL_FORWARDING_INTERFACE,
-						cf_type_lut[i],
+						attr,
 						DBUS_TYPE_STRING, &number);
 		}
 
@@ -713,8 +716,12 @@ static DBusMessage *set_property_request(struct ofono_call_forwarding *cf,
 	if (ph->number[0] != '\0')
 		cf->driver->registration(cf, type, cls, ph, timeout,
 					set_property_callback, cf);
-	else
+	else {
+		if (cf->query_next == CALL_FORWARDING_TYPE_UNCONDITIONAL)
+			cf->query_end = CALL_FORWARDING_TYPE_NOT_REACHABLE;
+
 		cf->driver->erasure(cf, type, cls, set_property_callback, cf);
+	}
 
 	return NULL;
 }

ofono/src/dbus.c

@@ -48,7 +48,7 @@ struct error_mapping_entry cme_errors_mapping[] = {
 };
 
 static void append_variant(DBusMessageIter *iter,
-				int type, void *value)
+				int type, const void *value)
 {
 	char sig[2];
 	DBusMessageIter valueiter;
@@ -65,7 +65,7 @@ static void append_variant(DBusMessageIter *iter,
 }
 
 void ofono_dbus_dict_append(DBusMessageIter *dict,
-			const char *key, int type, void *value)
+			const char *key, int type, const void *value)
 {
 	DBusMessageIter keyiter;
 
@@ -85,7 +85,8 @@ void ofono_dbus_dict_append(DBusMessageIter *dict,
 	dbus_message_iter_close_container(dict, &keyiter);
 }
 
-static void append_array_variant(DBusMessageIter *iter, int type, void *val)
+static void append_array_variant(DBusMessageIter *iter, int type,
+				const void *val)
 {
 	DBusMessageIter variant, array;
 	char typesig[2];
@@ -113,7 +114,7 @@ static void append_array_variant(DBusMessageIter *iter, int type, void *val)
 }
 
 void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key,
-				int type, void *val)
+				int type, const void *val)
 {
 	DBusMessageIter entry;
 
@@ -127,7 +128,8 @@ void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key,
 	dbus_message_iter_close_container(dict, &entry);
 }
 
-static void append_dict_variant(DBusMessageIter *iter, int type, void *val)
+static void append_dict_variant(DBusMessageIter *iter, int type,
+				const void *val)
 {
 	DBusMessageIter variant, array, entry;
 	char typesig[5];
@@ -182,7 +184,7 @@ static void append_dict_variant(DBusMessageIter *iter, int type, void *val)
 }
 
 void ofono_dbus_dict_append_dict(DBusMessageIter *dict, const char *key,
-				int type, void *val)
+				int type, const void *val)
 {
 	DBusMessageIter entry;
 
@@ -200,7 +202,7 @@ int ofono_dbus_signal_property_changed(DBusConnection *conn,
 					const char *path,
 					const char *interface,
 					const char *name,
-					int type, void *value)
+					int type, const void *value)
 {
 	DBusMessage *signal;
 	DBusMessageIter iter;
@@ -225,7 +227,7 @@ int ofono_dbus_signal_array_property_changed(DBusConnection *conn,
 						const char *path,
 						const char *interface,
 						const char *name,
-						int type, void *value)
+						int type, const void *value)
 
 {
 	DBusMessage *signal;
@@ -251,7 +253,7 @@ int ofono_dbus_signal_dict_property_changed(DBusConnection *conn,
 						const char *path,
 						const char *interface,
 						const char *name,
-						int type, void *value)
+						int type, const void *value)
 
 {
 	DBusMessage *signal;

ofono/src/gprs.c

@@ -57,6 +57,7 @@
 #define MAX_MESSAGE_CENTER_LENGTH 255
 #define MAX_CONTEXTS 256
 #define SUSPEND_TIMEOUT 8
+#define MAX_MMS_MTU 1280
 
 /* 27.007 Section 7.29 */
 enum packet_bearer {
@@ -758,6 +759,31 @@ static void pri_reset_context_settings(struct pri_context *ctx)
 	g_free(interface);
 }
 
+static void pri_limit_mtu(const char *interface, int max_mtu)
+{
+	struct ifreq ifr;
+	int sk;
+
+	if (interface == NULL)
+		return;
+
+	sk = socket(PF_INET, SOCK_DGRAM, 0);
+	if (sk < 0)
+		return;
+
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, interface, IFNAMSIZ);
+
+	if (ioctl(sk, SIOCGIFMTU, &ifr) < 0 || ifr.ifr_mtu > max_mtu) {
+		ifr.ifr_mtu = max_mtu;
+
+		if (ioctl(sk, SIOCSIFMTU, &ifr) < 0)
+			ofono_error("Failed to set MTU");
+	}
+
+	close(sk);
+}
+
 static void pri_update_mms_context_settings(struct pri_context *ctx)
 {
 	struct ofono_gprs_context *gc = ctx->context_driver;
@@ -774,6 +800,8 @@ static void pri_update_mms_context_settings(struct pri_context *ctx)
 
 	if (ctx->proxy_host)
 		pri_setproxy(settings->interface, ctx->proxy_host);
+
+	pri_limit_mtu(settings->interface, MAX_MMS_MTU);
 }
 
 static void append_context_properties(struct pri_context *ctx,
@@ -3016,14 +3044,56 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
 	__ofono_atom_register(gprs->atom, gprs_unregister);
 }
 
+static gboolean mms_context_configured(struct ofono_gprs *gprs)
+{
+	GSList *l;
+
+	for (l = gprs->contexts; l; l = l->next) {
+		struct pri_context *ctx = l->data;
+
+		if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_MMS)
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void provision_mms_context(struct ofono_gprs *gprs, const char *mcc,
+				const char *mnc, const char *spn)
+{
+	struct ofono_gprs_provision_data *settings;
+	int count;
+	int i;
+
+	if (__ofono_gprs_provision_get_settings(mcc, mnc, spn,
+						&settings, &count) == FALSE) {
+		ofono_warn("Provisioning failed");
+		return;
+	}
+
+	for (i = 0; i < count; i++) {
+		if (settings[i].type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
+			provision_context(&settings[i], gprs);
+			break;
+		}
+	}
+
+	__ofono_gprs_provision_free_settings(settings, count);
+}
+
 static void spn_read_cb(const char *spn, const char *dc, void *data)
 {
 	struct ofono_gprs *gprs	= data;
 	struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
 	struct ofono_sim *sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);
 
-	provision_contexts(gprs, ofono_sim_get_mcc(sim),
+	if (gprs->contexts == NULL) {
+		provision_contexts(gprs, ofono_sim_get_mcc(sim),
 					ofono_sim_get_mnc(sim), spn);
+	} else if (!mms_context_configured(gprs)) {
+		provision_mms_context(gprs, ofono_sim_get_mcc(sim),
+					ofono_sim_get_mnc(sim), spn);
+	}
 
 	ofono_sim_remove_spn_watch(sim, &gprs->spn_watch);
 
@@ -3040,7 +3110,7 @@ void ofono_gprs_register(struct ofono_gprs *gprs)
 
 	gprs_load_settings(gprs, ofono_sim_get_imsi(sim));
 
-	if (gprs->contexts)
+	if (mms_context_configured(gprs))
 		goto finish;
 
 	ofono_sim_add_spn_watch(sim, &gprs->spn_watch, spn_read_cb, gprs, NULL);

ofono/src/handsfree.c

@@ -44,25 +44,34 @@
 
 static GSList *g_drivers = NULL;
 
+#define HANDSFREE_FLAG_CACHED 0x1
+
 struct ofono_handsfree {
 	ofono_bool_t nrec;
 	ofono_bool_t inband_ringing;
 	ofono_bool_t voice_recognition;
 	ofono_bool_t voice_recognition_pending;
 	unsigned int ag_features;
+	unsigned int ag_chld_features;
 	unsigned char battchg;
+	GSList *subscriber_numbers;
 
 	const struct ofono_handsfree_driver *driver;
 	void *driver_data;
 	struct ofono_atom *atom;
 	DBusMessage *pending;
+	int flags;
 };
 
-static const char **ag_features_list(unsigned int features)
+static const char **ag_features_list(unsigned int features,
+					unsigned int chld_features)
 {
-	static const char *list[33];
+	static const char *list[10];
 	unsigned int i = 0;
 
+	if (features & HFP_AG_FEATURE_3WAY)
+		list[i++] = "three-way-calling";
+
 	if (features & HFP_AG_FEATURE_ECNR)
 		list[i++] = "echo-canceling-and-noise-reduction";
 
@@ -72,6 +81,21 @@ static const char **ag_features_list(unsigned int features)
 	if (features & HFP_AG_FEATURE_ATTACH_VOICE_TAG)
 		list[i++] = "attach-voice-tag";
 
+	if (chld_features & HFP_AG_CHLD_0)
+		list[i++] = "release-all-held";
+
+	if (chld_features & HFP_AG_CHLD_1x)
+		list[i++] = "release-specified-active-call";
+
+	if (chld_features & HFP_AG_CHLD_2x)
+		list[i++] = "private-chat";
+
+	if (chld_features & HFP_AG_CHLD_3)
+		list[i++] = "create-multiparty";
+
+	if (chld_features & HFP_AG_CHLD_4)
+		list[i++] = "transfer";
+
 	list[i] = NULL;
 
 	return list;
@@ -125,6 +149,15 @@ void ofono_handsfree_set_ag_features(struct ofono_handsfree *hf,
 	hf->ag_features = ag_features;
 }
 
+void ofono_handsfree_set_ag_chld_features(struct ofono_handsfree *hf,
+					unsigned int ag_chld_features)
+{
+	if (hf == NULL)
+		return;
+
+	hf->ag_chld_features = ag_chld_features;
+}
+
 void ofono_handsfree_battchg_notify(struct ofono_handsfree *hf,
 					unsigned char level)
 {
@@ -148,10 +181,44 @@ void ofono_handsfree_battchg_notify(struct ofono_handsfree *hf,
 					&level);
 }
 
-static DBusMessage *handsfree_get_properties(DBusConnection *conn,
-						DBusMessage *msg, void *data)
+static void append_subscriber_numbers(GSList *subscriber_numbers,
+						DBusMessageIter *iter)
+{
+	DBusMessageIter entry;
+	DBusMessageIter variant, array;
+	GSList *l;
+	const char *subscriber_number_string;
+	char arraysig[3];
+	const char *key = "SubscriberNumbers";
+
+	arraysig[0] = DBUS_TYPE_ARRAY;
+	arraysig[1] = DBUS_TYPE_STRING;
+	arraysig[2] = '\0';
+
+	dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY,
+					NULL, &entry);
+	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING,
+					&key);
+	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+					arraysig, &variant);
+	dbus_message_iter_open_container(&variant, DBUS_TYPE_ARRAY,
+					DBUS_TYPE_STRING_AS_STRING, &array);
+
+	for (l = subscriber_numbers; l; l = l->next) {
+		subscriber_number_string = phone_number_to_string(l->data);
+		dbus_message_iter_append_basic(&array, DBUS_TYPE_STRING,
+						&subscriber_number_string);
+	}
+
+	dbus_message_iter_close_container(&variant, &array);
+
+	dbus_message_iter_close_container(&entry, &variant);
+	dbus_message_iter_close_container(iter, &entry);
+}
+
+static DBusMessage *generate_get_properties_reply(struct ofono_handsfree *hf,
+						DBusMessage *msg)
 {
-	struct ofono_handsfree *hf = data;
 	DBusMessage *reply;
 	DBusMessageIter iter;
 	DBusMessageIter dict;
@@ -181,18 +248,90 @@ static DBusMessage *handsfree_get_properties(DBusConnection *conn,
 	ofono_dbus_dict_append(&dict, "VoiceRecognition", DBUS_TYPE_BOOLEAN,
 				&voice_recognition);
 
-	features = ag_features_list(hf->ag_features);
+	features = ag_features_list(hf->ag_features, hf->ag_chld_features);
 	ofono_dbus_dict_append_array(&dict, "Features", DBUS_TYPE_STRING,
 					&features);
 
 	ofono_dbus_dict_append(&dict, "BatteryChargeLevel", DBUS_TYPE_BYTE,
 				&hf->battchg);
 
+	if (hf->subscriber_numbers)
+		append_subscriber_numbers(hf->subscriber_numbers, &dict);
+
 	dbus_message_iter_close_container(&iter, &dict);
 
 	return reply;
 }
 
+static void hf_cnum_callback(const struct ofono_error *error, int total,
+				const struct ofono_phone_number *numbers,
+				void *data)
+{
+	struct ofono_handsfree *hf = data;
+	int num;
+	struct ofono_phone_number *subscriber_number;
+
+	if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
+		goto out;
+
+	for (num = 0; num < total; num++) {
+		subscriber_number = g_new0(struct ofono_phone_number, 1);
+
+		subscriber_number->type = numbers[num].type;
+		strncpy(subscriber_number->number, numbers[num].number,
+					OFONO_MAX_PHONE_NUMBER_LENGTH + 1);
+
+		hf->subscriber_numbers = g_slist_prepend(hf->subscriber_numbers,
+					subscriber_number);
+	}
+
+	hf->subscriber_numbers = g_slist_reverse(hf->subscriber_numbers);
+
+out:
+	hf->flags |= HANDSFREE_FLAG_CACHED;
+
+	if (hf->pending) {
+		DBusMessage *reply =
+			generate_get_properties_reply(hf, hf->pending);
+		__ofono_dbus_pending_reply(&hf->pending, reply);
+	}
+}
+
+static void query_cnum(struct ofono_handsfree *hf)
+{
+	DBusMessage *reply;
+
+	if (hf->driver->cnum_query != NULL) {
+		hf->driver->cnum_query(hf, hf_cnum_callback, hf);
+		return;
+	}
+
+	if (hf->pending == NULL)
+		return;
+
+	reply = generate_get_properties_reply(hf, hf->pending);
+	__ofono_dbus_pending_reply(&hf->pending, reply);
+}
+
+static DBusMessage *handsfree_get_properties(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	struct ofono_handsfree *hf = data;
+
+	if (hf->pending != NULL)
+		return __ofono_error_busy(msg);
+
+	if (hf->flags & HANDSFREE_FLAG_CACHED)
+		return generate_get_properties_reply(hf, msg);
+
+	/* Query the settings and report back */
+	hf->pending = dbus_message_ref(msg);
+
+	query_cnum(hf);
+
+	return NULL;
+}
+
 static void voicerec_set_cb(const struct ofono_error *error, void *data)
 {
 	struct ofono_handsfree *hf = data;
@@ -424,6 +563,10 @@ static void handsfree_unregister(struct ofono_atom *atom)
 		__ofono_dbus_pending_reply(&hf->pending, reply);
 	}
 
+	g_slist_foreach(hf->subscriber_numbers, (GFunc) g_free, NULL);
+	g_slist_free(hf->subscriber_numbers);
+	hf->subscriber_numbers = NULL;
+
 	ofono_modem_remove_interface(modem, OFONO_HANDSFREE_INTERFACE);
 	g_dbus_unregister_interface(conn, path,
 					OFONO_HANDSFREE_INTERFACE);

ofono/src/hfp.h

@@ -45,6 +45,17 @@ enum hfp_hf_feature {
 	HFP_HF_FEATURE_CODEC_NEGOTIATION =	0x80,
 };
 
+/* HFP AG supported call hold and multiparty services bitmap. Bluetooth HFP 1.6 spec page 76 */
+enum hfp_ag_chld_feature {
+	HFP_AG_CHLD_0 =		0x1,
+	HFP_AG_CHLD_1 =		0x2,
+	HFP_AG_CHLD_1x =	0x4,
+	HFP_AG_CHLD_2 =		0x8,
+	HFP_AG_CHLD_2x =	0x10,
+	HFP_AG_CHLD_3 =		0x20,
+	HFP_AG_CHLD_4 =		0x40,
+};
+
 enum hfp_sdp_hf_features {
 	HFP_SDP_HF_FEATURE_ECNR =			0x1,
 	HFP_SDP_HF_FEATURE_3WAY =			0x2,

ofono/src/idmap.c

@@ -135,7 +135,7 @@ void idmap_put(struct idmap *idmap, unsigned int id)
 
 	id %= BITS_PER_LONG;
 
-	idmap->bits[offset] &= ~(1 << id);
+	idmap->bits[offset] &= ~(1UL << id);
 }
 
 unsigned int idmap_alloc(struct idmap *idmap)
@@ -149,7 +149,7 @@ unsigned int idmap_alloc(struct idmap *idmap)
 		return idmap->max + 1;
 
 	offset = bit / BITS_PER_LONG;
-	idmap->bits[offset] |= 1 << (bit % BITS_PER_LONG);
+	idmap->bits[offset] |= 1UL << (bit % BITS_PER_LONG);
 
 	return bit + idmap->min;
 }
@@ -163,7 +163,7 @@ void idmap_take(struct idmap *idmap, unsigned int id)
 		return;
 
 	offset = bit / BITS_PER_LONG;
-	idmap->bits[offset] |= 1 << (bit % BITS_PER_LONG);
+	idmap->bits[offset] |= 1UL << (bit % BITS_PER_LONG);
 }
 
 /*
@@ -186,7 +186,7 @@ unsigned int idmap_alloc_next(struct idmap *idmap, unsigned int last)
 		return idmap_alloc(idmap);
 
 	offset = bit / BITS_PER_LONG;
-	idmap->bits[offset] |= 1 << (bit % BITS_PER_LONG);
+	idmap->bits[offset] |= 1UL << (bit % BITS_PER_LONG);
 
 	return bit + idmap->min;
 }

ofono/src/log.c

@@ -289,7 +289,8 @@ void __ofono_log_enable(struct ofono_debug_desc *start,
 }
 
 int __ofono_log_init(const char *program, const char *debug,
-						ofono_bool_t detach)
+						ofono_bool_t detach,
+						ofono_bool_t backtrace)
 {
 	static char path[PATH_MAX];
 	int option = LOG_NDELAY | LOG_PID;
@@ -305,7 +306,8 @@ int __ofono_log_init(const char *program, const char *debug,
 	if (detach == FALSE)
 		option |= LOG_PERROR;
 
-	signal_setup(signal_handler);
+	if (backtrace == TRUE)
+		signal_setup(signal_handler);
 
 	openlog(basename(program), option, LOG_DAEMON);
 
@@ -314,13 +316,14 @@ int __ofono_log_init(const char *program, const char *debug,
 	return 0;
 }
 
-void __ofono_log_cleanup(void)
+void __ofono_log_cleanup(ofono_bool_t backtrace)
 {
 	syslog(LOG_INFO, "Exit");
 
 	closelog();
 
-	signal_setup(SIG_DFL);
+	if (backtrace == TRUE)
+		signal_setup(SIG_DFL);
 
 	g_strfreev(enabled);
 }

ofono/src/main.c

@@ -133,6 +133,7 @@ static gchar *option_plugin = NULL;
 static gchar *option_noplugin = NULL;
 static gboolean option_detach = TRUE;
 static gboolean option_version = FALSE;
+static gboolean option_backtrace = TRUE;
 
 static gboolean parse_debug(const char *key, const char *value,
 					gpointer user_data, GError **error)
@@ -158,6 +159,9 @@ static GOptionEntry options[] = {
 				"Don't run as daemon in background" },
 	{ "version", 'v', 0, G_OPTION_ARG_NONE, &option_version,
 				"Show version information and exit" },
+	{ "nobacktrace", 0, G_OPTION_FLAG_REVERSE,
+				G_OPTION_ARG_NONE, &option_backtrace,
+				"Don't print out backtrace information" },
 	{ NULL },
 };
 
@@ -213,7 +217,8 @@ int main(int argc, char **argv)
 
 	signal = setup_signalfd();
 
-	__ofono_log_init(argv[0], option_debug, option_detach);
+	__ofono_log_init(argv[0], option_debug, option_detach,
+							option_backtrace);
 
 	dbus_error_init(&error);
 
@@ -264,7 +269,7 @@ cleanup:
 
 	g_main_loop_unref(event_loop);
 
-	__ofono_log_cleanup();
+	__ofono_log_cleanup(option_backtrace);
 
 	return 0;
 }

ofono/src/network.c

@@ -2106,18 +2106,14 @@ void ofono_netreg_register(struct ofono_netreg *netreg)
 		ofono_sim_add_spn_watch(netreg->sim, &netreg->spn_watch,
 						spn_read_cb, netreg, NULL);
 
-		if (__ofono_sim_service_available(netreg->sim,
-				SIM_UST_SERVICE_PROVIDER_DISPLAY_INFO,
-				SIM_SST_SERVICE_PROVIDER_DISPLAY_INFO)) {
-			ofono_sim_read(netreg->sim_context, SIM_EFSPDI_FILEID,
-					OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
-					sim_spdi_read_cb, netreg);
+		ofono_sim_read(netreg->sim_context, SIM_EFSPDI_FILEID,
+				OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
+				sim_spdi_read_cb, netreg);
 
-			ofono_sim_add_file_watch(netreg->sim_context,
-							SIM_EFSPDI_FILEID,
-							sim_spdi_changed,
-							netreg, NULL);
-		}
+		ofono_sim_add_file_watch(netreg->sim_context,
+						SIM_EFSPDI_FILEID,
+						sim_spdi_changed,
+						netreg, NULL);
 	}
 
 	__ofono_atom_register(netreg->atom, netreg_unregister);

ofono/src/ofono.conf

@@ -15,6 +15,7 @@
     <allow send_interface="org.ofono.SmartMessagingAgent"/>
     <allow send_interface="org.ofono.PositioningRequestAgent"/>
     <allow send_interface="org.ofono.HandsfreeAudioAgent"/>
+    <allow send_interface="org.ofono.VoiceCallAgent"/>
   </policy>
 
   <policy user="radio">
@@ -25,6 +26,7 @@
     <allow send_interface="org.ofono.SmartMessagingAgent"/>
     <allow send_interface="org.ofono.PositioningRequestAgent"/>
     <allow send_interface="org.ofono.HandsfreeAudioAgent"/>
+    <allow send_interface="org.ofono.VoiceCallAgent"/>
   </policy>
 
   <policy at_console="true">

ofono/src/ofono.h

@@ -38,8 +38,9 @@ void __ofono_modem_shutdown(void);
 #include <ofono/log.h>
 
 int __ofono_log_init(const char *program, const char *debug,
-						ofono_bool_t detach);
-void __ofono_log_cleanup(void);
+						ofono_bool_t detach,
+						ofono_bool_t backtrace);
+void __ofono_log_cleanup(ofono_bool_t backtrace);
 void __ofono_log_enable(struct ofono_debug_desc *start,
 					struct ofono_debug_desc *stop);
 

ofono/src/ofono.service.in

@@ -1,13 +1,14 @@
 [Unit]
 Description=Telephony service
-After=syslog.target
+Requires=dbus.service
+After=dbus.service
 
 [Service]
 Type=dbus
 BusName=org.ofono
 User=root
 EnvironmentFile=-/var/lib/environment/ofono/*.conf
-ExecStart=@prefix@/sbin/ofonod -n $OFONO_ARGS
+ExecStart=@prefix@/sbin/ofonod -n --nobacktrace $OFONO_ARGS
 StandardError=null
 Restart=always
 RestartSec=3

ofono/src/simutil.c

@@ -767,12 +767,14 @@ static char *sim_network_name_parse(const unsigned char *buffer, int length,
 					gboolean *add_ci)
 {
 	char *ret = NULL;
-	unsigned char *endp;
 	unsigned char dcs;
 	int i;
 	gboolean ci = FALSE;
+	unsigned char *unpacked_buf;
+	long num_char, written;
+	int spare_bits;
 
-	if (length < 1)
+	if (length < 2)
 		return NULL;
 
 	dcs = *buffer++;
@@ -787,11 +789,18 @@ static char *sim_network_name_parse(const unsigned char *buffer, int length,
 
 	switch (dcs & (7 << 4)) {
 	case 0x00:
-		endp = memchr(buffer, 0xff, length);
-		if (endp)
-			length = endp - buffer;
-		ret = convert_gsm_to_utf8(buffer, length,
-				NULL, NULL, 0xff);
+		spare_bits = dcs & 0x07;
+		num_char = (length * 8 - spare_bits) / 7;
+
+		unpacked_buf = unpack_7bit(buffer, length, 0, FALSE,
+						num_char, &written, 0);
+		if (unpacked_buf == NULL)
+			break;
+
+		ret = convert_gsm_to_utf8(unpacked_buf, written, NULL, NULL, 0);
+
+		g_free(unpacked_buf);
+
 		break;
 	case 0x10:
 		if ((length % 2) == 1) {

ofono/src/smsutil.c

@@ -3561,7 +3561,7 @@ GSList *sms_text_prepare_with_alphabet(const char *to, const char *utf8,
 	if (gsm_encoded == NULL) {
 		gsize converted;
 
-		ucs2_encoded = g_convert(utf8, -1, "UCS-2BE//TRANSLIT", "UTF-8",
+		ucs2_encoded = g_convert(utf8, -1, "UTF-16BE//TRANSLIT", "UTF-8",
 						NULL, &converted, NULL);
 		written = converted;
 	}

ofono/src/stk.c

@@ -737,6 +737,11 @@ static DBusMessage *stk_register_agent(DBusConnection *conn,
 	if (stk->session_agent == NULL)
 		stk->current_agent = stk->default_agent;
 
+	if (stk->driver && stk->driver->ready) {
+		DBG("Report driver agent is ready");
+		stk->driver->ready(stk);
+	}
+
 	return dbus_message_new_method_return(msg);
 }
 

ofono/src/voicecall.c

@@ -3,6 +3,7 @@
  *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2014 Jolla 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
@@ -38,6 +39,7 @@
 #include "simutil.h"
 #include "smsutil.h"
 #include "storage.h"
+#include "voicecallagent.h"
 
 #define MAX_VOICE_CALLS 16
 
@@ -75,6 +77,7 @@ struct ofono_voicecall {
 	ofono_voicecall_cb_t release_queue_done_cb;
 	struct ofono_emulator *pending_em;
 	unsigned int pending_id;
+	struct voicecall_agent *vc_agent;
 };
 
 struct voicecall {
@@ -555,6 +558,11 @@ static DBusMessage *voicecall_hangup(DBusConnection *conn,
 	struct ofono_voicecall *vc = v->vc;
 	struct ofono_call *call = v->call;
 	gboolean single_call = vc->call_list->next == 0;
+	struct tone_queue_entry *tone_entry = NULL;
+
+	/* clear any remaining tones */
+	while ((tone_entry = g_queue_peek_head(vc->toneq)))
+		tone_request_finish(vc, tone_entry, ENOENT, TRUE);
 
 	if (vc->pending || vc->pending_em)
 		return __ofono_error_busy(msg);
@@ -2140,6 +2148,72 @@ static DBusMessage *manager_get_calls(DBusConnection *conn,
 	return reply;
 }
 
+static void voicecall_agent_notify(gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	vc->vc_agent = NULL;
+}
+
+static DBusMessage *voicecall_register_agent(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	struct ofono_voicecall *vc = data;
+	const char *agent_path;
+
+	if (vc->vc_agent)
+		return __ofono_error_busy(msg);
+
+	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH,
+				&agent_path, DBUS_TYPE_INVALID) == FALSE)
+		return __ofono_error_invalid_args(msg);
+
+	if (!__ofono_dbus_valid_object_path(agent_path))
+		return __ofono_error_invalid_format(msg);
+
+	vc->vc_agent = voicecall_agent_new(agent_path,
+						dbus_message_get_sender(msg));
+
+	if (vc->vc_agent == NULL)
+		return __ofono_error_failed(msg);
+
+	voicecall_agent_set_removed_notify(vc->vc_agent,
+			voicecall_agent_notify, vc);
+
+	return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *voicecall_unregister_agent(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	struct ofono_voicecall *vc = data;
+	const char *agent_path;
+	const char *agent_bus = dbus_message_get_sender(msg);
+
+	if (dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &agent_path,
+					DBUS_TYPE_INVALID) == FALSE)
+		return __ofono_error_invalid_args(msg);
+
+	if (vc->vc_agent == NULL)
+		return __ofono_error_failed(msg);
+
+	if (!voicecall_agent_matches(vc->vc_agent, agent_path, agent_bus))
+		return __ofono_error_access_denied(msg);
+
+	if (vc->vc_agent) {
+		voicecall_agent_free(vc->vc_agent);
+		vc->vc_agent = NULL;
+	}
+
+	return dbus_message_new_method_return(msg);
+}
+
+void ofono_voicecall_ringback_tone_notify(struct ofono_voicecall *vc,
+						const ofono_bool_t playTone)
+{
+	if (vc->vc_agent)
+		voicecall_agent_ringback_tone(vc->vc_agent, playTone);
+}
+
 static const GDBusMethodTable manager_methods[] = {
 	{ GDBUS_METHOD("GetProperties",
 			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
@@ -2172,6 +2246,12 @@ static const GDBusMethodTable manager_methods[] = {
 	{ GDBUS_METHOD("GetCalls",
 		NULL, GDBUS_ARGS({ "calls_with_properties", "a(oa{sv})" }),
 		manager_get_calls) },
+	{ GDBUS_ASYNC_METHOD("RegisterVoicecallAgent",
+				GDBUS_ARGS({ "path", "o" }), NULL,
+				voicecall_register_agent) },
+	{ GDBUS_ASYNC_METHOD("UnregisterVoicecallAgent",
+				GDBUS_ARGS({ "path", "o" }), NULL,
+				voicecall_unregister_agent) },
 	{ }
 };
 
@@ -2744,6 +2824,11 @@ static void voicecall_unregister(struct ofono_atom *atom)
 
 	voicecall_close_settings(vc);
 
+	if (vc->vc_agent) {
+		voicecall_agent_free(vc->vc_agent);
+		vc->vc_agent = 0;
+	}
+
 	if (vc->sim_state_watch) {
 		ofono_sim_remove_state_watch(vc->sim, vc->sim_state_watch);
 		vc->sim_state_watch = 0;
@@ -2859,19 +2944,24 @@ static void read_sim_ecc_numbers(int id, void *userdata)
 			ecc_g3_read_cb, vc);
 }
 
+static void get_ecc_numbers(struct ofono_voicecall *vc)
+{
+	if (vc->sim_context == NULL) {
+		vc->sim_context = ofono_sim_context_create(vc->sim);
+		ofono_sim_add_file_watch(vc->sim_context, SIM_EFECC_FILEID,
+					read_sim_ecc_numbers, vc, NULL);
+	}
+
+	read_sim_ecc_numbers(SIM_EFECC_FILEID, vc);
+}
+
 static void sim_state_watch(enum ofono_sim_state new_state, void *user)
 {
 	struct ofono_voicecall *vc = user;
 
 	switch (new_state) {
 	case OFONO_SIM_STATE_INSERTED:
-		if (vc->sim_context == NULL)
-			vc->sim_context = ofono_sim_context_create(vc->sim);
-
-		read_sim_ecc_numbers(SIM_EFECC_FILEID, vc);
-
-		ofono_sim_add_file_watch(vc->sim_context, SIM_EFECC_FILEID,
-						read_sim_ecc_numbers, vc, NULL);
+		get_ecc_numbers(vc);
 		break;
 	case OFONO_SIM_STATE_NOT_PRESENT:
 	case OFONO_SIM_STATE_RESETTING:
@@ -2888,6 +2978,8 @@ static void sim_state_watch(enum ofono_sim_state new_state, void *user)
 		voicecall_close_settings(vc);
 		break;
 	case OFONO_SIM_STATE_READY:
+		get_ecc_numbers(vc);
+
 		voicecall_load_settings(vc);
 		break;
 	case OFONO_SIM_STATE_LOCKED_OUT:

ofono/src/voicecallagent.c

@@ -0,0 +1,131 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2014 Jolla 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
+ *
+ */
+
+#include <glib.h>
+#include <gdbus.h>
+
+#include "ofono.h"
+#include "voicecallagent.h"
+
+#define OFONO_VOICECALL_AGENT_INTERFACE "org.ofono.VoiceCallAgent"
+
+struct voicecall_agent {
+	char *path;			/* Agent Path */
+	char *bus;			/* Agent bus */
+	guint disconnect_watch;		/* DBus disconnect watch */
+	ofono_destroy_func removed_cb;
+	void *removed_data;
+};
+
+void voicecall_agent_ringback_tone(struct voicecall_agent *agent,
+					const ofono_bool_t playTone)
+{
+	DBusConnection *conn = ofono_dbus_get_connection();
+	DBusMessage *message = dbus_message_new_method_call(
+			agent->bus, agent->path,
+			OFONO_VOICECALL_AGENT_INTERFACE,
+			"RingbackTone");
+
+	if (message == NULL)
+		return;
+
+	if (!dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &playTone,
+				DBUS_TYPE_INVALID))
+		return;
+
+	dbus_message_set_no_reply(message, TRUE);
+	g_dbus_send_message(conn, message);
+}
+
+void voicecall_agent_send_release(struct voicecall_agent *agent)
+{
+	DBusConnection *conn = ofono_dbus_get_connection();
+	DBusMessage *message = dbus_message_new_method_call(
+			agent->bus, agent->path,
+			OFONO_VOICECALL_AGENT_INTERFACE,
+			"Release");
+
+	if (message == NULL)
+		return;
+
+	dbus_message_set_no_reply(message, TRUE);
+	g_dbus_send_message(conn, message);
+}
+
+void voicecall_agent_set_removed_notify(struct voicecall_agent *agent,
+					ofono_destroy_func destroy,
+					void *user_data)
+{
+	agent->removed_cb = destroy;
+	agent->removed_data = user_data; /* voicecall atom (not owned) */
+}
+
+void voicecall_agent_free(struct voicecall_agent *agent)
+{
+	DBusConnection *conn = ofono_dbus_get_connection();
+
+	if (agent->disconnect_watch) {
+		voicecall_agent_send_release(agent);
+		g_dbus_remove_watch(conn, agent->disconnect_watch);
+		agent->disconnect_watch = 0;
+	}
+
+	if (agent->removed_cb)
+		agent->removed_cb(agent->removed_data);
+
+	g_free(agent->path);
+	g_free(agent->bus);
+	g_free(agent);
+}
+
+ofono_bool_t voicecall_agent_matches(struct voicecall_agent *agent,
+				const char *path, const char *sender)
+{
+	return g_str_equal(agent->path, path) &&
+			g_str_equal(agent->bus, sender);
+}
+
+void voicecall_agent_disconnect_cb(DBusConnection *conn, void *user_data)
+{
+	struct voicecall_agent *agent = user_data;
+
+	agent->disconnect_watch = 0;
+	voicecall_agent_free(agent);
+}
+
+struct voicecall_agent *voicecall_agent_new(const char *path,
+						const char *sender)
+{
+	struct voicecall_agent *agent = g_try_new0(struct voicecall_agent, 1);
+	DBusConnection *conn = ofono_dbus_get_connection();
+
+	if (agent == NULL)
+		return NULL;
+
+	agent->path = g_strdup(path);
+	agent->bus = g_strdup(sender);
+
+	agent->disconnect_watch = g_dbus_add_disconnect_watch(conn, sender,
+						voicecall_agent_disconnect_cb,
+						agent, NULL);
+
+	return agent;
+}

ofono/src/voicecallagent.h

@@ -0,0 +1,40 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2014 Jolla 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
+ *
+ */
+
+struct voicecall_agent;
+
+void voicecall_agent_ringback_tone(struct voicecall_agent *agent,
+					const ofono_bool_t playTone);
+
+void voicecall_agent_set_removed_notify(struct voicecall_agent *agent,
+					ofono_destroy_func removed_cb,
+					void *user_data);
+
+void voicecall_agent_free(struct voicecall_agent *agent);
+
+ofono_bool_t voicecall_agent_matches(struct voicecall_agent *agent,
+					const char *path, const char *sender);
+
+struct voicecall_agent *voicecall_agent_new(const char *path,
+						const char *sender);
+
+void voicecall_agent_disconnect_cb(DBusConnection *conn,
+		void *user_data);

ofono/test/activate-context

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -20,7 +20,7 @@ for path, properties in modems:
 	contexts = connman.GetContexts()
 
 	if (len(contexts) == 0):
-		print "No context available"
+		print("No context available")
 		sys.exit(1)
 
 	connman.SetProperty("Powered", dbus.Boolean(1))
@@ -35,6 +35,6 @@ for path, properties in modems:
 
 	try:
 		context.SetProperty("Active", dbus.Boolean(1), timeout = 100)
-	except dbus.DBusException, e:
-		print "Error activating %s: %s" % (path, str(e))
+	except dbus.DBusException as e:
+		print("Error activating %s: %s" % (path, str(e)))
 		exit(2)

ofono/test/answer-calls

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -22,7 +22,7 @@ for path, properties in modems:
 
 	for path, properties in calls:
 		state = properties["State"]
-		print "[ %s ] %s" % (path, state)
+		print("[ %s ] %s" % (path, state))
 
 		if state != "incoming":
 			continue

ofono/test/auto-answer-calls

@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
@@ -12,23 +12,23 @@ def answer_call(path):
 						'org.ofono.VoiceCall')
 	time.sleep(2)	
 	call.Answer()
-	print "    Voice Call [ %s ] Answered" % (path)
+	print("    Voice Call [ %s ] Answered" % (path))
 
 def voicecalls_call_added(path, properties):
-	print "    Voice Call [ %s ] Added" % (path)
+	print("    Voice Call [ %s ] Added" % (path))
 
 	for key in properties.keys():
 		val = str(properties[key])
-		print "        %s = %s" % (key, val)
-	print
+		print("        %s = %s" % (key, val))
+	print()
 
 	state = properties["State"]
 	if state == "incoming":
 		answer_call(path)
 
 def voicecalls_call_removed(path):
-	print "    Voice Call [ %s ] Removed" % (path)
-	print
+	print("    Voice Call [ %s ] Removed" % (path))
+	print()
 
 if __name__ == "__main__":
 	global vcmanager
@@ -43,7 +43,7 @@ if __name__ == "__main__":
 	modems = manager.GetModems()
 	modem = modems[0][0]
 
-	print "Using modem %s" % modem
+	print("Using modem %s" % modem)
 
 	vcmanager = dbus.Interface(bus.get_object('org.ofono', modem),
 						'org.ofono.VoiceCallManager')
@@ -52,6 +52,6 @@ if __name__ == "__main__":
 
 	vcmanager.connect_to_signal("CallRemoved", voicecalls_call_removed)
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()
 

ofono/test/backtrace

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import re
@@ -6,7 +6,7 @@ import sys
 import subprocess
 
 if (len(sys.argv) < 3):
-	print "Usage: %s [binary] [log]" % (sys.argv[0])
+	print("Usage: %s [binary] [log]" % (sys.argv[0]))
 	sys.exit(1)
 
 binary = sys.argv[1]
@@ -50,8 +50,8 @@ child_stdout.close()
 frame_count = len(frames);
 
 count = 0
-print "-------- backtrace --------"
+print("-------- backtrace --------")
 while count < frame_count:
-	print "[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1])
+	print("[%d]: %s() [%s]" % (count/2, frames[count], frames[count + 1]))
 	count = count + 2
-print "---------------------------"
+print("---------------------------")

ofono/test/cancel-ussd

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -21,7 +21,7 @@ ussd = dbus.Interface(bus.get_object('org.ofono', path),
 properties = ussd.GetProperties()
 state = properties["State"]
 
-print "State: %s" % (state)
+print("State: %s" % (state))
 
 if state != "idle":
 	ussd.Cancel()

ofono/test/cdma-connman-disable

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Disconnecting CDMA Packet Data Service on modem %s..." % path
+print("Disconnecting CDMA Packet Data Service on modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.cdma.ConnectionManager')
 

ofono/test/cdma-connman-enable

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Connecting CDMA Packet Data Service on modem %s..." % path
+print("Connecting CDMA Packet Data Service on modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.cdma.ConnectionManager')
 

ofono/test/cdma-dial-number

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -16,7 +16,7 @@ else:
 	path, properties = modems[0]
 	number = sys.argv[1]
 
-print "Using modem %s" % path
+print("Using modem %s" % path)
 
 manager = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.cdma.VoiceCallManager')

ofono/test/cdma-hangup

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

ofono/test/cdma-list-call

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 
@@ -10,7 +10,7 @@ manager = dbus.Interface(bus.get_object('org.ofono', '/'),
 modems = manager.GetModems()
 
 for path, properties in modems:
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	if "org.ofono.cdma.VoiceCallManager" not in properties["Interfaces"]:
 		continue
@@ -22,4 +22,4 @@ for path, properties in modems:
 
 	for key in properties.keys():
 		val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))

ofono/test/cdma-set-credentials

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -17,12 +17,12 @@ for path, properties in modems:
 	cm = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.cdma.ConnectionManager')
 
-	print "Connecting CDMA Packet Data Service on modem %s..." % path
+	print("Connecting CDMA Packet Data Service on modem %s..." % path)
 
 	if len(sys.argv) > 1:
 		cm.SetProperty("Username", (sys.argv[1]))
-		print "Setting Username to %s" % (sys.argv[1])
+		print("Setting Username to %s" % (sys.argv[1]))
 
 	if len(sys.argv) > 2:
 		cm.SetProperty("Password", (sys.argv[2]))
-		print "Setting Password to %s" % (sys.argv[2])
+		print("Setting Password to %s" % (sys.argv[2]))

ofono/test/change-pin

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -19,10 +19,10 @@ elif len(sys.argv) == 3:
 	old_pin = sys.argv[2]
 	new_pin = sys.argv[3]
 else:
-	print "%s [PATH] pin_type old_pin new_pin" % (sys.argv[0])
+	print("%s [PATH] pin_type old_pin new_pin" % (sys.argv[0]))
 	sys.exit(0)
 
-print "Change %s for modem %s..." % (pin_type, path)
+print("Change %s for modem %s..." % (pin_type, path))
 
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')

ofono/test/create-internet-context

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -27,21 +27,21 @@ for path, properties in modems:
 
 	if path == "":
 		path = connman.AddContext("internet")
-		print "Created new context %s" % (path)
+		print("Created new context %s" % (path))
 	else:
-		print "Found context %s" % (path)
+		print("Found context %s" % (path))
 
 	context = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.ConnectionContext')
 
 	if len(sys.argv) > 1:
 		context.SetProperty("AccessPointName", sys.argv[1])
-		print "Setting APN to %s" % (sys.argv[1])
+		print("Setting APN to %s" % (sys.argv[1]))
 
 	if len(sys.argv) > 2:
 		context.SetProperty("Username", sys.argv[2])
-		print "Setting username to %s" % (sys.argv[2])
+		print("Setting username to %s" % (sys.argv[2]))
 
 	if len(sys.argv) > 3:
 		context.SetProperty("Password", sys.argv[3])
-		print "Setting password to %s" % (sys.argv[3])
+		print("Setting password to %s" % (sys.argv[3]))

ofono/test/create-mms-context

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -27,21 +27,21 @@ for path, properties in modems:
 
 	if path == "":
 		path = connman.AddContext("mms")
-		print "Created new context %s" % (path)
+		print("Created new context %s" % (path))
 	else:
-		print "Found context %s" % (path)
+		print("Found context %s" % (path))
 
 	context = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.ConnectionContext')
 
 	if len(sys.argv) > 1:
 		context.SetProperty("AccessPointName", sys.argv[1])
-		print "Setting APN to %s" % (sys.argv[1])
+		print("Setting APN to %s" % (sys.argv[1]))
 
 	if len(sys.argv) > 2:
 		context.SetProperty("Username", sys.argv[2])
-		print "Setting username to %s" % (sys.argv[2])
+		print("Setting username to %s" % (sys.argv[2]))
 
 	if len(sys.argv) > 3:
 		context.SetProperty("Password", sys.argv[3])
-		print "Setting password to %s" % (sys.argv[3])
+		print("Setting password to %s" % (sys.argv[3]))

ofono/test/create-multiparty

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -21,4 +21,4 @@ manager = dbus.Interface(bus.get_object('org.ofono', path),
 mpty = manager.CreateMultiparty()
 
 for path in mpty:
-	print path
+	print(path)

ofono/test/deactivate-all

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

ofono/test/deactivate-context

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -20,7 +20,7 @@ for path, properties in modems:
 	contexts = connman.GetContexts()
 
 	if (len(contexts) == 0):
-		print "No context available"
+		print("No context available")
 		sys.exit(1)
 
 	if len(sys.argv) > 1:
@@ -33,6 +33,6 @@ for path, properties in modems:
 
 	try:
 		context.SetProperty("Active", dbus.Boolean(0))
-	except dbus.DBusException, e:
-		print "Error activating %s: %s" % (path, str(e))
+	except dbus.DBusException as e:
+		print("Error activating %s: %s" % (path, str(e)))
 		exit(2)

ofono/test/dial-number

@@ -1,10 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s [modem] <number> [hide_callerid]" % (sys.argv[0])
+	print("Usage: %s [modem] <number> [hide_callerid]" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -32,11 +32,11 @@ else:
 	number = sys.argv[2]
 	hide_callerid = sys.argv[3]
 
-print "Using modem %s" % modem
+print("Using modem %s" % modem)
 
 vcm = dbus.Interface(bus.get_object('org.ofono', modem),
 						'org.ofono.VoiceCallManager')
 
 path = vcm.Dial(number, hide_callerid)
 
-print path
+print(path)

ofono/test/disable-call-forwarding

@@ -1,24 +1,24 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
-import gobject
+from gi.repository import GLib
 
 import dbus
 import dbus.mainloop.glib
 
 def property_changed(property, value):
 	if len(value.__str__()) > 0:
-		print "CF property %s changed to %s" % (property, value)
+		print("CF property %s changed to %s" % (property, value))
 	else:
-		print "CF property %s changed to disabled" % (property)
+		print("CF property %s changed to disabled" % (property))
 
 	if canexit:
 		mainloop.quit();
 
 if __name__ == "__main__":
 	if len(sys.argv) < 2:
-		print "Usage: %s <type>" % (sys.argv[0])
-		print "Type can be: all, conditional"
+		print("Usage: %s <type>" % (sys.argv[0]))
+		print("Type can be: all, conditional")
 		sys.exit(1)
 
 	canexit = False
@@ -41,13 +41,13 @@ if __name__ == "__main__":
 
 	try:
 		cf.DisableAll(type, timeout = 100)
-	except dbus.DBusException, e:
-		print "Unable to DisableAll", e
+	except dbus.DBusException as e:
+		print("Unable to DisableAll %s" % e)
 		sys.exit(1);
 
-	print "DisableAll successful"
+	print("DisableAll successful")
 
 	canexit = True
 
-	mainloop = gobject.MainLoop()
+	mainloop = GLib.MainLoop()
 	mainloop.run()

ofono/test/disable-gprs

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Disconnecting GPRS on modem %s..." % path
+print("Disconnecting GPRS on modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.ConnectionManager')
 

ofono/test/disable-modem

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Disconnecting modem %s..." % path
+print("Disconnecting modem %s..." % path)
 modem = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.Modem')
 

ofono/test/display-icon

@@ -1,10 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
 
 if (len(sys.argv) < 2):
-	print "Usage: %s [modem] icon_id" % (sys.argv[0])
+	print("Usage: %s [modem] icon_id" % (sys.argv[0]))
 	sys.exit(1)
 
 bus = dbus.SystemBus()
@@ -21,7 +21,7 @@ elif (len(sys.argv) == 3):
 	modem = sys.argv[1]
 	icon = sys.argv[2]
 
-print "Using modem %s" % modem
+print("Using modem %s" % modem)
 
 sim = dbus.Interface(bus.get_object('org.ofono', modem),
 						'org.ofono.SimManager')

ofono/test/dundee-connect

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	devices = manager.GetDevices()
 	path = devices[0][0]
 
-print "Connect device %s..." % path
+print("Connect device %s..." % path)
 device = dbus.Interface(bus.get_object('org.ofono.dundee', path),
 						'org.ofono.dundee.Device')
 

ofono/test/dundee-disconnect

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	devices = manager.GetDevices()
 	path = devices[0][0]
 
-print "Disconnect device %s..." % path
+print("Disconnect device %s..." % path)
 device = dbus.Interface(bus.get_object('org.ofono.dundee', path),
 						'org.ofono.dundee.Device')
 

ofono/test/enable-cbs

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Enabling cell broadcast on modem %s..." % path
+print("Enabling cell broadcast on modem %s..." % path)
 cbs = dbus.Interface(bus.get_object('org.ofono', path),
 					'org.ofono.CellBroadcast')
 

ofono/test/enable-gprs

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Connecting modem %s..." % path
+print("Connecting modem %s..." % path)
 cm = dbus.Interface(bus.get_object('org.ofono', path),
 		'org.ofono.ConnectionManager')
 

ofono/test/enable-modem

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -13,7 +13,7 @@ else:
 	modems = manager.GetModems()
 	path = modems[0][0]
 
-print "Connecting modem %s..." % path
+print("Connecting modem %s..." % path)
 modem = dbus.Interface(bus.get_object('org.ofono', path),
 						'org.ofono.Modem')
 

ofono/test/enter-pin

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -17,10 +17,10 @@ elif len(sys.argv) == 3:
 	pin_type = sys.argv[1]
 	pin = sys.argv[2]
 else:
-	print "%s [PATH] pin_type pin" % (sys.argv[0])
+	print("%s [PATH] pin_type pin" % (sys.argv[0]))
 	sys.exit(0)
 
-print "Enter Pin for modem %s..." % path
+print("Enter Pin for modem %s..." % path)
 simmanager = dbus.Interface(bus.get_object('org.ofono', path),
 				'org.ofono.SimManager')
 

ofono/test/get-icon

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -8,7 +8,7 @@ bus = dbus.SystemBus()
 if len(sys.argv) == 2:
 	id = sys.argv[1]
 else:
-	print "%s <icon id>" % (sys.argv[0])
+	print("%s <icon id>" % (sys.argv[0]))
 	sys.exit(0)
 
 manager = dbus.Interface(bus.get_object("org.ofono", "/"),
@@ -28,4 +28,4 @@ icon = sim.GetIcon(dbus.Byte(int(sys.argv[1])))
 xpm = ""
 for byte in icon:
 	xpm += str(byte)
-print xpm
+print(xpm)

ofono/test/get-network-time

@@ -1,9 +1,9 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
 _dbus2py = {
-	dbus.String : unicode,
+	dbus.String : str,
 	dbus.UInt32 : int,
 	dbus.Int32 : int,
 	dbus.Int16 : int,
@@ -66,4 +66,4 @@ net_time = dbus.Interface(bus.get_object('org.ofono', path),
 
 time = net_time.GetNetworkTime()
 
-print pretty(time)
+print(pretty(time))

ofono/test/get-operators

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import sys
@@ -22,7 +22,7 @@ for entry in operators:
 	path = entry[0]
 	properties = entry[1]
 
-	print "[ %s ]" % (path)
+	print("[ %s ]" % (path))
 
 	for key in properties.keys():
 		if key in ["Technologies"]:
@@ -31,7 +31,7 @@ for entry in operators:
 				val += i + " "
 		else:
 			val = str(properties[key])
-		print "    %s = %s" % (key, val)
+		print("    %s = %s" % (key, val))
 
-	print
+	print('')
 

ofono/test/get-tech-preference

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus, sys
 
@@ -17,4 +17,4 @@ radiosettings = dbus.Interface(bus.get_object('org.ofono', path),
 
 properties = radiosettings.GetProperties()
 
-print "Technology preference: %s" % (properties["TechnologyPreference"])
+print("Technology preference: %s" % (properties["TechnologyPreference"]))

ofono/test/hangup-active

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -18,7 +18,7 @@ calls = manager.GetCalls()
 
 for path, properties in calls:
 		state = properties["State"]
-		print "[ %s ] %s" % (path, state)
+		print("[ %s ] %s" % (path, state))
 
 		if state != "active":
 			continue

ofono/test/hangup-all

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus