[ril] Respect state restrictions. JB#42752

Do not allow mobile data connections if packet data access is blocked due to restriction. Conflicts: ofono/drivers/ril/ril_constants.h
[ril] Fix incoming call indication on mtk2 vendor. Fixes JB#40790
2025-11-25 03:49:44 +08:00 · 2018-09-12 00:54:36 +03:00 · 2018-09-12 00:53:08 +03:00 · 2018-09-12 00:53:08 +03:00 · 2018-06-29 08:11:36 +00:00 · 2018-06-29 11:09:46 +03:00
34 changed files with 3595 additions and 521 deletions
--- a/ofono/.gitignore
+++ b/ofono/.gitignore
@@ -32,6 +32,8 @@ src/ofono.service
 dundee/dundee
 dundee/dundee.service

+test-driver
+test-suite.log
 unit/test-common
 unit/test-util
 unit/test-idmap
@@ -57,6 +59,7 @@ unit/test-sailfish_sim_info
 unit/test-sailfish_sim_info_dbus
 unit/test-sailfish_watch
 unit/test-sms-filter
+unit/test-voicecall-filter
 unit/test-*.log
 unit/test-*.trs

--- a/ofono/Makefile.am
+++ b/ofono/Makefile.am
@@ -24,6 +24,7 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/sim-mnclength.h \
 			include/handsfree-audio.h include/siri.h \
 			include/sms-filter.h include/gprs-filter.h \
+			include/voicecall-filter.h \
 			include/netmon.h include/lte.h \
 			include/storage.h \
 			gdbus/gdbus.h
@@ -737,6 +738,7 @@ src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
 			src/handsfree-audio.c src/bluetooth.h \
 			src/sim-mnclength.c src/voicecallagent.c \
 			src/sms-filter.c src/gprs-filter.c src/dbus-queue.c \
+			src/voicecall-filter.c \
 			src/hfp.h src/siri.c \
 			src/netmon.c src/lte.c \
 			src/netmonagent.c src/netmonagent.h
@@ -749,7 +751,8 @@ src_ofonod_LDFLAGS = -Wl,--export-dynamic \

 BUILT_SOURCES = $(local_headers) src/builtin.h

-CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
+CLEANFILES = $(BUILT_SOURCES) $(rules_DATA) \
+	$(shell find . -name "*.gcda") $(shell find . -name "*.gcno")

 plugindir = $(pkglibdir)/plugins

@@ -1107,6 +1110,14 @@ unit_test_gprs_filter_LDADD = @GLIB_LIBS@ -ldl
 unit_objects += $(unit_test_gprs_filter_OBJECTS)
 unit_tests += unit/test-gprs-filter

+unit_test_voicecall_filter_SOURCES = unit/test-voicecall-filter.c \
+				src/voicecall-filter.c src/log.c \
+				src/common.c src/util.c
+unit_test_voicecall_filter_CFLAGS = $(COVERAGE_OPT) $(AM_CFLAGS)
+unit_test_voicecall_filter_LDADD = @GLIB_LIBS@ -ldl
+unit_objects += $(unit_test_voicecall_filter_OBJECTS)
+unit_tests += unit/test-voicecall-filter
+
 test_rilmodem_sources = $(gril_sources) src/log.c src/common.c src/util.c \
 				gatchat/ringbuffer.h gatchat/ringbuffer.c \
 				unit/rilmodem-test-server.h \
--- a/ofono/drivers/ril/ril_constants.h
+++ b/ofono/drivers/ril/ril_constants.h
@@ -581,6 +581,14 @@ enum ril_cell_info_type {
 /* A special request, ofono -> rild */
 #define RIL_RESPONSE_ACKNOWLEDGEMENT 800

+enum ril_restricted_state {
+	RIL_RESTRICTED_STATE_NONE         = 0x00,
+	RIL_RESTRICTED_STATE_CS_EMERGENCY = 0x01,
+	RIL_RESTRICTED_STATE_CS_NORMAL    = 0x02,
+	RIL_RESTRICTED_STATE_CS_ALL       = 0x04,
+	RIL_RESTRICTED_STATE_PS_ALL       = 0x10
+};
+
 /* Suplementary services Service class*/
 #define SERVICE_CLASS_NONE 0

--- a/ofono/drivers/ril/ril_data.c
+++ b/ofono/drivers/ril/ril_data.c
@@ -76,6 +76,12 @@ enum ril_data_priv_flags {
 typedef GObjectClass RilDataClass;
 typedef struct ril_data RilData;

+enum ril_data_io_event_id {
+	IO_EVENT_DATA_CALL_LIST_CHANGED,
+	IO_EVENT_RESTRICTED_STATE_CHANGED,
+	IO_EVENT_COUNT
+};
+
 enum ril_data_settings_event_id {
 	SETTINGS_EVENT_IMSI_CHANGED,
 	SETTINGS_EVENT_PREF_MODE,
@@ -94,9 +100,11 @@ struct ril_data_priv {
 	struct ril_radio *radio;
 	struct ril_network *network;
 	struct ril_data_manager *dm;
-	enum ril_data_priv_flags flags;
 	struct ril_vendor_hook *vendor_hook;

+	enum ril_data_priv_flags flags;
+	enum ril_restricted_state restricted_state;
+
 	struct ril_data_request *req_queue;
 	struct ril_data_request *pending_req;

@@ -104,7 +112,7 @@ struct ril_data_priv {
 	guint slot;
 	char *log_prefix;
 	guint query_id;
-	gulong io_event_id;
+	gulong io_event_id[IO_EVENT_COUNT];
 	gulong settings_event_id[SETTINGS_EVENT_COUNT];
 };

@@ -547,6 +555,37 @@ static void ril_data_set_calls(struct ril_data *self,
 	}
 }

+static void ril_data_check_allowed(struct ril_data *self, gboolean was_allowed)
+{
+	if (ril_data_allowed(self) != was_allowed) {
+		ril_data_signal_emit(self, SIGNAL_ALLOW_CHANGED);
+	}
+}
+
+static void ril_data_restricted_state_changed_cb(GRilIoChannel *io, guint event,
+				const void *data, guint len, void *user_data)
+{
+	struct ril_data *self = RIL_DATA(user_data);
+	GRilIoParser rilp;
+	guint32 count, state;
+
+	GASSERT(event == RIL_UNSOL_RESTRICTED_STATE_CHANGED);
+	grilio_parser_init(&rilp, data, len);
+	if (grilio_parser_get_uint32(&rilp, &count) && count == 1 &&
+				grilio_parser_get_uint32(&rilp, &state) &&
+				grilio_parser_at_end(&rilp)) {
+		struct ril_data_priv *priv = self->priv;
+
+		if (priv->restricted_state != state) {
+			const gboolean was_allowed = ril_data_allowed(self);
+
+			DBG_(self, "restricted state 0x%02x", state);
+			priv->restricted_state = state;
+			ril_data_check_allowed(self, was_allowed);
+		}
+	}
+}
+
 static void ril_data_call_list_changed_cb(GRilIoChannel *io, guint event,
 				const void *data, guint len, void *user_data)
 {
@@ -1070,9 +1109,7 @@ static void ril_data_allow_cb(GRilIoChannel *io, int ril_status,
 			DBG_(data, "data off");
 		}

-		if (ril_data_allowed(data) != was_allowed) {
-			ril_data_signal_emit(data, SIGNAL_ALLOW_CHANGED);
-		}
+		ril_data_check_allowed(data, was_allowed);
 	}

 	ril_data_request_finish(req);
@@ -1188,9 +1225,15 @@ struct ril_data *ril_data_new(struct ril_data_manager *dm, const char *name,
 		priv->radio = ril_radio_ref(radio);
 		priv->network = ril_network_ref(network);
 		priv->vendor_hook = ril_vendor_hook_ref(vendor_hook);
-		priv->io_event_id = grilio_channel_add_unsol_event_handler(io,
+
+		priv->io_event_id[IO_EVENT_DATA_CALL_LIST_CHANGED] =
+			grilio_channel_add_unsol_event_handler(io,
 				ril_data_call_list_changed_cb,
 				RIL_UNSOL_DATA_CALL_LIST_CHANGED, self);
+		priv->io_event_id[IO_EVENT_RESTRICTED_STATE_CHANGED] =
+			grilio_channel_add_unsol_event_handler(io,
+				ril_data_restricted_state_changed_cb,
+				RIL_UNSOL_RESTRICTED_STATE_CHANGED, self);

 		priv->settings_event_id[SETTINGS_EVENT_IMSI_CHANGED] =
 			ril_sim_settings_add_imsi_changed_handler(settings,
@@ -1264,6 +1307,8 @@ void ril_data_unref(struct ril_data *self)
 gboolean ril_data_allowed(struct ril_data *self)
 {
 	return G_LIKELY(self) &&
+		(self->priv->restricted_state &
+			RIL_RESTRICTED_STATE_PS_ALL) == 0 &&
 		(self->priv->flags &
 			(RIL_DATA_FLAG_ALLOWED | RIL_DATA_FLAG_ON)) ==
 			(RIL_DATA_FLAG_ALLOWED | RIL_DATA_FLAG_ON);
@@ -1348,9 +1393,7 @@ static void ril_data_disallow(struct ril_data *self)
 		ril_data_power_update(self);
 	}

-	if (ril_data_allowed(self) != was_allowed) {
-		ril_data_signal_emit(self, SIGNAL_ALLOW_CHANGED);
-	}
+	ril_data_check_allowed(self, was_allowed);
 }

 static void ril_data_max_speed_cb(gpointer data, gpointer max_speed)
@@ -1468,7 +1511,7 @@ static void ril_data_dispose(GObject *object)

 	ril_sim_settings_remove_handlers(settings, priv->settings_event_id,
 					G_N_ELEMENTS(priv->settings_event_id));
-	grilio_channel_remove_handlers(priv->io, &priv->io_event_id, 1);
+	grilio_channel_remove_all_handlers(priv->io, priv->io_event_id);
 	grilio_queue_cancel_all(priv->q, FALSE);
 	priv->query_id = 0;

--- a/ofono/drivers/ril/ril_netreg.c
+++ b/ofono/drivers/ril/ril_netreg.c
@@ -61,6 +61,8 @@ struct ril_netreg_cbd {

 #define ril_netreg_cbd_free g_free

+#define DBG_(nd,fmt,args...) DBG("%s" fmt, (nd)->log_prefix, ##args)
+
 static inline struct ril_netreg *ril_netreg_get_data(struct ofono_netreg *ofono)
 {
 	return ofono ? ofono_netreg_get_data(ofono) : NULL;
@@ -109,7 +111,7 @@ static gboolean ril_netreg_status_notify_cb(gpointer user_data)
 	struct ril_netreg *nd = user_data;
 	const struct ril_registration_state *reg = &nd->network->voice;

-	DBG("%s", nd->log_prefix);
+	DBG_(nd, "");
 	GASSERT(nd->notify_id);
 	nd->notify_id = 0;
 	ofono_netreg_status_notify(nd->netreg,
@@ -124,9 +126,9 @@ static void ril_netreg_status_notify(struct ril_network *net, void *user_data)

 	/* Coalesce multiple notifications into one */
 	if (nd->notify_id) {
-		DBG("%snotification aready queued", nd->log_prefix);
+		DBG_(nd, "notification aready queued");
 	} else {
-		DBG("%squeuing notification", nd->log_prefix);
+		DBG_(nd, "queuing notification");
 		nd->notify_id = g_idle_add(ril_netreg_status_notify_cb, nd);
 	}
 }
@@ -138,7 +140,7 @@ static void ril_netreg_registration_status(struct ofono_netreg *netreg,
 	const struct ril_registration_state *reg = &nd->network->voice;
 	struct ofono_error error;

-	DBG("%s", nd->log_prefix);
+	DBG_(nd, "");
 	cb(ril_error_ok(&error),
 			ril_netreg_check_status(nd, reg->status),
 			reg->lac, reg->ci, reg->access_tech, data);
@@ -151,7 +153,7 @@ static gboolean ril_netreg_current_operator_cb(void *user_data)
 	ofono_netreg_operator_cb_t cb = cbd->cb.operator;
 	struct ofono_error error;

-	DBG("%s", nd->log_prefix);
+	DBG_(nd, "");
 	GASSERT(nd->current_operator_id);
 	nd->current_operator_id = 0;

@@ -397,7 +399,7 @@ static void ril_netreg_strength_notify(GRilIoChannel *io, guint ril_event,

 	GASSERT(ril_event == RIL_UNSOL_SIGNAL_STRENGTH);
 	strength = ril_netreg_get_signal_strength(data, len);
-	DBG("%d", strength);
+	DBG_(nd, "%d", strength);
 	ofono_netreg_strength_notify(nd->netreg, strength);
 }

@@ -436,9 +438,8 @@ static void ril_netreg_nitz_notify(GRilIoChannel *io, guint ril_event,
 {
 	struct ril_netreg *nd = user_data;
 	GRilIoParser rilp;
-	struct ofono_network_time time;
-	int year, mon, mday, hour, min, sec, dst, tzi;
-	char tzs, tz[4];
+	int year, mon, mday, hour, min, sec, tzi, dst = 0;
+	char tzs;
 	gchar *nitz;

 	GASSERT(ril_event == RIL_UNSOL_NITZ_TIME_RECEIVED);
@@ -446,21 +447,33 @@ static void ril_netreg_nitz_notify(GRilIoChannel *io, guint ril_event,
 	grilio_parser_init(&rilp, data, len);
 	nitz = grilio_parser_get_utf8(&rilp);

-	DBG("%s", nitz);
-	sscanf(nitz, "%u/%u/%u,%u:%u:%u%c%u,%u", &year, &mon, &mday,
-			&hour, &min, &sec, &tzs, &tzi, &dst);
-	snprintf(tz, sizeof(tz), "%c%d", tzs, tzi);
+	DBG_(nd, "%s", nitz);

-	time.utcoff = atoi(tz) * 15 * 60;
-	time.dst = dst;
-	time.sec = sec;
-	time.min = min;
-	time.hour = hour;
-	time.mday = mday;
-	time.mon = mon;
-	time.year = 2000 + year;
+	/*
+	 * Format: yy/mm/dd,hh:mm:ss(+/-)tz[,ds]
+	 * The ds part is considered optional, initialized to zero.
+	 */
+	if (nitz && sscanf(nitz, "%u/%u/%u,%u:%u:%u%c%u,%u",
+			&year, &mon, &mday, &hour, &min, &sec, &tzs, &tzi,
+			&dst) >= 8 && (tzs == '+' || tzs == '-')) {
+		struct ofono_network_time time;
+		char tz[4];
+
+		snprintf(tz, sizeof(tz), "%c%d", tzs, tzi);
+		time.utcoff = atoi(tz) * 15 * 60;
+		time.dst = dst;
+		time.sec = sec;
+		time.min = min;
+		time.hour = hour;
+		time.mday = mday;
+		time.mon = mon;
+		time.year = 2000 + year;
+
+		ofono_netreg_time_notify(nd->netreg, &time);
+	} else {
+		ofono_warn("Failed to parse NITZ string \"%s\"", nitz);
+	}

-	ofono_netreg_time_notify(nd->netreg, &time);
 	g_free(nitz);
 }

@@ -501,10 +514,11 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 {
 	struct ril_modem *modem = data;
 	struct ril_netreg *nd = g_new0(struct ril_netreg, 1);
-	guint slot = ril_modem_slot(modem);

-	DBG("[%u] %p", slot, netreg);
-	nd->log_prefix = g_strdup_printf("%s_%u ", RILMODEM_DRIVER, slot);
+	nd->log_prefix = (modem->log_prefix && modem->log_prefix[0]) ?
+		g_strconcat(modem->log_prefix, " ", NULL) : g_strdup("");
+
+	DBG_(nd, "%p", netreg);
 	nd->io = grilio_channel_ref(ril_modem_io(modem));
 	nd->q = grilio_queue_new(nd->io);
 	nd->network = ril_network_ref(modem->network);
@@ -518,9 +532,8 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 static void ril_netreg_remove(struct ofono_netreg *netreg)
 {
 	struct ril_netreg *nd = ril_netreg_get_data(netreg);
-	unsigned int i;

-	DBG("%p", netreg);
+	DBG_(nd, "%p", netreg);
 	grilio_queue_cancel_all(nd->q, FALSE);
 	ofono_netreg_set_data(netreg, NULL);

@@ -536,14 +549,10 @@ static void ril_netreg_remove(struct ofono_netreg *netreg)
 		g_source_remove(nd->current_operator_id);
 	}

-	for (i=0; i<G_N_ELEMENTS(nd->network_event_id); i++) {
-		ril_network_remove_handler(nd->network, nd->network_event_id[i]);
-	}
+	ril_network_remove_all_handlers(nd->network, nd->network_event_id);
 	ril_network_unref(nd->network);

-	grilio_channel_remove_handlers(nd->io, nd->ril_event_id,
-						G_N_ELEMENTS(nd->ril_event_id));
-
+	grilio_channel_remove_all_handlers(nd->io, nd->ril_event_id);
 	grilio_channel_unref(nd->io);
 	grilio_queue_unref(nd->q);
 	g_free(nd->log_prefix);
--- a/ofono/drivers/ril/ril_network.c
+++ b/ofono/drivers/ril/ril_network.c
@@ -47,6 +47,12 @@ enum ril_network_radio_event {
 	RADIO_EVENT_COUNT
 };

+enum ril_network_sim_events {
+	SIM_EVENT_STATUS_CHANGED,
+	SIM_EVENT_IO_ACTIVE_CHANGED,
+	SIM_EVENT_COUNT
+};
+
 enum ril_network_unsol_event {
 	UNSOL_EVENT_NETWORK_STATE,
 	UNSOL_EVENT_RADIO_CAPABILITY,
@@ -57,8 +63,10 @@ struct ril_network_priv {
 	GRilIoChannel *io;
 	GRilIoQueue *q;
 	struct ril_radio *radio;
-	struct ril_sim_card *sim_card;
+	struct ril_sim_card *simcard;
 	int rat;
+	int lte_network_mode;
+	int network_mode_timeout;
 	char *log_prefix;
 	guint operator_poll_id;
 	guint voice_poll_id;
@@ -68,8 +76,8 @@ struct ril_network_priv {
 	gulong set_rat_id;
 	gulong unsol_event_id[UNSOL_EVENT_COUNT];
 	gulong settings_event_id;
-	gulong sim_status_event_id;
 	gulong radio_event_id[RADIO_EVENT_COUNT];
+	gulong simcard_event_id[SIM_EVENT_COUNT];
 	struct ofono_network_operator operator;
 	gboolean assert_rat;
 };
@@ -111,7 +119,8 @@ G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_UMTS > OFONO_RADIO_ACCESS_MODE_GSM);
 G_STATIC_ASSERT(OFONO_RADIO_ACCESS_MODE_LTE > OFONO_RADIO_ACCESS_MODE_UMTS);

 static void ril_network_query_pref_mode(struct ril_network *self);
-static void ril_network_set_pref_mode(struct ril_network *self, int rat);
+static void ril_network_check_pref_mode(struct ril_network *self,
+							gboolean immediate);

 static void ril_network_emit(struct ril_network *self,
 						enum ril_network_signal sig)
@@ -448,7 +457,7 @@ static int ril_network_mode_to_rat(struct ril_network *self,
 	case OFONO_RADIO_ACCESS_MODE_ANY:
 	case OFONO_RADIO_ACCESS_MODE_LTE:
 		if (self->settings->techs & OFONO_RADIO_ACCESS_MODE_LTE) {
-			return PREF_NET_TYPE_LTE_GSM_WCDMA;
+			return self->priv->lte_network_mode;
 		}
 		/* no break */
 	default:
@@ -497,37 +506,28 @@ static gboolean ril_network_can_set_pref_mode(struct ril_network *self)
 {
 	struct ril_network_priv *priv = self->priv;

-	return priv->radio->online && ril_sim_card_ready(priv->sim_card);
+	/*
+	 * With some modems an attempt to set rat significantly slows
+	 * down SIM I/O, let's avoid that.
+	 */
+	return priv->radio->online && ril_sim_card_ready(priv->simcard) &&
+				!priv->simcard->sim_io_active &&
+				!priv->timer[TIMER_SET_RAT_HOLDOFF] ;
 }

 static gboolean ril_network_set_rat_holdoff_cb(gpointer user_data)
 {
 	struct ril_network *self = RIL_NETWORK(user_data);
 	struct ril_network_priv *priv = self->priv;
-	const int rat = ril_network_pref_mode_expected(self);

-	DBG_(self, "rat mode %d, expected %d", priv->rat, rat);
 	GASSERT(priv->timer[TIMER_SET_RAT_HOLDOFF]);
 	priv->timer[TIMER_SET_RAT_HOLDOFF] = 0;

-	/*
-	 * Don't retry the request if modem is offline or SIM card isn't
-	 * ready, to avoid spamming system log with error messages. Radio
-	 * and SIM card state change callbacks will schedule a new check
-	 * when it's appropriate.
-	 */
-	if (priv->rat != rat || priv->assert_rat) {
-		if (ril_network_can_set_pref_mode(self)) {
-			ril_network_set_pref_mode(self, rat);
-		} else {
-			DBG_(self, "giving up");
-		}
-	}
-
+	ril_network_check_pref_mode(self, FALSE);
 	return G_SOURCE_REMOVE;
 }

-static void ril_network_set_pref_mode_cb(GRilIoChannel *io, int status,
+static void ril_network_set_rat_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
 	struct ril_network *self = RIL_NETWORK(user_data);
@@ -542,33 +542,53 @@ static void ril_network_set_pref_mode_cb(GRilIoChannel *io, int status,
 	ril_network_query_pref_mode(self);
 }

+static void ril_network_set_rat(struct ril_network *self, int rat)
+{
+	struct ril_network_priv *priv = self->priv;
+
+	if (!priv->set_rat_id && priv->radio->online &&
+		ril_sim_card_ready(priv->simcard) &&
+		/*
+		 * With some modems an attempt to set rat significantly
+		 * slows down SIM I/O, let's avoid that.
+		 */
+		!priv->simcard->sim_io_active &&
+		!priv->timer[TIMER_SET_RAT_HOLDOFF]) {
+		GRilIoRequest *req = grilio_request_sized_new(8);
+
+		DBG_(self, "setting rat mode %d", rat);
+		grilio_request_append_int32(req, 1);   /* count */
+		grilio_request_append_int32(req, rat);
+
+		grilio_request_set_timeout(req, priv->network_mode_timeout);
+		priv->set_rat_id = grilio_queue_send_request_full(priv->q, req,
+					RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE,
+					ril_network_set_rat_cb, NULL, self);
+		grilio_request_unref(req);
+
+		/* We have submitted the request, clear the assertion flag */
+		priv->assert_rat = FALSE;
+
+		/* And don't do it too often */
+		priv->timer[TIMER_SET_RAT_HOLDOFF] =
+			g_timeout_add_seconds(SET_PREF_MODE_HOLDOFF_SEC,
+				ril_network_set_rat_holdoff_cb, self);
+	} else {
+		DBG_(self, "need to set rat mode %d", rat);
+	}
+}
+
 static void ril_network_set_pref_mode(struct ril_network *self, int rat)
 {
 	struct ril_network_priv *priv = self->priv;
-	GRilIoRequest *req = grilio_request_sized_new(8);

-	DBG_(self, "setting rat mode %d", rat);
-	grilio_request_append_int32(req, 1);    /* Number of params */
-	grilio_request_append_int32(req, rat);
-
-	grilio_queue_cancel_request(priv->q, priv->set_rat_id, FALSE);
-	priv->set_rat_id = grilio_queue_send_request_full(priv->q, req,
-				RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE,
-				ril_network_set_pref_mode_cb, NULL, self);
-	grilio_request_unref(req);
-
-	/* We have submitted the request, clear the assertion flag */
-	priv->assert_rat = FALSE;
-
-	/* Don't do it too often */
-	GASSERT(!priv->timer[TIMER_SET_RAT_HOLDOFF]);
-	priv->timer[TIMER_SET_RAT_HOLDOFF] =
-		g_timeout_add_seconds(SET_PREF_MODE_HOLDOFF_SEC,
-			ril_network_set_rat_holdoff_cb, self);
+	if (priv->rat != rat || priv->assert_rat) {
+		ril_network_set_rat(self, rat);
+	}
 }

 static void ril_network_check_pref_mode(struct ril_network *self,
-							gboolean force)
+							gboolean immediate)
 {
 	struct ril_network_priv *priv = self->priv;
 	const int rat = ril_network_pref_mode_expected(self);
@@ -580,10 +600,14 @@ static void ril_network_check_pref_mode(struct ril_network *self,
 		 * ril_network_pref_mode_changed_cb and is meant
 		 * to force radio tech check right now.
 		 */
-		force = TRUE;
+		immediate = TRUE;
 	}

-	if (priv->rat == rat || force) {
+	if (priv->rat != rat) {
+		DBG_(self, "rat mode %d, expected %d", priv->rat, rat);
+	}
+
+	if (immediate) {
 		ril_network_stop_timer(self, TIMER_SET_RAT_HOLDOFF);
 	}

@@ -826,8 +850,9 @@ static void ril_network_sim_status_changed_cb(struct ril_sim_card *sc,

 struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 			const char *log_prefix, struct ril_radio *radio,
-			struct ril_sim_card *sim_card,
-			struct ril_sim_settings *settings)
+			struct ril_sim_card *simcard,
+			struct ril_sim_settings *settings,
+			const struct ril_slot_config *config)
 {
 	struct ril_network *self = g_object_new(RIL_NETWORK_TYPE, NULL);
 	struct ril_network_priv *priv = self->priv;
@@ -836,10 +861,16 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 	priv->io = grilio_channel_ref(io);
 	priv->q = grilio_queue_new(priv->io);
 	priv->radio = ril_radio_ref(radio);
-	priv->sim_card = ril_sim_card_ref(sim_card);
+	priv->simcard = ril_sim_card_ref(simcard);
 	priv->log_prefix = (log_prefix && log_prefix[0]) ?
 		g_strconcat(log_prefix, " ", NULL) : g_strdup("");
 	DBG_(self, "");
+
+	/* Copy relevant config values */
+	priv->lte_network_mode = config->lte_network_mode;
+	priv->network_mode_timeout = config->network_mode_timeout;
+
+	/* Register listeners */
 	priv->unsol_event_id[UNSOL_EVENT_NETWORK_STATE] =
 		grilio_channel_add_unsol_event_handler(priv->io,
 			ril_network_state_changed_cb,
@@ -854,12 +885,15 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 	priv->radio_event_id[RADIO_EVENT_ONLINE_CHANGED] =
 		ril_radio_add_online_changed_handler(priv->radio,
 			ril_network_radio_online_cb, self);
+	priv->simcard_event_id[SIM_EVENT_STATUS_CHANGED] =
+		ril_sim_card_add_status_changed_handler(priv->simcard,
+			ril_network_sim_status_changed_cb, self);
+	priv->simcard_event_id[SIM_EVENT_IO_ACTIVE_CHANGED] =
+		ril_sim_card_add_sim_io_active_changed_handler(priv->simcard,
+			ril_network_sim_status_changed_cb, self);
 	priv->settings_event_id =
 		ril_sim_settings_add_pref_mode_changed_handler(settings,
 			ril_network_pref_mode_changed_cb, self);
-	priv->sim_status_event_id =
-		ril_sim_card_add_status_changed_handler(priv->sim_card,
-			ril_network_sim_status_changed_cb, self);

 	/*
 	 * Query the initial state. Querying network state before the radio
@@ -916,16 +950,13 @@ static void ril_network_finalize(GObject *object)
 	}

 	grilio_queue_cancel_all(priv->q, FALSE);
-	grilio_channel_remove_handlers(priv->io, priv->unsol_event_id,
-					G_N_ELEMENTS(priv->unsol_event_id));
-
+	grilio_channel_remove_all_handlers(priv->io, priv->unsol_event_id);
 	grilio_channel_unref(priv->io);
 	grilio_queue_unref(priv->q);
 	ril_radio_remove_all_handlers(priv->radio, priv->radio_event_id);
 	ril_radio_unref(priv->radio);
-	ril_sim_card_remove_handler(priv->sim_card,
-						priv->sim_status_event_id);
-	ril_sim_card_unref(priv->sim_card);
+	ril_sim_card_remove_all_handlers(priv->simcard, priv->simcard_event_id);
+	ril_sim_card_unref(priv->simcard);
 	ril_sim_settings_remove_handler(self->settings,
 						priv->settings_event_id);
 	ril_sim_settings_unref(self->settings);
--- a/ofono/drivers/ril/ril_network.h
+++ b/ofono/drivers/ril/ril_network.h
@@ -48,7 +48,8 @@ typedef void (*ril_network_cb_t)(struct ril_network *net, void *arg);
 struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
 			const char *log_prefix, struct ril_radio *radio,
 			struct ril_sim_card *sim_card,
-			struct ril_sim_settings *settings);
+			struct ril_sim_settings *settings,
+			const struct ril_slot_config *ril_slot_config);
 struct ril_network *ril_network_ref(struct ril_network *net);
 void ril_network_unref(struct ril_network *net);

--- a/ofono/drivers/ril/ril_plugin.c
+++ b/ofono/drivers/ril/ril_plugin.c
@@ -63,6 +63,8 @@
 #define RILMODEM_DEFAULT_SOCK2      "/dev/socket/rild2"
 #define RILMODEM_DEFAULT_SUB        "SUB1"
 #define RILMODEM_DEFAULT_TECHS      OFONO_RADIO_ACCESS_MODE_ALL
+#define RILMODEM_DEFAULT_LTE_MODE   PREF_NET_TYPE_LTE_GSM_WCDMA
+#define RILMODEM_DEFAULT_NETWORK_MODE_TIMEOUT (20*1000) /* ms */
 #define RILMODEM_DEFAULT_ENABLE_VOICECALL TRUE
 #define RILMODEM_DEFAULT_ENABLE_CBS TRUE
 #define RILMODEM_DEFAULT_SLOT       0xffffffff
@@ -84,38 +86,40 @@
 * modem section (OR in the [Settings] if they apply to all modems) start
 * with lower case.
 */
-#define RILCONF_SETTINGS_EMPTY      "EmptyConfig"
-#define RILCONF_SETTINGS_IDENTITY   "Identity"
-#define RILCONF_SETTINGS_3GHANDOVER "3GLTEHandover"
-#define RILCONF_SETTINGS_SET_RADIO_CAP "SetRadioCapability"
+#define RILCONF_SETTINGS_EMPTY              "EmptyConfig"
+#define RILCONF_SETTINGS_IDENTITY           "Identity"
+#define RILCONF_SETTINGS_3GHANDOVER         "3GLTEHandover"
+#define RILCONF_SETTINGS_SET_RADIO_CAP      "SetRadioCapability"

-#define RILCONF_DEV_PREFIX          "ril_"
-#define RILCONF_PATH_PREFIX         "/" RILCONF_DEV_PREFIX
-#define RILCONF_NAME                "name"
-#define RILCONF_SOCKET              "socket"
-#define RILCONF_SLOT                "slot"
-#define RILCONF_SUB                 "sub"
-#define RILCONF_START_TIMEOUT       "startTimeout"
-#define RILCONF_TIMEOUT             "timeout"
-#define RILCONF_4G                  "enable4G" /* Deprecated */
-#define RILCONF_ENABLE_VOICECALL    "enableVoicecall"
-#define RILCONF_ENABLE_CBS          "enableCellBroadcast"
-#define RILCONF_TECHNOLOGIES        "technologies"
-#define RILCONF_UICC_WORKAROUND     "uiccWorkaround"
-#define RILCONF_ECCLIST_FILE        "ecclistFile"
-#define RILCONF_ALLOW_DATA_REQ      "allowDataReq"
-#define RILCONF_EMPTY_PIN_QUERY     "emptyPinQuery"
-#define RILCONF_DATA_CALL_FORMAT    "dataCallFormat"
-#define RILCONF_VENDOR_DRIVER       "vendorDriver"
-#define RILCONF_DATA_CALL_RETRY_LIMIT "dataCallRetryLimit"
-#define RILCONF_DATA_CALL_RETRY_DELAY "dataCallRetryDelay"
-#define RILCONF_LOCAL_HANGUP_REASONS  "localHangupReasons"
-#define RILCONF_REMOTE_HANGUP_REASONS "remoteHangupReasons"
-#define RILCONF_DEFAULT_LEGACY_IMEI_QUERY "legacyImeiQuery"
+#define RILCONF_DEV_PREFIX                  "ril_"
+#define RILCONF_PATH_PREFIX                 "/" RILCONF_DEV_PREFIX
+#define RILCONF_NAME                        "name"
+#define RILCONF_SOCKET                      "socket"
+#define RILCONF_SLOT                        "slot"
+#define RILCONF_SUB                         "sub"
+#define RILCONF_START_TIMEOUT               "startTimeout"
+#define RILCONF_TIMEOUT                     "timeout"
+#define RILCONF_4G                          "enable4G" /* Deprecated */
+#define RILCONF_ENABLE_VOICECALL            "enableVoicecall"
+#define RILCONF_ENABLE_CBS                  "enableCellBroadcast"
+#define RILCONF_TECHNOLOGIES                "technologies"
+#define RILCONF_LTE_MODE                    "lteNetworkMode"
+#define RILCONF_NETWORK_MODE_TIMEOUT        "networkModeTimeout"
+#define RILCONF_UICC_WORKAROUND             "uiccWorkaround"
+#define RILCONF_ECCLIST_FILE                "ecclistFile"
+#define RILCONF_ALLOW_DATA_REQ              "allowDataReq"
+#define RILCONF_EMPTY_PIN_QUERY             "emptyPinQuery"
+#define RILCONF_DATA_CALL_FORMAT            "dataCallFormat"
+#define RILCONF_VENDOR_DRIVER               "vendorDriver"
+#define RILCONF_DATA_CALL_RETRY_LIMIT       "dataCallRetryLimit"
+#define RILCONF_DATA_CALL_RETRY_DELAY       "dataCallRetryDelay"
+#define RILCONF_LOCAL_HANGUP_REASONS        "localHangupReasons"
+#define RILCONF_REMOTE_HANGUP_REASONS       "remoteHangupReasons"
+#define RILCONF_DEFAULT_LEGACY_IMEI_QUERY   "legacyImeiQuery"

 /* Modem error ids */
-#define RIL_ERROR_ID_RILD_RESTART        "rild-restart"
-#define RIL_ERROR_ID_CAPS_SWITCH_ABORTED "ril-caps-switch-aborted"
+#define RIL_ERROR_ID_RILD_RESTART           "rild-restart"
+#define RIL_ERROR_ID_CAPS_SWITCH_ABORTED    "ril-caps-switch-aborted"

 enum ril_plugin_io_events {
 	IO_EVENT_CONNECTED,
@@ -981,7 +985,8 @@ static void ril_plugin_slot_connected(ril_slot *slot)

 	GASSERT(!slot->network);
 	slot->network = ril_network_new(slot->path, slot->io, log_prefix,
-			slot->radio, slot->sim_card, slot->sim_settings);
+			slot->radio, slot->sim_card, slot->sim_settings, 
+			&slot->config);

 	GASSERT(!slot->vendor_hook);
 	slot->vendor_hook = ril_vendor_create_hook(slot->vendor, slot->io,
@@ -1172,6 +1177,7 @@ static ril_slot *ril_plugin_slot_new_take(char *sockpath, char *path,
 	slot->name = name;
 	config->slot = slot_index;
 	config->techs = RILMODEM_DEFAULT_TECHS;
+	config->lte_network_mode = RILMODEM_DEFAULT_LTE_MODE;
 	config->empty_pin_query = RILMODEM_DEFAULT_EMPTY_PIN_QUERY;
 	config->enable_voicecall = RILMODEM_DEFAULT_ENABLE_VOICECALL;
 	config->enable_cbs = RILMODEM_DEFAULT_ENABLE_CBS;
@@ -1377,6 +1383,20 @@ static ril_slot *ril_plugin_parse_config_group(GKeyFile *file,
 		}
 		g_strfreev(strv);
 	}
+	
+	/* lteNetworkMode */
+	if (ril_config_get_integer(file, group, RILCONF_LTE_MODE,
+					&config->lte_network_mode)) {
+		DBG("%s: " RILCONF_LTE_MODE " %d", group,
+					config->lte_network_mode);
+	}
+
+	/* networkModeTimeout */
+	if (ril_config_get_integer(file, group, RILCONF_NETWORK_MODE_TIMEOUT,
+					&config->network_mode_timeout)) {
+		DBG("%s: " RILCONF_NETWORK_MODE_TIMEOUT " %d", group,
+					config->network_mode_timeout);
+	}

 	/* enable4G (deprecated but still supported) */
 	ival = config->techs;
--- a/ofono/drivers/ril/ril_radio_caps.c
+++ b/ofono/drivers/ril/ril_radio_caps.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2017 Jolla Ltd.
+ *  Copyright (C) 2017-2018 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
@@ -71,6 +71,7 @@ struct ril_radio_caps {
 	gulong max_pref_mode_event_id;
 	gulong radio_event_id;
 	int tx_id;
+	int tx_pending;
 	struct ril_data *data;
 	struct ril_radio *radio;
 	struct ril_network *network;
@@ -85,7 +86,6 @@ typedef struct ril_radio_caps_manager {
 	GObject object;
 	GPtrArray *caps_list;
 	guint check_id;
-	int tx_pending;
 	int tx_id;
 	int tx_phase_index;
 	gboolean tx_failed;
@@ -453,7 +453,7 @@ struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
 		struct ril_radio_caps *self =
 			g_slice_new0(struct ril_radio_caps);

-		self->ref_count = 1;
+		g_atomic_int_set(&self->ref_count, 1);
 		self->slot = config->slot;
 		self->log_prefix = (log_prefix && log_prefix[0]) ?
 			g_strconcat(log_prefix, " ", NULL) : g_strdup("");
@@ -471,13 +471,16 @@ struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
 		self->simcard_event_id[SIM_EVENT_STATE_CHANGED] =
 			ril_sim_card_add_state_changed_handler(sim,
 				ril_radio_caps_simcard_event, self);
+		self->simcard_event_id[SIM_EVENT_IO_ACTIVE_CHANGED] =
+			ril_sim_card_add_sim_io_active_changed_handler(sim,
+				ril_radio_caps_simcard_event, self);

 		self->network = ril_network_ref(net);
 		self->settings_event_id[SETTINGS_EVENT_PREF_MODE] =
 			ril_sim_settings_add_pref_mode_changed_handler(
 				settings, ril_radio_caps_settings_event, self);
 		self->settings_event_id[SETTINGS_EVENT_IMSI] =
-			ril_sim_settings_add_pref_mode_changed_handler(
+			ril_sim_settings_add_imsi_changed_handler(
 				settings, ril_radio_caps_settings_event, self);

 		self->max_pref_mode_event_id =
@@ -560,6 +563,24 @@ static void ril_radio_caps_manager_foreach_tx
 	}
 }

+static gboolean ril_radio_caps_manager_tx_pending
+				(struct ril_radio_caps_manager *self)
+{
+	guint i;
+	const GPtrArray *list = self->caps_list;
+
+	for (i = 0; i < list->len; i++) {
+		const struct ril_radio_caps *caps = list->pdata[i];
+
+		/* Ignore the modems not associated with this transaction */
+		if (caps->tx_id == self->tx_id && caps->tx_pending > 0) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
 /**
 * Checks that all radio caps have been initialized (i.e. all the initial
 * GET_RADIO_CAPABILITY requests have completed) and there's no transaction
@@ -568,7 +589,7 @@ static void ril_radio_caps_manager_foreach_tx
 static gboolean ril_radio_caps_manager_can_check
 				(struct ril_radio_caps_manager *self)
 {
-	if (self->caps_list && !self->tx_pending) {
+	if (self->caps_list && !ril_radio_caps_manager_tx_pending(self)) {
 		const GPtrArray *list = self->caps_list;
 		const struct ril_radio_caps *prev_caps = NULL;
 		gboolean all_modes_equal = TRUE;
@@ -753,6 +774,10 @@ static void ril_radio_caps_manager_issue_requests
 				phase->send_new_cap ? &caps->new_cap :
 							&caps->old_cap;

+			/* Count it */
+			caps->tx_pending++;
+			DBG_(caps, "tx_pending=%d", caps->tx_pending);
+
 			/* Encode and send the request */
 			grilio_request_append_int32(req,
 					RIL_RADIO_CAPABILITY_VERSION);
@@ -766,9 +791,6 @@ static void ril_radio_caps_manager_issue_requests
 					RIL_REQUEST_SET_RADIO_CAPABILITY,
 					handler, NULL, caps);
 			grilio_request_unref(req);
-
-			/* Count it */
-			self->tx_pending++;
 		}
 	}
 }
@@ -791,7 +813,6 @@ static void ril_radio_caps_manager_next_transaction
 {
 	ril_radio_caps_manager_foreach(self,
 				ril_radio_caps_manager_next_transaction_cb);
-	self->tx_pending = 0;
 	self->tx_failed = FALSE;
 	self->tx_phase_index = -1;
 	self->tx_id++;
@@ -829,8 +850,10 @@ static void ril_radio_caps_manager_abort_cb(GRilIoChannel *io,
 	struct ril_radio_caps *caps = user_data;
 	struct ril_radio_caps_manager *self = caps->mgr;

-	GASSERT(self->tx_pending > 0);
-	if (!(--self->tx_pending)) {
+	GASSERT(caps->tx_pending > 0);
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		DBG("transaction aborted");
 		ril_radio_caps_manager_transaction_done(self);
 	}
@@ -875,7 +898,7 @@ static void ril_radio_caps_manager_next_phase_cb(GRilIoChannel *io,
 	struct ril_radio_caps_manager *self = caps->mgr;
 	gboolean ok = FALSE;

-	GASSERT(self->tx_pending > 0);
+	GASSERT(caps->tx_pending > 0);
 	if (ril_status == RIL_E_SUCCESS) {
 		struct ril_radio_capability cap;
 		if (ril_radio_caps_parse(caps->log_prefix, data, len, &cap) &&
@@ -892,7 +915,9 @@ static void ril_radio_caps_manager_next_phase_cb(GRilIoChannel *io,
 		}
 	}

-	if (!(--self->tx_pending)) {
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->tx_failed) {
 			ril_radio_caps_manager_abort_transaction(self);
 		} else {
@@ -907,7 +932,7 @@ static void ril_radio_caps_manager_next_phase
 	/* Note: -1 > 2 if 2 is unsigned (which turns -1 into 4294967295) */
 	const int max_index = G_N_ELEMENTS(ril_radio_caps_tx_phase) - 1;

-	GASSERT(!self->tx_pending);
+	GASSERT(!ril_radio_caps_manager_tx_pending(self));
 	if (self->tx_phase_index >= max_index) {
 		DBG("transaction %d is done", self->tx_id);
 		ril_radio_caps_manager_transaction_done(self);
@@ -924,14 +949,16 @@ static void ril_radio_caps_manager_next_phase
 static void ril_radio_caps_manager_data_off_done(GRilIoChannel *io,
 		int status, const void *req_data, guint len, void *user_data)
 {
-	struct ril_radio_caps_manager *self = RADIO_CAPS_MANAGER(user_data);
+	struct ril_radio_caps *caps = user_data;
+	struct ril_radio_caps_manager *self = caps->mgr;

-	DBG("%d", self->tx_pending);
-	GASSERT(self->tx_pending > 0);
+	GASSERT(caps->tx_pending > 0);
 	if (status != GRILIO_STATUS_OK) {
 		self->tx_failed = TRUE;
 	}
-	if (!(--self->tx_pending)) {
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->tx_failed) {
 			DBG("failed to start the transaction");
 			ril_data_manager_assert_data_on(self->data_manager);
@@ -951,13 +978,13 @@ static void ril_radio_caps_manager_data_off
 {
 	GRilIoRequest *req = ril_request_allow_data_new(FALSE);

-	self->tx_pending++;
-	DBG_(caps, "disallowing data");
+	caps->tx_pending++;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
 	grilio_request_set_timeout(req, DATA_OFF_TIMEOUT_MS);
 	grilio_queue_send_request_full(caps->q, req,
 					RIL_REQUEST_ALLOW_DATA,
 					ril_radio_caps_manager_data_off_done,
-					NULL, self);
+					NULL, caps);
 	grilio_request_unref(req);
 }

@@ -967,14 +994,16 @@ static void ril_radio_caps_manager_deactivate_data_call_done(GRilIoChannel *io,
 	struct ril_radio_caps *caps = user_data;
 	struct ril_radio_caps_manager *self = caps->mgr;

-	GASSERT(self->tx_pending > 0);
+	GASSERT(caps->tx_pending > 0);
 	if (status != GRILIO_STATUS_OK) {
 		self->tx_failed = TRUE;
 		/* Something seems to be slightly broken, try requesting the
 		 * current state (later, after we release the transaction). */
 		ril_data_poll_call_state(caps->data);
 	}
-	if (!(--self->tx_pending)) {
+	caps->tx_pending--;
+	DBG_(caps, "tx_pending=%d", caps->tx_pending);
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->tx_failed) {
 			DBG("failed to start the transaction");
 			ril_radio_caps_manager_recheck_later(self);
@@ -992,8 +1021,8 @@ static void ril_radio_caps_deactivate_data_call(struct ril_radio_caps *caps,
 {
 	GRilIoRequest *req = ril_request_deactivate_data_call_new(cid);

-	caps->mgr->tx_pending++;
-	DBG_(caps, "deactivating call %u", cid);
+	caps->tx_pending++;
+	DBG_(caps, "cid=%u, tx_pending=%d", cid, caps->tx_pending);
 	grilio_request_set_blocking(req, TRUE);
 	grilio_request_set_timeout(req, DEACTIVATE_TIMEOUT_MS);
 	grilio_queue_send_request_full(caps->q, req,
@@ -1028,11 +1057,11 @@ static void ril_radio_caps_manager_deactivate_all
 {
 	ril_radio_caps_manager_foreach_tx(self,
 				ril_radio_caps_manager_deactivate_all_cb);
-	if (!self->tx_pending) {
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		/* No data calls, submit ALLOW_DATA requests right away */
 		ril_radio_caps_manager_foreach_tx(self,
 					ril_radio_caps_manager_data_off);
-		GASSERT(self->tx_pending);
+		GASSERT(ril_radio_caps_manager_tx_pending(self));
 	}
 }

@@ -1321,7 +1350,7 @@ static gboolean ril_radio_caps_manager_check_cb(gpointer data)
 static void ril_radio_caps_manager_recheck_later
 					(struct ril_radio_caps_manager *self)
 {
-	if (!self->tx_pending) {
+	if (!ril_radio_caps_manager_tx_pending(self)) {
 		if (self->check_id) {
 			g_source_remove(self->check_id);
 			self->check_id = 0;
@@ -1334,7 +1363,7 @@ static void ril_radio_caps_manager_recheck_later
 static void ril_radio_caps_manager_schedule_check
 					(struct ril_radio_caps_manager *self)
 {
-	if (!self->check_id && !self->tx_pending) {
+	if (!self->check_id && !ril_radio_caps_manager_tx_pending(self)) {
 		self->check_id = g_idle_add(ril_radio_caps_manager_check_cb,
 									self);
 	}
--- a/ofono/drivers/ril/ril_sim.c
+++ b/ofono/drivers/ril/ril_sim.c
@@ -108,8 +108,9 @@ struct ril_sim_io_response {
 	guint data_len;
 };

-struct ril_sim_cbd {
+struct ril_sim_cbd_io {
 	struct ril_sim *sd;
+	struct ril_sim_card *card;
 	union _ofono_sim_cb {
 		ofono_sim_file_info_cb_t file_info;
 		ofono_sim_read_cb_t read;
@@ -179,24 +180,43 @@ static const struct ril_sim_retry_query ril_sim_retry_query_types[] = {

 #define DBG_(sd,fmt,args...) DBG("%s" fmt, (sd)->log_prefix, ##args)

-#define ril_sim_cbd_free g_free
-
 static inline struct ril_sim *ril_sim_get_data(struct ofono_sim *sim)
 {
 	return ofono_sim_get_data(sim);
 }

-static struct ril_sim_cbd *ril_sim_cbd_new(struct ril_sim *sd, void *cb,
+static struct ril_sim_cbd_io *ril_sim_cbd_io_new(struct ril_sim *sd, void *cb,
 								void *data)
 {
-	struct ril_sim_cbd *cbd = g_new0(struct ril_sim_cbd, 1);
+	struct ril_sim_cbd_io *cbd = g_new0(struct ril_sim_cbd_io, 1);

 	cbd->sd = sd;
 	cbd->cb.ptr = cb;
 	cbd->data = data;
+	cbd->card = ril_sim_card_ref(sd->card);
 	return cbd;
 }

+static void ril_sim_cbd_io_free(void *data)
+{
+
+	struct ril_sim_cbd_io *cbd = data;
+
+	ril_sim_card_sim_io_finished(cbd->card, cbd->req_id);
+	ril_sim_card_unref(cbd->card);
+	g_free(cbd);
+}
+
+static void ril_sim_cbd_io_start(struct ril_sim_cbd_io *cbd, GRilIoRequest* req,
+				guint code, GRilIoChannelResponseFunc cb)
+{
+	struct ril_sim *sd = cbd->sd;
+
+	cbd->req_id = grilio_queue_send_request_full(sd->q, req, code,
+						cb, ril_sim_cbd_io_free, cbd);
+	ril_sim_card_sim_io_started(cbd->card, cbd->req_id);
+}
+
 static void ril_sim_pin_cbd_state_event_count_cb(struct ril_sim_card *sc,
 							void *user_data)
 {
@@ -429,14 +449,13 @@ static void ril_sim_io_response_free(struct ril_sim_io_response *res)
 static void ril_sim_file_info_cb(GRilIoChannel *io, int status,
 			const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_file_info_cb_t cb = cbd->cb.file_info;
 	struct ril_sim *sd = cbd->sd;
 	struct ril_sim_io_response *res = NULL;
 	struct ofono_error error;

 	DBG_(sd, "");
-	ril_sim_card_sim_io_finished(sd->card, cbd->req_id);

 	ril_error_init_failure(&error);
 	res = ril_sim_parse_io_response(data, len);
@@ -480,7 +499,7 @@ static void ril_sim_file_info_cb(GRilIoChannel *io, int status,
 static void ril_sim_request_io(struct ril_sim *sd, guint cmd, int fileid,
 		guint p1, guint p2, guint p3, const char *hex_data,
 		const guchar *path, guint path_len,
-		GRilIoChannelResponseFunc cb, struct ril_sim_cbd *cbd)
+		GRilIoChannelResponseFunc cb, struct ril_sim_cbd_io *cbd)
 {
 	GRilIoRequest *req = grilio_request_new();

@@ -499,9 +518,7 @@ static void ril_sim_request_io(struct ril_sim *sd, guint cmd, int fileid,

 	grilio_request_set_blocking(req, TRUE);
 	grilio_request_set_timeout(req, SIM_IO_TIMEOUT_SECS * 1000);
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req,
-				RIL_REQUEST_SIM_IO, cb, ril_sim_cbd_free, cbd);
-	ril_sim_card_sim_io_started(sd->card, cbd->req_id);
+	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_SIM_IO, cb);
 	grilio_request_unref(req);
 }

@@ -511,19 +528,19 @@ static void ril_sim_ofono_read_file_info(struct ofono_sim *sim, int fileid,
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	ril_sim_request_io(sd, CMD_GET_RESPONSE, fileid, 0, 0, 15, NULL,
-		path, len, ril_sim_file_info_cb, ril_sim_cbd_new(sd, cb, data));
+				path, len, ril_sim_file_info_cb,
+				ril_sim_cbd_io_new(sd, cb, data));
 }

 static void ril_sim_read_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_read_cb_t cb = cbd->cb.read;
 	struct ril_sim_io_response *res;
 	struct ofono_error err;

 	DBG_(cbd->sd, "");
-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);

 	res = ril_sim_parse_io_response(data, len);
 	if (ril_sim_io_response_ok(res) && status == RIL_E_SUCCESS) {
@@ -542,7 +559,7 @@ static void ril_sim_read(struct ofono_sim *sim, guint cmd, int fileid,
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	ril_sim_request_io(sd, cmd, fileid, p1, p2, p3, NULL, path, path_len,
-			ril_sim_read_cb, ril_sim_cbd_new(sd, cb, data));
+			ril_sim_read_cb, ril_sim_cbd_io_new(sd, cb, data));
 }

 static void ril_sim_ofono_read_file_transparent(struct ofono_sim *sim,
@@ -572,13 +589,12 @@ static void ril_sim_ofono_read_file_cyclic(struct ofono_sim *sim, int fileid,
 static void ril_sim_write_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_write_cb_t cb = cbd->cb.write;
 	struct ril_sim_io_response *res;
 	struct ofono_error err;

 	DBG_(cbd->sd, "");
-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);

 	res = ril_sim_parse_io_response(data, len);
 	if (ril_sim_io_response_ok(res) && status == RIL_E_SUCCESS) {
@@ -599,7 +615,7 @@ static void ril_sim_write(struct ofono_sim *sim, guint cmd, int fileid,
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	char *hex_data = encode_hex(value, length, 0);
 	ril_sim_request_io(sd, cmd, fileid, p1, p2, length, hex_data, path,
-		path_len, ril_sim_write_cb, ril_sim_cbd_new(sd, cb, data));
+		path_len, ril_sim_write_cb, ril_sim_cbd_io_new(sd, cb, data));
 	g_free(hex_data);
 }

@@ -636,12 +652,10 @@ static void ril_sim_write_file_cyclic(struct ofono_sim *sim, int fileid,
 static void ril_sim_get_imsi_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_sim_imsi_cb_t cb = cbd->cb.imsi;
 	struct ofono_error error;

-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);
-
 	if (status == RIL_E_SUCCESS) {
 		gchar *imsi;
 		GRilIoParser rilp;
@@ -667,7 +681,7 @@ static void ril_sim_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	const char *app_id = ril_sim_app_id(sd);
-	struct ril_sim_cbd *cbd = ril_sim_cbd_new(sd, cb, data);
+	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
 	GRilIoRequest *req = grilio_request_array_utf8_new(1, app_id);

 	DBG_(sd, "%s", app_id);
@@ -679,10 +693,8 @@ static void ril_sim_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
 	 */
 	grilio_request_set_retry(req, RIL_RETRY_MS, -1);
 	grilio_request_set_blocking(req, TRUE);
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req,
-				RIL_REQUEST_GET_IMSI, ril_sim_get_imsi_cb,
-				ril_sim_cbd_free, cbd);
-	ril_sim_card_sim_io_started(sd->card, cbd->req_id);
+	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_GET_IMSI,
+						ril_sim_get_imsi_cb);
 	grilio_request_unref(req);
 }

@@ -1253,7 +1265,7 @@ static guint ril_perso_change_state(struct ofono_sim *sim,
 	if (req) {
 		id = grilio_queue_send_request_full(sd->q, req, code,
 			ril_sim_pin_change_state_cb, ril_sim_pin_req_done,
-			ril_sim_pin_cbd_new(sd, passwd_type, TRUE, cb, data));
+			ril_sim_pin_cbd_new(sd, passwd_type, FALSE, cb, data));
 		grilio_request_unref(req);
 	}

@@ -1309,7 +1321,7 @@ static void ril_sim_pin_change_state(struct ofono_sim *sim,
 		id = grilio_queue_send_request_full(sd->q, req,
 			RIL_REQUEST_SET_FACILITY_LOCK,
 			ril_sim_pin_change_state_cb, ril_sim_pin_req_done,
-			ril_sim_pin_cbd_new(sd, passwd_type, TRUE, cb, data));
+			ril_sim_pin_cbd_new(sd, passwd_type, FALSE, cb, data));
 		grilio_request_unref(req);
 	}

@@ -1365,11 +1377,9 @@ static void ril_sim_query_facility_lock_cb(GRilIoChannel *io, int status,
 				const void *data, guint len, void *user_data)
 {
 	struct ofono_error error;
-	struct ril_sim_cbd *cbd = user_data;
+	struct ril_sim_cbd_io *cbd = user_data;
 	ofono_query_facility_lock_cb_t cb = cbd->cb.query_facility_lock;

-	ril_sim_card_sim_io_finished(cbd->sd->card, cbd->req_id);
-
 	if (status == RIL_E_SUCCESS) {
 		int locked = 0;
 		GRilIoParser rilp;
@@ -1399,7 +1409,7 @@ static void ril_sim_query_facility_lock(struct ofono_sim *sim,
 {
 	struct ril_sim *sd = ril_sim_get_data(sim);
 	const char *type_str = ril_sim_facility_code(type);
-	struct ril_sim_cbd *cbd = ril_sim_cbd_new(sd, cb, data);
+	struct ril_sim_cbd_io *cbd = ril_sim_cbd_io_new(sd, cb, data);
 	GRilIoRequest *req = grilio_request_array_utf8_new(4,
 			type_str, "", "0" /* class */, ril_sim_app_id(sd));

@@ -1409,10 +1419,8 @@ static void ril_sim_query_facility_lock(struct ofono_sim *sim,
 	grilio_request_set_retry_func(req, ril_sim_query_facility_lock_retry);

 	DBG_(sd, "%s", type_str);
-	cbd->req_id = grilio_queue_send_request_full(sd->q, req,
-		RIL_REQUEST_QUERY_FACILITY_LOCK, ril_sim_query_facility_lock_cb,
-		ril_sim_cbd_free, cbd);
-	ril_sim_card_sim_io_started(sd->card, cbd->req_id);
+	ril_sim_cbd_io_start(cbd, req, RIL_REQUEST_QUERY_FACILITY_LOCK,
+					ril_sim_query_facility_lock_cb);
 	grilio_request_unref(req);
 }

--- a/ofono/drivers/ril/ril_sim_card.h
+++ b/ofono/drivers/ril/ril_sim_card.h
@@ -81,6 +81,9 @@ static inline enum ril_app_type
 ril_sim_card_app_type(struct ril_sim_card *sc)
 	{ return (sc && sc->app) ? sc->app->app_type : RIL_APPTYPE_UNKNOWN; }

+#define ril_sim_card_remove_all_handlers(net, ids) \
+	ril_sim_card_remove_handlers(net, ids, G_N_ELEMENTS(ids))
+
 #endif /* RIL_SIM_CARD_H */

 /*
--- a/ofono/drivers/ril/ril_subscription.conf
+++ b/ofono/drivers/ril/ril_subscription.conf
@@ -209,3 +209,16 @@ socket=/dev/socket/rild
 # Default is false (use RIL_REQUEST_DEVICE_IDENTITY)
 #
 #legacyImeiQuery=false
+
+# Some devices don't support LTE RAT mode PREF_NET_TYPE_LTE_GSM_WCDMA.
+# This option allows to set a custom LTE mode.
+#
+# The default is 9 (PREF_NET_TYPE_LTE_GSM_WCDMA)
+#
+#lteNetworkMode=9
+
+# Timeout for RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, in milliseconds.
+#
+# The default is 20000 (20 seconds)
+#
+#networkModeTimeout=20000
--- a/ofono/drivers/ril/ril_types.h
+++ b/ofono/drivers/ril/ril_types.h
@@ -51,6 +51,8 @@ struct ril_vendor_hook;
 struct ril_slot_config {
 	guint slot;
 	enum ofono_radio_access_mode techs;
+	int lte_network_mode;
+	int network_mode_timeout;
 	gboolean query_available_band_mode;
 	gboolean empty_pin_query;
 	gboolean enable_voicecall;
--- a/ofono/drivers/ril/ril_ussd.c
+++ b/ofono/drivers/ril/ril_ussd.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 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
@@ -20,6 +20,8 @@
 #include "smsutil.h"
 #include "util.h"

+#define USSD_CANCEL_TIMEOUT_SEC (20)
+
 struct ril_ussd {
 	struct ofono_ussd *ussd;
 	GRilIoChannel *io;
@@ -114,11 +116,14 @@ static void ril_ussd_cancel(struct ofono_ussd *ussd,
 				ofono_ussd_cb_t cb, void *data)
 {
 	struct ril_ussd *ud = ril_ussd_get_data(ussd);
+	GRilIoRequest *req = grilio_request_new();

 	ofono_info("send ussd cancel");
-	grilio_queue_send_request_full(ud->q, NULL, RIL_REQUEST_CANCEL_USSD,
+	grilio_request_set_timeout(req, USSD_CANCEL_TIMEOUT_SEC * 1000);
+	grilio_queue_send_request_full(ud->q, req, RIL_REQUEST_CANCEL_USSD,
 				ril_ussd_cancel_cb, ril_ussd_cbd_free,
 				ril_ussd_cbd_new(cb, data));
+	grilio_request_unref(req);
 }

 static void ril_ussd_notify(GRilIoChannel *io, guint code,
--- a/ofono/drivers/ril/ril_vendor_mtk.c
+++ b/ofono/drivers/ril/ril_vendor_mtk.c
@@ -27,6 +27,7 @@
 #include <grilio_queue.h>

 #include <gutil_macros.h>
+#include <gutil_misc.h>

 #include "ofono.h"

@@ -83,6 +84,7 @@ struct ril_vendor_hook_mtk_auto {
 struct ril_mtk_msg {
 	gboolean attach_apn_has_roaming_protocol;
 	guint request_resume_registration;
+	guint request_set_call_indication;

 	/* See ril_vendor_mtk_auto_detect_event */
 #define unsol_msgs unsol_ps_network_state_changed
@@ -97,6 +99,7 @@ struct ril_mtk_msg {
 static const struct ril_mtk_msg msg_mtk1 = {
 	.attach_apn_has_roaming_protocol = TRUE,
 	.request_resume_registration = 2050,
+	.request_set_call_indication = 2065,
 	.unsol_ps_network_state_changed = 3012,
 	.unsol_registration_suspended = 3021,
 	.unsol_incoming_call_indication = 3037,
@@ -106,6 +109,7 @@ static const struct ril_mtk_msg msg_mtk1 = {
 static const struct ril_mtk_msg msg_mtk2 = {
 	.attach_apn_has_roaming_protocol = FALSE,
 	.request_resume_registration = 2065,
+	.request_set_call_indication = 2086,
 	.unsol_ps_network_state_changed = 3015,
 	.unsol_registration_suspended = 3024,
 	.unsol_incoming_call_indication = 3042,
@@ -132,6 +136,8 @@ static const char *ril_vendor_mtk_request_to_string

 	if (request == msg->request_resume_registration) {
 		return "MTK_RESUME_REGISTRATION";
+	} else if (request == msg->request_set_call_indication) {
+		return "MTK_SET_CALL_INDICATION";
 	} else {
 		return NULL;
 	}
@@ -340,12 +346,55 @@ static void ril_vendor_mtk_ps_network_state_changed(GRilIoChannel *io,
 	ril_network_query_registration_state(self->network);
 }

-static void ril_vendor_mtk_call_state_changed(GRilIoChannel *io,
-		guint id, const void *data, guint len, void *user_data)
+static void ril_vendor_mtk_incoming_call_indication(GRilIoChannel *io, guint id,
+				const void *data, guint len, void *user_data)
 {
-	/* Ignore the payload, let ril_voicecall.c do its normal stuff */
-	grilio_channel_inject_unsol_event(io,
-			RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, NULL, 0);
+	struct ril_vendor_hook_mtk *self = user_data;
+	const struct ril_mtk_msg *msg = self->msg;
+	GRilIoRequest* req = NULL;
+
+	GASSERT(id == msg->unsol_incoming_call_indication);
+
+	if (msg->request_set_call_indication) {
+		int nparams, cid, seq;
+		gchar *call_id = NULL, *seq_no = NULL;
+		GRilIoParser rilp;
+
+		grilio_parser_init(&rilp, data, len);
+
+		if (grilio_parser_get_int32(&rilp, &nparams) && nparams >= 5 &&
+			(call_id = grilio_parser_get_utf8(&rilp)) != NULL &&
+			grilio_parser_skip_string(&rilp) /* number */ &&
+			grilio_parser_skip_string(&rilp) /* type */ &&
+			grilio_parser_skip_string(&rilp) /* call_mode */ &&
+			(seq_no = grilio_parser_get_utf8(&rilp)) != NULL &&
+				gutil_parse_int(call_id, 10, &cid) &&
+				gutil_parse_int(seq_no, 10, &seq)) {
+
+			DBG("slot=%u,cid=%d,seq=%d", self->slot, cid, seq);
+			req = grilio_request_new();
+			grilio_request_append_int32(req, 3); /* Param count */
+			/* mode - IMS_ALLOW_INCOMING_CALL_INDICATION: */
+			grilio_request_append_int32(req, 0);
+			grilio_request_append_int32(req, cid);
+			grilio_request_append_int32(req, seq);
+		} else {
+			DBG("failed to parse INCOMING_CALL_INDICATION");
+		}
+
+		g_free(call_id);
+		g_free(seq_no);
+	}
+
+	if (req) {
+		grilio_queue_send_request(self->q, req,
+					msg->request_set_call_indication);
+		grilio_request_unref(req);
+	} else {
+		/* Let ril_voicecall.c know that something happened */
+		grilio_channel_inject_unsol_event(io,
+				RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, NULL, 0);
+	}
 }

 static GRilIoRequest *ril_vendor_mtk_data_call_req
@@ -443,7 +492,7 @@ static void ril_vendor_mtk_hook_subscribe(struct ril_vendor_hook_mtk *self)
 	if (msg->unsol_incoming_call_indication) {
 		self->ril_event_id[MTK_EVENT_INCOMING_CALL_INDICATION] =
 			grilio_channel_add_unsol_event_handler(self->io,
-				ril_vendor_mtk_call_state_changed,
+				ril_vendor_mtk_incoming_call_indication,
 				msg->unsol_incoming_call_indication, self);
 	}
 }
--- a/ofono/drivers/ril/ril_voicecall.c
+++ b/ofono/drivers/ril/ril_voicecall.c
@@ -1,7 +1,7 @@
 /*
 *  oFono - Open Source Telephony - RIL-based devices
 *
- *  Copyright (C) 2015-2017 Jolla Ltd.
+ *  Copyright (C) 2015-2018 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
@@ -587,39 +587,75 @@ static void ril_voicecall_submit_hangup_req(struct ofono_voicecall *vc,
 	grilio_request_unref(ioreq);
 }

-static void ril_voicecall_hangup_all(struct ofono_voicecall *vc,
+static void ril_voicecall_hangup(struct ofono_voicecall *vc,
+			gboolean (*filter)(struct ofono_call *call),
 			ofono_voicecall_cb_t cb, void *data)
 {
 	struct ril_voicecall *vd = ril_voicecall_get_data(vc);
+	struct ril_voicecall_request_data *req = NULL;
+	GSList *l;

-	if (vd->calls) {
-		GSList *l;
-		struct ril_voicecall_request_data *req =
-			ril_voicecall_request_data_new(vc, cb, data);
+	/*
+	 * Here the idea is that we submit (potentially) multiple
+	 * hangup requests to RIL and invoke the callback after
+	 * the last request has completed (pending call count
+	 * becomes zero).
+	 */
+	for (l = vd->calls; l; l = l->next) {
+		struct ofono_call *call = l->data;

-		/*
-		 * Here the idea is that we submit (potentially) multiple
-		 * hangup requests to RIL and invoke the callback after
-		 * the last request has completed (pending call count
-		 * becomes zero).
-		 */
-		for (l = vd->calls; l; l = l->next) {
-			struct ofono_call *call = l->data;
+		if (!filter || filter(call)) {
+			if (!req) {
+				req = ril_voicecall_request_data_new(vc, cb,
+									data);
+			}

 			/* Send request to RIL */
 			DBG("Hanging up call with id %d", call->id);
 			ril_voicecall_submit_hangup_req(vc, call->id, req);
+		} else {
+			DBG("Skipping call with id %d", call->id);
 		}
+	}

-		/* Release our reference */
+	if (req) {
+		/* Release our reference (if any) */
 		ril_voicecall_request_data_unref(req);
 	} else {
-		/* No calls */
+		/* No requests were submitted */
 		struct ofono_error error;
 		cb(ril_error_ok(&error), data);
 	}
 }

+static gboolean ril_voicecall_hangup_active_filter(struct ofono_call *call)
+{
+	switch (call->status) {
+	case CALL_STATUS_ACTIVE:
+	case CALL_STATUS_DIALING:
+	case CALL_STATUS_ALERTING:
+	case CALL_STATUS_INCOMING:
+		return TRUE;
+	case CALL_STATUS_HELD:
+	case CALL_STATUS_WAITING:
+	case CALL_STATUS_DISCONNECTED:
+		break;
+	}
+	return FALSE;
+}
+
+static void ril_voicecall_hangup_active(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	ril_voicecall_hangup(vc, ril_voicecall_hangup_active_filter, cb, data);
+}
+
+static void ril_voicecall_hangup_all(struct ofono_voicecall *vc,
+			ofono_voicecall_cb_t cb, void *data)
+{
+	ril_voicecall_hangup(vc, NULL, cb, data);
+}
+
 static void ril_voicecall_release_specific(struct ofono_voicecall *vc,
 		int id, ofono_voicecall_cb_t cb, void *data)
 {
@@ -811,8 +847,7 @@ static void ril_voicecall_set_udub(struct ofono_voicecall *vc,
 					ofono_voicecall_cb_t cb, void *data)
 {
 	DBG("");
-	ril_voicecall_request(RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND,
-						vc, NULL, cb, data);
+	ril_voicecall_request(RIL_REQUEST_UDUB, vc, NULL, cb, data);
 }

 static void ril_voicecall_enable_supp_svc(struct ril_voicecall *vd)
@@ -946,6 +981,7 @@ const struct ofono_voicecall_driver ril_voicecall_driver = {
 	.remove                 = ril_voicecall_remove,
 	.dial                   = ril_voicecall_dial,
 	.answer                 = ril_voicecall_answer,
+	.hangup_active          = ril_voicecall_hangup_active,
 	.hangup_all             = ril_voicecall_hangup_all,
 	.release_specific       = ril_voicecall_release_specific,
 	.send_tones             = ril_voicecall_send_dtmf,
--- a/ofono/include/gprs-filter.h
+++ b/ofono/include/gprs-filter.h
@@ -22,12 +22,14 @@ extern "C" {

 #include <ofono/types.h>

+struct ofono_gprs;
 struct ofono_gprs_context;
 struct ofono_gprs_primary_context;

 /* If ctx is NULL then activation gets cancelled */
 typedef void (*ofono_gprs_filter_activate_cb_t)
 		(const struct ofono_gprs_primary_context *ctx, void *data);
+typedef void (*ofono_gprs_filter_check_cb_t)(ofono_bool_t allow, void *data);

 #define OFONO_GPRS_FILTER_PRIORITY_LOW     (-100)
 #define OFONO_GPRS_FILTER_PRIORITY_DEFAULT (0)
@@ -38,7 +40,7 @@ typedef void (*ofono_gprs_filter_activate_cb_t)
 * even if struct ofono_gprs_filter gets extended with new callbacks.
 */

-#define OFONO_GPRS_FILTER_API_VERSION      (0)
+#define OFONO_GPRS_FILTER_API_VERSION      (1)

 /*
 * The filter callbacks either invoke the completion callback directly
@@ -59,6 +61,9 @@ struct ofono_gprs_filter {
 				const struct ofono_gprs_primary_context *ctx,
 				ofono_gprs_filter_activate_cb_t cb,
 				void *data);
+	/* API version 1 */
+	unsigned int (*filter_check)(struct ofono_gprs *gprs,
+				ofono_gprs_filter_check_cb_t cb, void *data);
 };

 int ofono_gprs_filter_register(const struct ofono_gprs_filter *filter);
--- a/ofono/include/gprs.h
+++ b/ofono/include/gprs.h
@@ -83,6 +83,8 @@ void ofono_gprs_add_context(struct ofono_gprs *gprs,
 void ofono_gprs_cid_activated(struct ofono_gprs  *gprs, unsigned int cid,
 				const char *apn);

+void ofono_gprs_attached_update(struct ofono_gprs *gprs);
+
 #ifdef __cplusplus
 }
 #endif
--- a/ofono/include/modem.h
+++ b/ofono/include/modem.h
@@ -29,6 +29,7 @@ extern "C" {
 #include <ofono/types.h>

 struct ofono_modem;
+struct ofono_gprs;
 struct ofono_sim;

 enum ofono_modem_type {
@@ -82,6 +83,7 @@ void ofono_modem_remove_interface(struct ofono_modem *modem,

 const char *ofono_modem_get_path(struct ofono_modem *modem);
 struct ofono_sim *ofono_modem_get_sim(struct ofono_modem *modem);
+struct ofono_gprs *ofono_modem_get_gprs(struct ofono_modem *modem);

 void ofono_modem_set_data(struct ofono_modem *modem, void *data);
 void *ofono_modem_get_data(struct ofono_modem *modem);
--- a/ofono/include/types.h
+++ b/ofono/include/types.h
@@ -56,6 +56,7 @@ enum ofono_error_type {
 	OFONO_ERROR_TYPE_CEER,
 	OFONO_ERROR_TYPE_SIM,
 	OFONO_ERROR_TYPE_FAILURE,
+	OFONO_ERROR_TYPE_ERRNO
 };

 enum ofono_disconnect_reason {
@@ -70,16 +71,6 @@ struct ofono_error {
 	int error;
 };

-#define OFONO_EINVAL(error) do {	        \
-	error->type = OFONO_ERROR_TYPE_FAILURE; \
-	error->error = -EINVAL;                 \
-} while (0)
-
-#define OFONO_NO_ERROR(error) do {	         \
-	error->type = OFONO_ERROR_TYPE_NO_ERROR; \
-	error->error = 0;                        \
-} while (0)
-
 #define OFONO_MAX_PHONE_NUMBER_LENGTH 80
 #define OFONO_MAX_CALLER_NAME_LENGTH 80

--- a/ofono/include/voicecall-filter.h
+++ b/ofono/include/voicecall-filter.h
@@ -0,0 +1,127 @@
+/*
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2018 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.
+ */
+
+#ifndef __OFONO_VOICECALL_FILTER_H
+#define __OFONO_VOICECALL_FILTER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ofono/voicecall.h>
+
+/* 27.007 Section 7.6 */
+enum ofono_clip_validity {
+	OFONO_CLIP_VALIDITY_VALID = 0,
+	OFONO_CLIP_VALIDITY_WITHHELD,
+	OFONO_CLIP_VALIDITY_NOT_AVAILABLE
+};
+
+/* 27.007 Section 7.18 */
+enum ofono_call_status {
+	OFONO_CALL_STATUS_ACTIVE = 0,
+	OFONO_CALL_STATUS_HELD,
+	OFONO_CALL_STATUS_DIALING,
+	OFONO_CALL_STATUS_ALERTING,
+	OFONO_CALL_STATUS_INCOMING,
+	OFONO_CALL_STATUS_WAITING,
+	OFONO_CALL_STATUS_DISCONNECTED
+};
+
+/* 27.007 Section 7.18 */
+enum ofono_call_direction {
+	OFONO_CALL_DIRECTION_MOBILE_ORIGINATED = 0,
+	OFONO_CALL_DIRECTION_MOBILE_TERMINATED
+};
+
+/* 27.007 Section 7.30 */
+enum ofono_cnap_validity {
+	OFONO_CNAP_VALIDITY_VALID = 0,
+	OFONO_CNAP_VALIDITY_WITHHELD,
+	OFONO_CNAP_VALIDITY_NOT_AVAILABLE
+};
+
+enum ofono_voicecall_filter_dial_result {
+	OFONO_VOICECALL_FILTER_DIAL_CONTINUE,     /* Run the next filter */
+	OFONO_VOICECALL_FILTER_DIAL_BLOCK         /* Don't dial*/
+};
+
+enum ofono_voicecall_filter_incoming_result {
+	OFONO_VOICECALL_FILTER_INCOMING_CONTINUE, /* Run the next filter */
+	OFONO_VOICECALL_FILTER_INCOMING_HANGUP,   /* Hangup incoming call */
+	OFONO_VOICECALL_FILTER_INCOMING_IGNORE    /* Ignore incoming call */
+};
+
+typedef void (*ofono_voicecall_filter_dial_cb_t)
+			(enum ofono_voicecall_filter_dial_result result,
+				void *data);
+
+typedef void (*ofono_voicecall_filter_incoming_cb_t)
+			(enum ofono_voicecall_filter_incoming_result result,
+				void *data);
+
+#define OFONO_VOICECALL_FILTER_PRIORITY_LOW     (-100)
+#define OFONO_VOICECALL_FILTER_PRIORITY_DEFAULT (0)
+#define OFONO_VOICECALL_FILTER_PRIORITY_HIGH    (100)
+
+/*
+ * The api_version field makes it possible to keep using old plugins
+ * even if struct ofono_voicecall_filter gets extended with new callbacks.
+ */
+
+#define OFONO_VOICECALL_FILTER_API_VERSION      (0)
+
+/*
+ * The filter callbacks either invoke the completion callback directly
+ * or return the id of the cancellable asynchronous operation (but never
+ * both). If non-zero value is returned, the completion callback has to
+ * be invoked later on a fresh stack. Once the asynchronous filtering
+ * operation is cancelled, the associated completion callback must not
+ * be invoked.
+ *
+ * Please avoid making blocking D-Bus calls from the filter callbacks.
+ */
+struct ofono_voicecall_filter {
+	const char *name;
+	int api_version;        /* OFONO_VOICECALL_FILTER_API_VERSION */
+	int priority;
+	void (*filter_cancel)(unsigned int id);
+	unsigned int (*filter_dial)(struct ofono_voicecall *vc,
+				const struct ofono_phone_number *number,
+				enum ofono_clir_option clir,
+				ofono_voicecall_filter_dial_cb_t cb,
+				void *data);
+	unsigned int (*filter_incoming)(struct ofono_voicecall *vc,
+				const struct ofono_call *call,
+				ofono_voicecall_filter_incoming_cb_t cb,
+				void *data);
+};
+
+int ofono_voicecall_filter_register(const struct ofono_voicecall_filter *f);
+void ofono_voicecall_filter_unregister(const struct ofono_voicecall_filter *f);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OFONO_VOICECALL_FILTER_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */
--- a/ofono/include/voicecall.h
+++ b/ofono/include/voicecall.h
@@ -153,6 +153,8 @@ void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,
 */
 void ofono_voicecall_mpty_hint(struct ofono_voicecall *vc, unsigned int ids);

+struct ofono_modem *ofono_voicecall_get_modem(struct ofono_voicecall *vc);
+
 int ofono_voicecall_driver_register(const struct ofono_voicecall_driver *d);
 void ofono_voicecall_driver_unregister(const struct ofono_voicecall_driver *d);

--- a/ofono/src/dbus.c
+++ b/ofono/src/dbus.c
@@ -24,6 +24,7 @@
 #endif

 #include <glib.h>
+#include <errno.h>
 #include <gdbus.h>

 #include "ofono.h"
@@ -37,7 +38,7 @@ struct error_mapping_entry {
 	DBusMessage *(*ofono_error_func)(DBusMessage *);
 };

-struct error_mapping_entry cme_errors_mapping[] = {
+static const struct error_mapping_entry cme_errors_mapping[] = {
 	{ 3,	__ofono_error_not_allowed },
 	{ 4,	__ofono_error_not_supported },
 	{ 16,	__ofono_error_incorrect_password },
@@ -45,6 +46,16 @@ struct error_mapping_entry cme_errors_mapping[] = {
 	{ 31,	__ofono_error_timed_out },
 	{ 32,	__ofono_error_access_denied },
 	{ 50,	__ofono_error_invalid_args },
+	{ }
+};
+
+static const struct error_mapping_entry errno_errors_mapping[] = {
+	{ EACCES,      __ofono_error_access_denied },
+	{ EOPNOTSUPP,  __ofono_error_not_supported },
+	{ ENOSYS,      __ofono_error_not_implemented },
+	{ ETIMEDOUT,   __ofono_error_timed_out },
+	{ EINPROGRESS, __ofono_error_busy },
+	{ }
 };

 static void append_variant(DBusMessageIter *iter,
@@ -419,26 +430,31 @@ DBusMessage *__ofono_error_network_terminated(DBusMessage *msg)
 					" network");
 }

+static DBusMessage *__ofono_map_error(const struct error_mapping_entry *map,
+						int error, DBusMessage *msg)
+{
+	const struct error_mapping_entry *e;
+
+	for (e = map; e->ofono_error_func; e++)
+		if (e->error == error)
+			return e->ofono_error_func(msg);
+
+	return __ofono_error_failed(msg);
+}
+
 DBusMessage *__ofono_error_from_error(const struct ofono_error *error,
 						DBusMessage *msg)
 {
-	struct error_mapping_entry *e;
-	int maxentries;
-	int i;
-
 	switch (error->type) {
 	case OFONO_ERROR_TYPE_CME:
-		e = cme_errors_mapping;
-		maxentries = sizeof(cme_errors_mapping) /
-					sizeof(struct error_mapping_entry);
-		for (i = 0; i < maxentries; i++)
-			if (e[i].error == error->error)
-				return e[i].ofono_error_func(msg);
-		break;
+		return __ofono_map_error(cme_errors_mapping, error->error, msg);
 	case OFONO_ERROR_TYPE_CMS:
 		return __ofono_error_failed(msg);
 	case OFONO_ERROR_TYPE_CEER:
 		return __ofono_error_failed(msg);
+	case OFONO_ERROR_TYPE_ERRNO:
+		return __ofono_map_error(errno_errors_mapping,
+						ABS(error->error), msg);
 	default:
 		return __ofono_error_failed(msg);
 	}
--- a/ofono/src/emulator.c
+++ b/ofono/src/emulator.c
@@ -1347,6 +1347,7 @@ void ofono_emulator_send_final(struct ofono_emulator *em,
 	case OFONO_ERROR_TYPE_CEER:
 	case OFONO_ERROR_TYPE_SIM:
 	case OFONO_ERROR_TYPE_FAILURE:
+	case OFONO_ERROR_TYPE_ERRNO:
 failure:
 		g_at_server_send_final(em->server, G_AT_SERVER_RESULT_ERROR);
 		break;
--- a/ofono/src/gprs-filter.c
+++ b/ofono/src/gprs-filter.c
@@ -18,57 +18,65 @@
 #include <errno.h>
 #include <string.h>

+struct gprs_filter_request;
+struct gprs_filter_request_fn {
+	const char *name;
+	gboolean (*can_process)(const struct ofono_gprs_filter *filter);
+	guint (*process)(const struct ofono_gprs_filter *filter,
+					struct gprs_filter_request *req);
+	void (*complete)(struct gprs_filter_request *req, gboolean allow);
+	void (*free)(struct gprs_filter_request *req);
+};
+
 struct gprs_filter_request {
+	int refcount;
 	struct gprs_filter_chain *chain;
+	struct ofono_gprs_context *gc;
+	const struct gprs_filter_request_fn *fn;
 	GSList *filter_link;
 	guint pending_id;
 	guint next_id;
-	struct ofono_gprs_primary_context ctx;
-	gprs_filter_activate_cb_t act;
 	ofono_destroy_func destroy;
 	void* user_data;
 };

-/* There's no need to support more than one request at a time */
+struct gprs_filter_request_activate {
+	struct gprs_filter_request req;
+	struct ofono_gprs_primary_context ctx;
+	gprs_filter_activate_cb_t cb;
+};
+
+struct gprs_filter_request_check {
+	struct gprs_filter_request req;
+	ofono_gprs_filter_check_cb_t cb;
+};

 struct gprs_filter_chain {
-	struct ofono_gprs_context *gc;
-	struct gprs_filter_request *req;
+	struct ofono_gprs *gprs;
+	GSList *req_list;
 };

 static GSList *gprs_filter_list = NULL;

-static void gprs_filter_request_process(struct gprs_filter_request *req);
-
-static void gprs_filter_copy_context(struct ofono_gprs_primary_context *dest,
-				const struct ofono_gprs_primary_context *src)
+static void gprs_filter_request_init(struct gprs_filter_request *req,
+		const struct gprs_filter_request_fn *fn,
+		struct gprs_filter_chain *chain, struct ofono_gprs_context *gc,
+		ofono_destroy_func destroy, void *user_data)
 {
-	dest->cid = src->cid;
-	dest->proto = src->proto;
-	dest->auth_method = src->auth_method;
-	strncpy(dest->apn, src->apn, OFONO_GPRS_MAX_APN_LENGTH);
-	strncpy(dest->username, src->username, OFONO_GPRS_MAX_USERNAME_LENGTH);
-	strncpy(dest->password, src->password, OFONO_GPRS_MAX_PASSWORD_LENGTH);
-	dest->apn[OFONO_GPRS_MAX_APN_LENGTH] = 0;
-	dest->username[OFONO_GPRS_MAX_USERNAME_LENGTH] = 0;
-	dest->password[OFONO_GPRS_MAX_PASSWORD_LENGTH] = 0;
-}
-
-static struct gprs_filter_request *gprs_filter_request_new
-	(struct gprs_filter_chain *chain,
-		const struct ofono_gprs_primary_context *ctx,
-				gprs_filter_activate_cb_t act,
-				ofono_destroy_func destroy, void *user_data)
-{
-	struct gprs_filter_request *req = g_new0(struct gprs_filter_request, 1);
-
 	req->chain = chain;
+	req->fn = fn;
+	req->gc = gc;
 	req->filter_link = gprs_filter_list;
-	gprs_filter_copy_context(&req->ctx, ctx);
-	req->act = act;
 	req->destroy = destroy;
 	req->user_data = user_data;
-	return req;
+
+	/*
+	 * The list holds an implicit reference to the message. The reference
+	 * is released by gprs_filter_request_free when the message is removed
+	 * from the list.
+	 */
+	req->refcount = 1;
+	chain->req_list = g_slist_append(chain->req_list, req);
 }

 static void gprs_filter_request_cancel(struct gprs_filter_request *req)
@@ -89,21 +97,94 @@ static void gprs_filter_request_cancel(struct gprs_filter_request *req)
 	}
 }

+static void gprs_filter_request_dispose(struct gprs_filter_request *req)
+{
+	/* May be invoked several times per request */
+	if (req->destroy) {
+		ofono_destroy_func destroy = req->destroy;
+
+		req->destroy = NULL;
+		destroy(req->user_data);
+	}
+}
+
 static void gprs_filter_request_free(struct gprs_filter_request *req)
 {
-	if (req->destroy) {
-		req->destroy(req->user_data);
+	gprs_filter_request_dispose(req);
+	req->fn->free(req);
+}
+
+#define gprs_filter_request_ref(req) ((req)->refcount++, req)
+
+static int gprs_filter_request_unref(struct gprs_filter_request *req)
+{
+	const int refcount = --(req->refcount);
+
+	if (!refcount) {
+		gprs_filter_request_free(req);
+	}
+	return refcount;
+}
+
+static void gprs_filter_request_free1(gpointer data)
+{
+	struct gprs_filter_request *req = data;
+
+	/*
+	 * This is a g_slist_free_full() callback for use by
+	 * __ofono_gprs_filter_chain_free(), meaning that the
+	 * chain is no more. Zero the pointer to it in case if
+	 * this is not the last reference.
+	 */
+	req->chain = NULL;
+	gprs_filter_request_unref(req);
+}
+
+static void gprs_filter_request_dequeue(struct gprs_filter_request *req)
+{
+	struct gprs_filter_chain *chain = req->chain;
+	GSList *l;
+
+	/*
+	 * Single-linked list is not particularly good at searching
+	 * and removing the elements but since it should be pretty
+	 * short (typically just one request), it's not worth optimization.
+	 */
+	if (chain && (l = g_slist_find(chain->req_list, req)) != NULL) {
+		gprs_filter_request_free1(l->data);
+		chain->req_list = g_slist_delete_link(chain->req_list, l);
 	}
-	g_free(req);
 }

 static void gprs_filter_request_complete(struct gprs_filter_request *req,
 							gboolean allow)
 {
-	req->chain->req = NULL;
-	gprs_filter_request_cancel(req);
-	req->act(allow ? &req->ctx : NULL, req->user_data);
-	gprs_filter_request_free(req);
+	gprs_filter_request_ref(req);
+	req->fn->complete(req, allow);
+	gprs_filter_request_dispose(req);
+	gprs_filter_request_dequeue(req);
+	gprs_filter_request_unref(req);
+}
+
+static void gprs_filter_request_process(struct gprs_filter_request *req)
+{
+	GSList *l = req->filter_link;
+	const struct ofono_gprs_filter *f = l->data;
+	const struct gprs_filter_request_fn *fn = req->fn;
+
+	while (f && !fn->can_process(f)) {
+		l = l->next;
+		f = l ? l->data : NULL;
+	}
+
+	gprs_filter_request_ref(req);
+	if (f) {
+		req->filter_link = l;
+		req->pending_id = fn->process(f, req);
+	} else {
+		gprs_filter_request_complete(req, TRUE);
+	}
+	gprs_filter_request_unref(req);
 }

 static void gprs_filter_request_next(struct gprs_filter_request *req,
@@ -113,7 +194,7 @@ static void gprs_filter_request_next(struct gprs_filter_request *req,
 	req->next_id = g_idle_add(fn, req);
 }

-static gboolean gprs_filter_continue_cb(gpointer data)
+static gboolean gprs_filter_request_continue_cb(gpointer data)
 {
 	struct gprs_filter_request *req = data;

@@ -127,7 +208,7 @@ static gboolean gprs_filter_continue_cb(gpointer data)
 	return G_SOURCE_REMOVE;
 }

-static gboolean gprs_filter_cancel_cb(gpointer data)
+static gboolean gprs_filter_request_disallow_cb(gpointer data)
 {
 	struct gprs_filter_request *req = data;

@@ -136,91 +217,185 @@ static gboolean gprs_filter_cancel_cb(gpointer data)
 	return G_SOURCE_REMOVE;
 }

-static void gprs_filter_activate_cb
+/*==========================================================================*
+ * gprs_filter_request_activate
+ *==========================================================================*/
+
+static void gprs_filter_copy_context(struct ofono_gprs_primary_context *dest,
+				const struct ofono_gprs_primary_context *src)
+{
+	dest->cid = src->cid;
+	dest->proto = src->proto;
+	dest->auth_method = src->auth_method;
+	strncpy(dest->apn, src->apn, OFONO_GPRS_MAX_APN_LENGTH);
+	strncpy(dest->username, src->username, OFONO_GPRS_MAX_USERNAME_LENGTH);
+	strncpy(dest->password, src->password, OFONO_GPRS_MAX_PASSWORD_LENGTH);
+	dest->apn[OFONO_GPRS_MAX_APN_LENGTH] = 0;
+	dest->username[OFONO_GPRS_MAX_USERNAME_LENGTH] = 0;
+	dest->password[OFONO_GPRS_MAX_PASSWORD_LENGTH] = 0;
+}
+
+static struct gprs_filter_request_activate *gprs_filter_request_activate_cast
+					(struct gprs_filter_request *req)
+{
+	return (struct gprs_filter_request_activate *)req;
+}
+
+static gboolean gprs_filter_request_activate_can_process
+					(const struct ofono_gprs_filter *f)
+{
+	return f->filter_activate != NULL;
+}
+
+static void gprs_filter_request_activate_cb
 		(const struct ofono_gprs_primary_context *ctx, void *data)
 {
-	struct gprs_filter_request *req = data;
+	struct gprs_filter_request_activate *act = data;
+	struct gprs_filter_request *req = &act->req;
 	const struct ofono_gprs_filter *filter = req->filter_link->data;

 	if (ctx) {
-		if (ctx != &req->ctx) {
+		if (ctx != &act->ctx) {
 			/* The filter may have updated context settings */
-			gprs_filter_copy_context(&req->ctx, ctx);
+			gprs_filter_copy_context(&act->ctx, ctx);
 		}
-		gprs_filter_request_next(req, gprs_filter_continue_cb);
+		gprs_filter_request_next(req, gprs_filter_request_continue_cb);
 	} else {
 		DBG("%s not allowing to activate mobile data", filter->name);
-		gprs_filter_request_next(req, gprs_filter_cancel_cb);
+		gprs_filter_request_next(req, gprs_filter_request_disallow_cb);
 	}
 }

-static void gprs_filter_request_process(struct gprs_filter_request *req)
+static guint gprs_filter_request_activate_process
+				(const struct ofono_gprs_filter *f,
+					struct gprs_filter_request *req)
 {
-	GSList *l = req->filter_link;
-	const struct ofono_gprs_filter *f = l->data;
+	struct gprs_filter_request_activate *act =
+		gprs_filter_request_activate_cast(req);

-	while (f && !f->filter_activate) {
-		l = l->next;
-		f = l ? l->data : NULL;
-	}
-
-	if (f) {
-		guint id;
-
-		req->filter_link = l;
-		id = f->filter_activate(req->chain->gc, &req->ctx,
-						gprs_filter_activate_cb, req);
-		if (id) {
-			/*
-			 * If f->filter_activate returns zero, the request
-			 * may have already been deallocated. It's only
-			 * guaranteed to be alive if f->filter_activate
-			 * returns non-zero id.
-			 */
-			req->pending_id = id;
-		}
-	} else {
-		gprs_filter_request_complete(req, TRUE);
-	}
+	return f->filter_activate(req->gc, &act->ctx,
+				gprs_filter_request_activate_cb, act);
 }

-void __ofono_gprs_filter_chain_activate(struct gprs_filter_chain *chain,
+static void gprs_filter_request_activate_complete
+			(struct gprs_filter_request *req, gboolean allow)
+{
+	struct gprs_filter_request_activate *act =
+		gprs_filter_request_activate_cast(req);
+
+	act->cb(allow ? &act->ctx : NULL, req->user_data);
+}
+
+static void gprs_filter_request_activate_free(struct gprs_filter_request *req)
+{
+	g_slice_free1(sizeof(struct gprs_filter_request_activate), req);
+}
+
+static struct gprs_filter_request *gprs_filter_request_activate_new
+	(struct gprs_filter_chain *chain, struct ofono_gprs_context *gc,
 		const struct ofono_gprs_primary_context *ctx,
-		gprs_filter_activate_cb_t act, ofono_destroy_func destroy,
-		void *user_data)
+		gprs_filter_activate_cb_t cb, ofono_destroy_func destroy,
+		void *data)
 {
-	if (chain && gprs_filter_list && ctx && act) {
-		if (!chain->req) {
-			chain->req = gprs_filter_request_new(chain, ctx,
-						act, destroy, user_data);
-			gprs_filter_request_process(chain->req);
-			return;
-		} else {
-			/*
-			 * This shouldn't be happening - ofono core
-			 * makes sure that the next context activation
-			 * request is not submitted until the previous
-			 * has completed.
-			 */
-			ctx = NULL;
-		}
-	}
-	if (act) {
-		act(ctx, user_data);
-	}
-	if (destroy) {
-		destroy(user_data);
+	static const struct gprs_filter_request_fn activate_fn = {
+		.name = "activate",
+		.can_process = gprs_filter_request_activate_can_process,
+		.process = gprs_filter_request_activate_process,
+		.complete = gprs_filter_request_activate_complete,
+		.free = gprs_filter_request_activate_free
+	};
+
+	struct gprs_filter_request_activate *act =
+		g_slice_new0(struct gprs_filter_request_activate);
+	struct gprs_filter_request *req = &act->req;
+
+	gprs_filter_request_init(req, &activate_fn, chain, gc, destroy, data);
+	gprs_filter_copy_context(&act->ctx, ctx);
+	act->cb = cb;
+	return req;
+}
+
+/*==========================================================================*
+ * gprs_filter_request_check
+ *==========================================================================*/
+
+static struct gprs_filter_request_check *gprs_filter_request_check_cast
+					(struct gprs_filter_request *req)
+{
+	return (struct gprs_filter_request_check *)req;
+}
+
+static gboolean gprs_filter_request_check_can_process
+					(const struct ofono_gprs_filter *f)
+{
+	return f->api_version >= 1 && f->filter_check != NULL;
+}
+
+static void gprs_filter_request_check_cb(ofono_bool_t allow, void *data)
+{
+	struct gprs_filter_request_check *check = data;
+	struct gprs_filter_request *req = &check->req;
+	const struct ofono_gprs_filter *filter = req->filter_link->data;
+
+	if (allow) {
+		gprs_filter_request_next(req, gprs_filter_request_continue_cb);
+	} else {
+		DBG("%s not allowing mobile data", filter->name);
+		gprs_filter_request_next(req, gprs_filter_request_disallow_cb);
 	}
 }

-struct gprs_filter_chain *__ofono_gprs_filter_chain_new
-					(struct ofono_gprs_context *gc)
+static guint gprs_filter_request_check_process
+				(const struct ofono_gprs_filter *f,
+					struct gprs_filter_request *req)
+{
+	return f->filter_check(req->chain->gprs, gprs_filter_request_check_cb,
+					gprs_filter_request_check_cast(req));
+}
+
+static void gprs_filter_request_check_complete
+			(struct gprs_filter_request *req, gboolean allow)
+{
+	gprs_filter_request_check_cast(req)->cb(allow, req->user_data);
+}
+
+static void gprs_filter_request_check_free(struct gprs_filter_request *req)
+{
+	g_slice_free1(sizeof(struct gprs_filter_request_check), req);
+}
+
+static struct gprs_filter_request *gprs_filter_request_check_new
+	(struct gprs_filter_chain *chain, gprs_filter_check_cb_t cb,
+				ofono_destroy_func destroy, void *data)
+{
+	static const struct gprs_filter_request_fn check_fn = {
+		.name = "check",
+		.can_process = gprs_filter_request_check_can_process,
+		.process = gprs_filter_request_check_process,
+		.complete = gprs_filter_request_check_complete,
+		.free = gprs_filter_request_check_free
+	};
+
+	struct gprs_filter_request_check *check =
+		g_slice_new0(struct gprs_filter_request_check);
+	struct gprs_filter_request *req = &check->req;
+
+	gprs_filter_request_init(req, &check_fn, chain, NULL, destroy, data);
+	check->cb = cb;
+	return req;
+}
+
+/*==========================================================================*
+ * gprs_filter_chain
+ *==========================================================================*/
+
+struct gprs_filter_chain *__ofono_gprs_filter_chain_new(struct ofono_gprs *gp)
 {
 	struct gprs_filter_chain *chain = NULL;

-	if (gc) {
+	if (gp) {
 		chain = g_new0(struct gprs_filter_chain, 1);
-		chain->gc = gc;
+		chain->gprs = gp;
 	}
 	return chain;
 }
@@ -228,22 +403,100 @@ struct gprs_filter_chain *__ofono_gprs_filter_chain_new
 void __ofono_gprs_filter_chain_free(struct gprs_filter_chain *chain)
 {
 	if (chain) {
-		if (chain->req) {
-			gprs_filter_request_complete(chain->req, TRUE);
-		}
+		__ofono_gprs_filter_chain_cancel(chain, NULL);
 		g_free(chain);
 	}
 }

-void __ofono_gprs_filter_chain_cancel(struct gprs_filter_chain *chain)
+void __ofono_gprs_filter_chain_cancel(struct gprs_filter_chain *chain,
+					struct ofono_gprs_context *gc)
 {
-	if (chain && chain->req) {
-		gprs_filter_request_cancel(chain->req);
-		gprs_filter_request_free(chain->req);
-		chain->req = NULL;
+	if (chain) {
+		GSList *l, *canceled;
+
+		/* Move canceled requests to a separate list */
+		if (gc) {
+			GSList *prev = NULL;
+
+			canceled = NULL;
+			l = chain->req_list;
+			while (l) {
+				GSList *next = l->next;
+				struct gprs_filter_request *req = l->data;
+
+				if (req->gc == gc) {
+					/* This one will get canceled */
+					l->next = canceled;
+					canceled = l;
+					if (prev) {
+						prev->next = next;
+					} else {
+						chain->req_list = next;
+					}
+				} else {
+					/* This one survives */
+					prev = l;
+				}
+				l = next;
+			}
+		} else {
+			/* Everything is getting canceled */
+			canceled = chain->req_list;
+			chain->req_list = NULL;
+		}
+
+		/* Actually cancel each request */
+		for (l = canceled; l; l = l->next) {
+			gprs_filter_request_cancel(l->data);
+		}
+
+		/* And deallocate them */
+		g_slist_free_full(canceled, gprs_filter_request_free1);
 	}
 }

+void __ofono_gprs_filter_chain_activate(struct gprs_filter_chain *chain,
+		struct ofono_gprs_context *gc,
+		const struct ofono_gprs_primary_context *ctx,
+		gprs_filter_activate_cb_t cb, ofono_destroy_func destroy,
+		void *user_data)
+{
+	if (chain && gprs_filter_list && ctx && cb) {
+		gprs_filter_request_process
+			(gprs_filter_request_activate_new(chain, gc, ctx,
+						cb, destroy, user_data));
+	} else {
+		if (cb) {
+			cb(ctx, user_data);
+		}
+		if (destroy) {
+			destroy(user_data);
+		}
+	}
+}
+
+void __ofono_gprs_filter_chain_check(struct gprs_filter_chain *chain,
+		gprs_filter_check_cb_t cb, ofono_destroy_func destroy,
+		void *user_data)
+{
+	if (chain && gprs_filter_list && cb) {
+		gprs_filter_request_process
+			(gprs_filter_request_check_new(chain, cb, destroy,
+								user_data));
+	} else {
+		if (cb) {
+			cb(TRUE, user_data);
+		}
+		if (destroy) {
+			destroy(user_data);
+		}
+	}
+}
+
+/*==========================================================================*
+ * ofono_gprs_filter
+ *==========================================================================*/
+
 /**
 * Returns 0 if both are equal;
 * <0 if a comes before b;
--- a/ofono/src/gprs.c
+++ b/ofono/src/gprs.c
@@ -85,6 +85,7 @@ struct ofono_gprs {
 	void *driver_data;
 	struct ofono_atom *atom;
 	unsigned int spn_watch;
+	struct gprs_filter_chain *filters;
 };

 struct ipv4_settings {
@@ -117,7 +118,6 @@ struct ofono_gprs_context {
 	void *driver_data;
 	struct context_settings *settings;
 	struct ofono_atom *atom;
-	struct gprs_filter_chain *filters;
 };

 struct pri_context {
@@ -137,7 +137,13 @@ struct pri_context {
 	struct ofono_gprs *gprs;
 };

-static void gprs_attached_update(struct ofono_gprs *gprs);
+/*
+ * In Sailfish OS fork gprs_attached_update() is exported to plugins
+ * as ofono_gprs_attached_update(). Exported functions must start
+ * with ofono_ prefix.
+ */
+#define gprs_attached_update(gprs) ofono_gprs_attached_update(gprs)
+
 static void gprs_netreg_update(struct ofono_gprs *gprs);
 static void gprs_deactivate_next(struct ofono_gprs *gprs);
 static void write_context_settings(struct ofono_gprs *gprs,
@@ -369,7 +375,9 @@ static void release_context(struct pri_context *ctx)
 	if (ctx == NULL || ctx->gprs == NULL || ctx->context_driver == NULL)
 		return;

-	__ofono_gprs_filter_chain_cancel(ctx->context_driver->filters);
+	__ofono_gprs_filter_chain_cancel(ctx->gprs->filters,
+						ctx->context_driver);
+
 	gprs_cid_release(ctx->gprs, ctx->context.cid);
 	ctx->context.cid = 0;
 	ctx->context_driver->inuse = FALSE;
@@ -1049,16 +1057,17 @@ static DBusMessage *pri_provision_context(DBusConnection *conn,
 	for (i = 0; i < count; i++) {
 		const struct ofono_gprs_provision_data *ap = settings + i;
 		if (ap->type == ctx->type && ap_valid(ap)) {
-			if ((!ctx->active &&
-				!ctx->pending && !ctx->gprs->pending) ||
-					!pri_deactivation_required(ctx, ap)) {
+			if (ctx->pending || ctx->gprs->pending) {
+				/* Context is being messed with */
+				reply = __ofono_error_busy(msg);
+			} else if (ctx->active &&
+					pri_deactivation_required(ctx, ap)) {
+				/* Context needs to be deactivated first */
+				reply = __ofono_error_busy(msg);
+			} else {
 				/* Re-provision the context */
 				pri_reset_context_properties(ctx, ap);
 				reply =  dbus_message_new_method_return(msg);
-			} else {
-				/* Context should be inactive */
-				if (ctx->gprs->pending || ctx->pending)
-					reply = __ofono_error_busy(msg);
 			}
 			break;
 		}
@@ -1548,11 +1557,40 @@ static DBusMessage *pri_set_auth_method(struct pri_context *ctx,
 	return NULL;
 }

-static void gprs_context_activate(const struct ofono_gprs_primary_context *ctx,
-								void *data)
-{
-	struct pri_context *pri = data;
+struct pri_request_data {
+	struct pri_context *pri;
+	DBusMessage *msg;
+};

+static struct pri_request_data *pri_request_new(struct pri_context *pri)
+{
+	struct pri_request_data *data = g_new0(struct pri_request_data, 1);
+
+	data->pri = pri;
+	data->msg = pri->pending;
+	return data;
+}
+
+static void pri_request_free(void *user_data)
+{
+	struct pri_request_data *data = user_data;
+	struct pri_context *pri = data->pri;
+
+	if (pri->pending && pri->pending == data->msg) {
+		__ofono_dbus_pending_reply(&pri->pending,
+				__ofono_error_canceled(pri->pending));
+	}
+
+	g_free(data);
+}
+
+static void pri_activate_filt(const struct ofono_gprs_primary_context *ctx,
+							void *user_data)
+{
+	struct pri_request_data *data = user_data;
+	struct pri_context *pri = data->pri;
+
+	data->msg = NULL;
 	if (ctx) {
 		struct ofono_gprs_context *gc = pri->context_driver;

@@ -1619,9 +1657,9 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
 		ctx->pending = dbus_message_ref(msg);

 		if (value)
-			__ofono_gprs_filter_chain_activate(gc->filters,
-					&ctx->context, gprs_context_activate,
-					NULL, ctx);
+			__ofono_gprs_filter_chain_activate(gc->gprs->filters,
+				gc, &ctx->context, pri_activate_filt,
+				pri_request_free, pri_request_new(ctx));
 		else
 			gc->driver->deactivate_primary(gc, ctx->context.cid,
 						pri_deactivate_callback, ctx);
@@ -1905,14 +1943,8 @@ static void release_active_contexts(struct ofono_gprs *gprs)
 	}
 }

-static void gprs_attached_update(struct ofono_gprs *gprs)
+static void gprs_set_attached(struct ofono_gprs *gprs, ofono_bool_t attached)
 {
-	ofono_bool_t attached;
-
-	attached = gprs->driver_attached &&
-		(gprs->status == NETWORK_REGISTRATION_STATUS_REGISTERED ||
-			gprs->status == NETWORK_REGISTRATION_STATUS_ROAMING);
-
 	if (attached == gprs->attached)
 		return;

@@ -1939,6 +1971,32 @@ static void gprs_attached_update(struct ofono_gprs *gprs)
 	gprs_set_attached_property(gprs, attached);
 }

+static void gprs_attached_check_cb(ofono_bool_t allow, void *user_data)
+{
+	gprs_set_attached((struct ofono_gprs *)user_data, allow);
+}
+
+void gprs_attached_update(struct ofono_gprs *gprs)
+{
+	ofono_bool_t attached = gprs->driver_attached &&
+		(gprs->status == NETWORK_REGISTRATION_STATUS_REGISTERED ||
+			gprs->status == NETWORK_REGISTRATION_STATUS_ROAMING);
+
+	if (!attached) {
+		/* Cancel all other checks - nothing is allowed if we are
+		 * not attached */
+		__ofono_gprs_filter_chain_cancel(gprs->filters, NULL);
+
+		/* We are done synchronously */
+		gprs_set_attached(gprs, FALSE);
+	} else {
+		/* This implicitely cancels the previous check if it's still
+		 * running, so that we never have two simultanous checks. */
+		__ofono_gprs_filter_chain_check(gprs->filters,
+					gprs_attached_check_cb, NULL, gprs);
+	}
+}
+
 static void registration_status_cb(const struct ofono_error *error,
 					int status, void *data)
 {
@@ -3094,7 +3152,9 @@ static void gprs_context_remove(struct ofono_atom *atom)
 	if (gc->driver && gc->driver->remove)
 		gc->driver->remove(gc);

-	__ofono_gprs_filter_chain_free(gc->filters);
+	if (gc->gprs)
+		__ofono_gprs_filter_chain_cancel(gc->gprs->filters, gc);
+
 	g_free(gc);
 }

@@ -3126,7 +3186,6 @@ struct ofono_gprs_context *ofono_gprs_context_create(struct ofono_modem *modem,
 		if (drv->probe(gc, vendor, data) < 0)
 			continue;

-		gc->filters = __ofono_gprs_filter_chain_new(gc);
 		gc->driver = drv;
 		break;
 	}
@@ -3411,6 +3470,7 @@ static void gprs_remove(struct ofono_atom *atom)
 	if (gprs->driver && gprs->driver->remove)
 		gprs->driver->remove(gprs);

+	__ofono_gprs_filter_chain_free(gprs->filters);
 	g_free(gprs);
 }

@@ -3447,6 +3507,7 @@ struct ofono_gprs *ofono_gprs_create(struct ofono_modem *modem,
 	gprs->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
 	gprs->netreg_status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
 	gprs->pid_map = idmap_new(MAX_CONTEXTS);
+	gprs->filters = __ofono_gprs_filter_chain_new(gprs);

 	return gprs;
 }
--- a/ofono/src/modem.c
+++ b/ofono/src/modem.c
@@ -190,6 +190,11 @@ struct ofono_sim *ofono_modem_get_sim(struct ofono_modem *modem)
 	return __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);
 }

+struct ofono_gprs *ofono_modem_get_gprs(struct ofono_modem *modem)
+{
+	return __ofono_atom_find(OFONO_ATOM_TYPE_GPRS, modem);
+}
+
 struct ofono_atom *__ofono_modem_add_atom(struct ofono_modem *modem,
 					enum ofono_atom_type type,
 					void (*destruct)(struct ofono_atom *),
--- a/ofono/src/ofono.h
+++ b/ofono/src/ofono.h
@@ -596,15 +596,40 @@ struct gprs_filter_chain;

 typedef void (*gprs_filter_activate_cb_t)
 	(const struct ofono_gprs_primary_context *ctx, void *user_data);
-struct gprs_filter_chain *__ofono_gprs_filter_chain_new
-					(struct ofono_gprs_context *gc);
+typedef void (*gprs_filter_check_cb_t)(ofono_bool_t allow, void *user_data);
+struct gprs_filter_chain *__ofono_gprs_filter_chain_new(struct ofono_gprs *gp);
 void __ofono_gprs_filter_chain_free(struct gprs_filter_chain *chain);
-void __ofono_gprs_filter_chain_cancel(struct gprs_filter_chain *chain);
-
+void __ofono_gprs_filter_chain_cancel(struct gprs_filter_chain *chain,
+		struct ofono_gprs_context *gc);
 void __ofono_gprs_filter_chain_activate(struct gprs_filter_chain *chain,
+		struct ofono_gprs_context *gc,
 		const struct ofono_gprs_primary_context *ctx,
 		gprs_filter_activate_cb_t act, ofono_destroy_func destroy,
 		void *user_data);
+void __ofono_gprs_filter_chain_check(struct gprs_filter_chain *chain,
+		gprs_filter_check_cb_t cb, ofono_destroy_func destroy,
+		void *user_data);
+
+#include <ofono/voicecall-filter.h>
+
+struct voicecall_filter_chain;
+
+struct voicecall_filter_chain *__ofono_voicecall_filter_chain_new
+						(struct ofono_voicecall *vc);
+void __ofono_voicecall_filter_chain_cancel(struct voicecall_filter_chain *c,
+				const struct ofono_call *call);
+void __ofono_voicecall_filter_chain_restart(struct voicecall_filter_chain *c,
+				const struct ofono_call *call);
+void __ofono_voicecall_filter_chain_free(struct voicecall_filter_chain *c);
+void __ofono_voicecall_filter_chain_dial(struct voicecall_filter_chain *c,
+				const struct ofono_phone_number *number,
+				enum ofono_clir_option clir,
+				ofono_voicecall_filter_dial_cb_t cb,
+				ofono_destroy_func destroy, void *user_data);
+void __ofono_voicecall_filter_chain_incoming(struct voicecall_filter_chain *c,
+				const struct ofono_call *call,
+				ofono_voicecall_filter_incoming_cb_t cb,
+				ofono_destroy_func destroy, void *user_data);

 #include <ofono/sim-mnclength.h>

--- a/ofono/src/ussd.c
+++ b/ofono/src/ussd.c
@@ -417,13 +417,18 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs,
 	}

 	if (status == OFONO_USSD_STATUS_TERMINATED) {
-		ussd_change_state(ussd, USSD_STATE_IDLE);
+		if (ussd->state == USSD_STATE_ACTIVE && data && data_len > 0) {
+			/* Interpret that as a Notify */
+			status = OFONO_USSD_STATUS_NOTIFY;
+		} else {
+			ussd_change_state(ussd, USSD_STATE_IDLE);

-		if (ussd->pending == NULL)
-			return;
+			if (ussd->pending == NULL)
+				return;

-		reply = __ofono_error_network_terminated(ussd->pending);
-		goto out;
+			reply = __ofono_error_network_terminated(ussd->pending);
+			goto out;
+		}
 	}

 	if (status == OFONO_USSD_STATUS_NOT_SUPPORTED) {
@@ -808,6 +813,22 @@ static void ussd_unregister(struct ofono_atom *atom)
 	DBusConnection *conn = ofono_dbus_get_connection();
 	struct ofono_modem *modem = __ofono_atom_get_modem(atom);
 	const char *path = __ofono_atom_get_path(atom);
+	DBusMessage *reply;
+
+	if (ussd->pending) {
+		reply = __ofono_error_canceled(ussd->pending);
+		__ofono_dbus_pending_reply(&ussd->pending, reply);
+	}
+
+	if (ussd->cancel) {
+		reply = dbus_message_new_method_return(ussd->cancel);
+		__ofono_dbus_pending_reply(&ussd->cancel, reply);
+	}
+
+	if (ussd->req)
+		ussd_request_finish(ussd, -ECANCELED, 0, NULL, 0);
+
+	ussd_change_state(ussd, USSD_STATE_IDLE);

 	g_slist_free_full(ussd->ss_control_list, ssc_entry_destroy);
 	ussd->ss_control_list = NULL;
--- a/ofono/src/voicecall-filter.c
+++ b/ofono/src/voicecall-filter.c
@@ -0,0 +1,639 @@
+/*
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2018 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.
+ */
+
+#include "ofono.h"
+#include "common.h"
+
+#include <errno.h>
+#include <string.h>
+
+struct voicecall_filter_request;
+struct voicecall_filter_request_fn {
+	const char *name;
+	gboolean (*can_process)(const struct ofono_voicecall_filter *filter);
+	guint (*process)(const struct ofono_voicecall_filter *filter,
+					struct voicecall_filter_request *req);
+	void (*allow)(struct voicecall_filter_request *req);
+	void (*free)(struct voicecall_filter_request *req);
+};
+
+struct voicecall_filter_request {
+	int refcount;
+	const struct voicecall_filter_request_fn *fn;
+	const struct ofono_call *call;
+	struct voicecall_filter_chain *chain;
+	GSList *filter_link;
+	guint pending_id;
+	guint next_id;
+	ofono_destroy_func destroy;
+	void* user_data;
+};
+
+struct voicecall_filter_request_dial {
+	struct voicecall_filter_request req;
+	const struct ofono_phone_number *number;
+	enum ofono_clir_option clir;
+	ofono_voicecall_filter_dial_cb_t cb;
+};
+
+struct voicecall_filter_request_incoming {
+	struct voicecall_filter_request req;
+	ofono_voicecall_filter_incoming_cb_t cb;
+};
+
+struct voicecall_filter_chain {
+	struct ofono_voicecall *vc;
+	GSList *req_list;
+};
+
+static GSList *voicecall_filters = NULL;
+
+static void voicecall_filter_request_init(struct voicecall_filter_request *req,
+	const struct voicecall_filter_request_fn *fn,
+	struct voicecall_filter_chain *chain, const struct ofono_call *call,
+	ofono_destroy_func destroy, void *user_data)
+{
+	req->fn = fn;
+	req->chain = chain;
+	req->call = call;
+	req->filter_link = voicecall_filters;
+	req->destroy = destroy;
+	req->user_data = user_data;
+
+	/*
+	 * The list holds an implicit reference to the message. The reference
+	 * is released by voicecall_filter_request_free when the message is
+	 * removed from the list.
+	 */
+	req->refcount = 1;
+	chain->req_list = g_slist_append(chain->req_list, req);
+}
+
+static void voicecall_filter_request_cancel
+		(struct voicecall_filter_request *req)
+{
+	if (req->pending_id) {
+		const struct ofono_voicecall_filter *f = req->filter_link->data;
+
+		/*
+		 * If the filter returns id of the pending operation,
+		 * then it must provide the cancel callback
+		 */
+		f->filter_cancel(req->pending_id);
+		req->pending_id = 0;
+	}
+	if (req->next_id) {
+		g_source_remove(req->next_id);
+		req->next_id = 0;
+	}
+}
+
+static void voicecall_filter_request_dispose
+		(struct voicecall_filter_request *req)
+{
+	/* May be invoked several times per request */
+	if (req->destroy) {
+		ofono_destroy_func destroy = req->destroy;
+
+		req->destroy = NULL;
+		destroy(req->user_data);
+	}
+}
+
+static void voicecall_filter_request_free(struct voicecall_filter_request *req)
+{
+	voicecall_filter_request_dispose(req);
+	req->fn->free(req);
+}
+
+#define voicecall_filter_request_ref(req) ((req)->refcount++, req)
+
+static int voicecall_filter_request_unref(struct voicecall_filter_request *req)
+{
+	const int refcount = --(req->refcount);
+
+	if (!refcount) {
+		voicecall_filter_request_free(req);
+	}
+	return refcount;
+}
+
+static void voicecall_filter_request_done(struct voicecall_filter_request *req)
+{
+	/* Zero the pointer to it in case if this is not the last reference. */
+	req->chain = NULL;
+	voicecall_filter_request_unref(req);
+}
+
+static void voicecall_filter_request_dequeue
+		(struct voicecall_filter_request *req)
+{
+	struct voicecall_filter_chain *chain = req->chain;
+	GSList *l;
+
+	/*
+	 * Single-linked list is not particularly good at searching
+	 * and removing the elements but since it should be pretty
+	 * short (typically just one request), it's not worth optimization.
+	 */
+	if (chain && (l = g_slist_find(chain->req_list, req)) != NULL) {
+		voicecall_filter_request_done(l->data);
+		chain->req_list = g_slist_delete_link(chain->req_list, l);
+	}
+}
+
+static void voicecall_filter_request_complete
+		(struct voicecall_filter_request *req,
+			void (*complete)(struct voicecall_filter_request *req))
+{
+	voicecall_filter_request_ref(req);
+	complete(req);
+	voicecall_filter_request_dispose(req);
+	voicecall_filter_request_dequeue(req);
+	voicecall_filter_request_unref(req);
+}
+
+static void voicecall_filter_request_process
+		(struct voicecall_filter_request *req)
+{
+	GSList *l = req->filter_link;
+	const struct ofono_voicecall_filter *f = l->data;
+	const struct voicecall_filter_request_fn *fn = req->fn;
+
+	while (f && !fn->can_process(f)) {
+		l = l->next;
+		f = l ? l->data : NULL;
+	}
+
+	voicecall_filter_request_ref(req);
+	if (f) {
+		req->filter_link = l;
+		req->pending_id = fn->process(f, req);
+	} else {
+		voicecall_filter_request_complete(req, fn->allow);
+	}
+	voicecall_filter_request_unref(req);
+}
+
+static void voicecall_filter_request_next(struct voicecall_filter_request *req,
+							GSourceFunc fn)
+{
+	req->pending_id = 0;
+	req->next_id = g_idle_add(fn, req);
+}
+
+static gboolean voicecall_filter_request_continue_cb(gpointer data)
+{
+	struct voicecall_filter_request *req = data;
+
+	req->next_id = 0;
+	req->filter_link = req->filter_link->next;
+	if (req->filter_link) {
+		voicecall_filter_request_process(req);
+	} else {
+		voicecall_filter_request_complete(req, req->fn->allow);
+	}
+	return G_SOURCE_REMOVE;
+}
+
+/*==========================================================================*
+ * voicecall_filter_request_dial
+ *==========================================================================*/
+
+static struct voicecall_filter_request_dial *
+			voicecall_filter_request_dial_cast
+					(struct voicecall_filter_request *req)
+{
+	return (struct voicecall_filter_request_dial *)req;
+}
+
+static void voicecall_filter_request_dial_block_complete_cb
+					(struct voicecall_filter_request *req)
+{
+	struct voicecall_filter_request_dial *dial =
+				voicecall_filter_request_dial_cast(req);
+
+	dial->cb(OFONO_VOICECALL_FILTER_DIAL_BLOCK, req->user_data);
+}
+
+static gboolean voicecall_filter_request_dial_block_cb(gpointer data)
+{
+	struct voicecall_filter_request_dial *dial = data;
+	struct voicecall_filter_request *req = &dial->req;
+
+	req->next_id = 0;
+	voicecall_filter_request_complete(req,
+			voicecall_filter_request_dial_block_complete_cb);
+	return G_SOURCE_REMOVE;
+}
+
+static void voicecall_filter_request_dial_cb
+		(enum ofono_voicecall_filter_dial_result result, void *data)
+{
+	struct voicecall_filter_request_dial *dial = data;
+	struct voicecall_filter_request *req = &dial->req;
+	const struct ofono_voicecall_filter *filter = req->filter_link->data;
+	GSourceFunc next_cb;
+
+	if (result == OFONO_VOICECALL_FILTER_DIAL_BLOCK) {
+		ofono_info("%s is refusing to dial %s", filter->name,
+					phone_number_to_string(dial->number));
+		next_cb = voicecall_filter_request_dial_block_cb;
+	} else {
+		/* OFONO_VOICECALL_FILTER_DIAL_CONTINUE */
+		DBG("%s is ok with dialing %s", filter->name,
+					phone_number_to_string(dial->number));
+		next_cb = voicecall_filter_request_continue_cb;
+	}
+
+	voicecall_filter_request_next(req, next_cb);
+}
+
+static gboolean voicecall_filter_request_dial_can_process
+				(const struct ofono_voicecall_filter *f)
+{
+	return f->filter_dial != NULL;
+}
+
+static guint voicecall_filter_request_dial_process
+				(const struct ofono_voicecall_filter *f,
+					struct voicecall_filter_request *req)
+{
+	struct voicecall_filter_request_dial *dial =
+				voicecall_filter_request_dial_cast(req);
+
+	return f->filter_dial(req->chain->vc, dial->number, dial->clir,
+				voicecall_filter_request_dial_cb, dial);
+}
+
+static void voicecall_filter_request_dial_allow
+					(struct voicecall_filter_request *req)
+{
+	struct voicecall_filter_request_dial *dial =
+				voicecall_filter_request_dial_cast(req);
+
+	dial->cb(OFONO_VOICECALL_FILTER_DIAL_CONTINUE, req->user_data);
+}
+
+static void voicecall_filter_request_dial_free
+					(struct voicecall_filter_request *req)
+{
+	g_slice_free1(sizeof(struct voicecall_filter_request_dial), req);
+}
+
+static struct voicecall_filter_request *voicecall_filter_request_dial_new
+	(struct voicecall_filter_chain *chain,
+		const struct ofono_phone_number *number,
+		enum ofono_clir_option clir,
+		ofono_voicecall_filter_dial_cb_t cb,
+		ofono_destroy_func destroy, void *data)
+{
+	static const struct voicecall_filter_request_fn fn = {
+		.name = "dial",
+		.can_process = voicecall_filter_request_dial_can_process,
+		.process = voicecall_filter_request_dial_process,
+		.allow = voicecall_filter_request_dial_allow,
+		.free = voicecall_filter_request_dial_free
+	};
+
+	struct voicecall_filter_request_dial *dial =
+		g_slice_new0(struct voicecall_filter_request_dial);
+	struct voicecall_filter_request *req = &dial->req;
+
+	voicecall_filter_request_init(req, &fn, chain, NULL, destroy, data);
+	dial->number = number;
+	dial->clir = clir;
+	dial->cb = cb;
+	return req;
+}
+
+/*==========================================================================*
+ * voicecall_filter_request_incoming
+ *==========================================================================*/
+
+static struct voicecall_filter_request_incoming *
+			voicecall_filter_request_incoming_cast
+					(struct voicecall_filter_request *req)
+{
+	return (struct voicecall_filter_request_incoming *)req;
+}
+
+static void voicecall_filter_request_incoming_hangup_complete_cb
+					(struct voicecall_filter_request *req)
+{
+	struct voicecall_filter_request_incoming *in =
+				voicecall_filter_request_incoming_cast(req);
+
+	in->cb(OFONO_VOICECALL_FILTER_INCOMING_HANGUP, req->user_data);
+}
+
+static gboolean voicecall_filter_request_incoming_hangup_cb(gpointer data)
+{
+	struct voicecall_filter_request_incoming *in = data;
+	struct voicecall_filter_request *req = &in->req;
+
+	req->next_id = 0;
+	voicecall_filter_request_complete(req,
+		voicecall_filter_request_incoming_hangup_complete_cb);
+	return G_SOURCE_REMOVE;
+}
+
+static void voicecall_filter_request_incoming_ignore_complete_cb
+					(struct voicecall_filter_request *req)
+{
+	struct voicecall_filter_request_incoming *in =
+				voicecall_filter_request_incoming_cast(req);
+
+	in->cb(OFONO_VOICECALL_FILTER_INCOMING_IGNORE, req->user_data);
+}
+
+static gboolean voicecall_filter_request_incoming_ignore_cb(gpointer data)
+{
+	struct voicecall_filter_request_incoming *in = data;
+	struct voicecall_filter_request *req = &in->req;
+
+	req->next_id = 0;
+	voicecall_filter_request_complete(req,
+			voicecall_filter_request_incoming_ignore_complete_cb);
+	return G_SOURCE_REMOVE;
+}
+
+static void voicecall_filter_request_incoming_cb
+		(enum ofono_voicecall_filter_incoming_result result, void *data)
+{
+	struct voicecall_filter_request_incoming *in = data;
+	struct voicecall_filter_request *req = &in->req;
+	const struct ofono_voicecall_filter *filter = req->filter_link->data;
+	GSourceFunc next_cb;
+
+	if (result == OFONO_VOICECALL_FILTER_INCOMING_HANGUP) {
+		ofono_info("%s hangs up incoming call from %s", filter->name,
+			phone_number_to_string(&req->call->phone_number));
+		next_cb = voicecall_filter_request_incoming_hangup_cb;
+	} else if (result == OFONO_VOICECALL_FILTER_INCOMING_IGNORE) {
+		ofono_info("%s ignores incoming call from %s", filter->name,
+			phone_number_to_string(&req->call->phone_number));
+		next_cb = voicecall_filter_request_incoming_ignore_cb;
+	} else {
+		/* OFONO_VOICECALL_FILTER_INCOMING_CONTINUE */
+		DBG("%s is ok with accepting %s", filter->name,
+			phone_number_to_string(&req->call->phone_number));
+		next_cb = voicecall_filter_request_continue_cb;
+	}
+
+	voicecall_filter_request_next(req, next_cb);
+}
+
+static gboolean voicecall_filter_request_incoming_can_process
+				(const struct ofono_voicecall_filter *f)
+{
+	return f->filter_incoming != NULL;
+}
+
+static guint voicecall_filter_request_incoming_process
+				(const struct ofono_voicecall_filter *f,
+					struct voicecall_filter_request *req)
+{
+	return f->filter_incoming(req->chain->vc, req->call,
+				voicecall_filter_request_incoming_cb,
+				voicecall_filter_request_incoming_cast(req));
+}
+
+static void voicecall_filter_request_incoming_allow
+					(struct voicecall_filter_request *req)
+{
+	struct voicecall_filter_request_incoming *in =
+				voicecall_filter_request_incoming_cast(req);
+
+	in->cb(OFONO_VOICECALL_FILTER_INCOMING_CONTINUE, req->user_data);
+}
+
+static void voicecall_filter_request_incoming_free
+					(struct voicecall_filter_request *req)
+{
+	g_slice_free1(sizeof(struct voicecall_filter_request_incoming), req);
+}
+
+static struct voicecall_filter_request *voicecall_filter_request_incoming_new
+	(struct voicecall_filter_chain *chain, const struct ofono_call *call,
+		ofono_voicecall_filter_incoming_cb_t cb,
+		ofono_destroy_func destroy, void *data)
+{
+	static const struct voicecall_filter_request_fn fn = {
+		.name = "incoming",
+		.can_process = voicecall_filter_request_incoming_can_process,
+		.process = voicecall_filter_request_incoming_process,
+		.allow = voicecall_filter_request_incoming_allow,
+		.free = voicecall_filter_request_incoming_free
+	};
+
+	struct voicecall_filter_request_incoming *in =
+		g_slice_new0(struct voicecall_filter_request_incoming);
+	struct voicecall_filter_request *req = &in->req;
+
+	voicecall_filter_request_init(req, &fn, chain, call, destroy, data);
+	in->cb = cb;
+	return req;
+}
+
+/*==========================================================================*
+ * voicecall_filter_chain
+ *==========================================================================*/
+
+struct voicecall_filter_chain *__ofono_voicecall_filter_chain_new
+						(struct ofono_voicecall *vc)
+{
+	struct voicecall_filter_chain *chain = NULL;
+
+	if (vc) {
+		chain = g_new0(struct voicecall_filter_chain, 1);
+		chain->vc = vc;
+	}
+
+	return chain;
+}
+
+void __ofono_voicecall_filter_chain_free(struct voicecall_filter_chain *chain)
+{
+	if (chain) {
+		__ofono_voicecall_filter_chain_cancel(chain, NULL);
+		g_free(chain);
+	}
+}
+
+static GSList *voicecall_filter_chain_select(struct voicecall_filter_chain *c,
+						const struct ofono_call *call)
+{
+	if (c) {
+		GSList *selected;
+
+		/* Move selected requests to a separate list */
+		if (call) {
+			GSList *prev = NULL;
+			GSList *l = c->req_list;
+
+			selected = NULL;
+			while (l) {
+				GSList *next = l->next;
+				struct voicecall_filter_request *req = l->data;
+
+				if (req->call == call) {
+					/* This one will get canceled */
+					l->next = selected;
+					selected = l;
+					if (prev) {
+						prev->next = next;
+					} else {
+						c->req_list = next;
+					}
+				} else {
+					/* This one survives */
+					prev = l;
+				}
+				l = next;
+			}
+		} else {
+			/* Select everything */
+			selected = c->req_list;
+			c->req_list = NULL;
+		}
+
+		return selected;
+	} else {
+		return NULL;
+	}
+}
+
+void __ofono_voicecall_filter_chain_restart(struct voicecall_filter_chain *c,
+				const struct ofono_call *call)
+{
+	GSList *l, *canceled = voicecall_filter_chain_select(c, call);
+
+	/* Cancel and resubmit each request */
+	for (l = canceled; l; l = l->next) {
+		struct voicecall_filter_request *req = l->data;
+
+		voicecall_filter_request_cancel(req);
+		voicecall_filter_request_process(req);
+	}
+
+}
+
+void __ofono_voicecall_filter_chain_cancel(struct voicecall_filter_chain *c,
+						const struct ofono_call *call)
+{
+	GSList *l, *canceled = voicecall_filter_chain_select(c, call);
+
+	/* Cancel and deallocate each request */
+	for (l = canceled; l; l = l->next) {
+		struct voicecall_filter_request *req = l->data;
+
+		voicecall_filter_request_cancel(req);
+		voicecall_filter_request_done(req);
+	}
+}
+
+void __ofono_voicecall_filter_chain_dial(struct voicecall_filter_chain *chain,
+				const struct ofono_phone_number *number,
+				enum ofono_clir_option clir,
+				ofono_voicecall_filter_dial_cb_t cb,
+				ofono_destroy_func destroy, void *user_data)
+{
+	if (chain && voicecall_filters && number && cb) {
+		voicecall_filter_request_process
+			(voicecall_filter_request_dial_new(chain, number,
+						clir, cb, destroy, user_data));
+	} else {
+		if (cb) {
+			cb(OFONO_VOICECALL_FILTER_DIAL_CONTINUE, user_data);
+		}
+		if (destroy) {
+			destroy(user_data);
+		}
+	}
+}
+
+void __ofono_voicecall_filter_chain_incoming(struct voicecall_filter_chain *fc,
+				const struct ofono_call *call,
+				ofono_voicecall_filter_incoming_cb_t cb,
+				ofono_destroy_func destroy, void *user_data)
+{
+	if (fc && voicecall_filters && call && cb) {
+		voicecall_filter_request_process
+			(voicecall_filter_request_incoming_new(fc, call,
+						cb, destroy, user_data));
+	} else {
+		if (cb) {
+			cb(OFONO_VOICECALL_FILTER_INCOMING_CONTINUE, user_data);
+		}
+		if (destroy) {
+			destroy(user_data);
+		}
+	}
+}
+
+/*==========================================================================*
+ * ofono_voicecall_filter
+ *==========================================================================*/
+
+/**
+ * Returns 0 if both are equal;
+ * <0 if a comes before b;
+ * >0 if a comes after b.
+ */
+static gint voicecall_filter_sort(gconstpointer a, gconstpointer b)
+{
+	const struct ofono_voicecall_filter *a_filter = a;
+	const struct ofono_voicecall_filter *b_filter = b;
+
+	if (a_filter->priority > b_filter->priority) {
+		/* a comes before b */
+		return -1;
+	} else if (a_filter->priority < b_filter->priority) {
+		/* a comes after b */
+		return 1;
+	} else {
+		/* Whatever, as long as the sort is stable */
+		return strcmp(a_filter->name, b_filter->name);
+	}
+}
+
+int ofono_voicecall_filter_register(const struct ofono_voicecall_filter *f)
+{
+	if (!f || !f->name) {
+		return -EINVAL;
+	}
+
+	DBG("%s", f->name);
+	voicecall_filters = g_slist_insert_sorted(voicecall_filters, (void*)f,
+							voicecall_filter_sort);
+	return 0;
+}
+
+void ofono_voicecall_filter_unregister(const struct ofono_voicecall_filter *f)
+{
+	if (f) {
+		DBG("%s", f->name);
+		voicecall_filters = g_slist_remove(voicecall_filters, f);
+	}
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 8
+ * indent-tabs-mode: t
+ * End:
+ */
--- a/ofono/src/voicecall.c
+++ b/ofono/src/voicecall.c
@@ -78,6 +78,8 @@ struct ofono_voicecall {
 	struct ofono_emulator *pending_em;
 	unsigned int pending_id;
 	struct voicecall_agent *vc_agent;
+	struct voicecall_filter_chain *filters;
+	GSList *incoming_filter_list;
 };

 struct voicecall {
@@ -118,6 +120,14 @@ struct emulator_status {
 	int status;
 };

+struct dial_filter_req {
+	struct ofono_voicecall *vc;
+	struct ofono_phone_number pn;
+	enum ofono_clir_option clir;
+	ofono_voicecall_cb_t cb;
+	void *data;
+};
+
 static const char *default_en_list[] = { "911", "112", NULL };
 static const char *default_en_list_no_sim[] = { "119", "118", "999", "110",
 						"08", "000", NULL };
@@ -1496,7 +1506,7 @@ static void manager_dial_callback(const struct ofono_error *error, void *data)

 		}

-		reply = __ofono_error_failed(vc->pending);
+		reply = __ofono_error_from_error(error, vc->pending);
 	}

 	__ofono_dbus_pending_reply(&vc->pending, reply);
@@ -1505,6 +1515,41 @@ static void manager_dial_callback(const struct ofono_error *error, void *data)
 		voicecalls_emit_call_added(vc, v);
 }

+static void dial_filter_cb(enum ofono_voicecall_filter_dial_result result,
+							void *req_data)
+{
+	struct dial_filter_req *req = req_data;
+
+	if (result == OFONO_VOICECALL_FILTER_DIAL_BLOCK) {
+		struct ofono_error error;
+
+		error.type = OFONO_ERROR_TYPE_ERRNO;
+		error.error = EACCES;
+		req->cb(&error, req->data);
+	} else {
+		struct ofono_voicecall *vc = req->vc;
+
+		/* OFONO_VOICECALL_FILTER_DIAL_CONTINUE */
+		vc->driver->dial(vc, &req->pn, req->clir, req->cb, req->data);
+	}
+}
+
+static void dial_filter(struct ofono_voicecall *vc,
+					const struct ofono_phone_number *pn,
+					enum ofono_clir_option clir,
+					ofono_voicecall_cb_t cb, void *data)
+{
+	struct dial_filter_req *req = g_new0(struct dial_filter_req, 1);
+
+	req->vc = vc;
+	req->pn = *pn;
+	req->clir = clir;
+	req->cb = cb;
+	req->data = data;
+	__ofono_voicecall_filter_chain_dial(vc->filters, &req->pn, clir,
+						dial_filter_cb, g_free, req);
+}
+
 static int voicecall_dial(struct ofono_voicecall *vc, const char *number,
 					enum ofono_clir_option clir,
 					ofono_voicecall_cb_t cb, void *data)
@@ -1542,7 +1587,11 @@ static int voicecall_dial(struct ofono_voicecall *vc, const char *number,

 	string_to_phone_number(number, &ph);

-	vc->driver->dial(vc, &ph, clir, cb, vc);
+	/* No filtering for emergency calls */
+	if (is_emergency_number(vc, number))
+		vc->driver->dial(vc, &ph, clir, cb, vc);
+	else
+		dial_filter(vc, &ph, clir, cb, vc);

 	return 0;
 }
@@ -2272,6 +2321,20 @@ void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,

 	__ofono_modem_callid_release(modem, id);

+	l = g_slist_find_custom(vc->incoming_filter_list, GUINT_TO_POINTER(id),
+				call_compare_by_id);
+
+	if (l) {
+		/* Incoming call was disconnected in the process of being
+		 * filtered. Cancel the filtering. */
+		call = l->data;
+		__ofono_voicecall_filter_chain_cancel(vc->filters, call->call);
+		vc->incoming_filter_list = g_slist_delete_link
+					(vc->incoming_filter_list, l);
+		voicecall_destroy(call);
+		return;
+	}
+
 	l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(id),
 				call_compare_by_id);

@@ -2342,6 +2405,37 @@ void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,
 	vc->call_list = g_slist_remove(vc->call_list, call);
 }

+static void dummy_callback(const struct ofono_error *error, void *data)
+{
+	if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
+		DBG("command failed with error: %s",
+				telephony_error_to_str(error));
+}
+
+static void filter_incoming_cb(enum ofono_voicecall_filter_incoming_result res,
+				void *data)
+{
+	struct voicecall *v = data;
+	struct ofono_voicecall *vc = v->vc;
+
+	vc->incoming_filter_list = g_slist_remove(vc->incoming_filter_list, v);
+	if (res == OFONO_VOICECALL_FILTER_INCOMING_HANGUP) {
+		if (vc->driver->release_specific) {
+			vc->driver->release_specific(vc, v->call->id,
+							dummy_callback, vc);
+		}
+		voicecall_destroy(v);
+	} else if (res == OFONO_VOICECALL_FILTER_INCOMING_IGNORE) {
+		voicecall_destroy(v);
+	} else if (voicecall_dbus_register(v)) {
+		struct ofono_voicecall *vc = v->vc;
+
+		vc->call_list = g_slist_insert_sorted(vc->call_list, v,
+						      call_compare);
+		voicecalls_emit_call_added(vc, v);
+	}
+}
+
 void ofono_voicecall_notify(struct ofono_voicecall *vc,
 				const struct ofono_call *call)
 {
@@ -2356,6 +2450,26 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 			call->status, call->id, call->phone_number.number,
 			call->called_number.number, call->name);

+	l = g_slist_find_custom(vc->incoming_filter_list,
+			GUINT_TO_POINTER(call->id), call_compare_by_id);
+
+	if (l) {
+		/* The call has changed in the process of being filtered. */
+		DBG("Found filtered call with id: %d", call->id);
+		v = l->data;
+
+		/* Update the call */
+		voicecall_set_call_status(v, call->status);
+		voicecall_set_call_lineid(v, &call->phone_number,
+						call->clip_validity);
+		voicecall_set_call_calledid(v, &call->called_number);
+		voicecall_set_call_name(v, call->name, call->cnap_validity);
+
+		/* And restart the filtering */
+		__ofono_voicecall_filter_chain_restart(vc->filters, v->call);
+		return;
+	}
+
 	l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(call->id),
 				call_compare_by_id);

@@ -2421,6 +2535,16 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,

 	v->detect_time = time(NULL);

+	if (call->status == CALL_STATUS_INCOMING ||
+			call->status == CALL_STATUS_WAITING) {
+		/* Incoming calls have to go through filtering */
+		vc->incoming_filter_list = g_slist_append
+					(vc->incoming_filter_list, v);
+		__ofono_voicecall_filter_chain_incoming(vc->filters, v->call,
+						filter_incoming_cb, NULL, v);
+		return;
+	}
+
 	if (!voicecall_dbus_register(v)) {
 		ofono_error("Unable to register voice call");
 		goto error;
@@ -2886,6 +3010,11 @@ static void voicecall_unregister(struct ofono_atom *atom)
 	g_slist_free(vc->call_list);
 	vc->call_list = NULL;

+	/* Cancel the filtering */
+	__ofono_voicecall_filter_chain_cancel(vc->filters, NULL);
+	g_slist_free_full(vc->incoming_filter_list, voicecall_destroy);
+	vc->incoming_filter_list = NULL;
+
 	ofono_modem_remove_interface(modem, OFONO_VOICECALL_MANAGER_INTERFACE);
 	g_dbus_unregister_interface(conn, path,
 					OFONO_VOICECALL_MANAGER_INTERFACE);
@@ -2900,6 +3029,8 @@ static void voicecall_remove(struct ofono_atom *atom)
 	if (vc == NULL)
 		return;

+	__ofono_voicecall_filter_chain_free(vc->filters);
+
 	if (vc->driver && vc->driver->remove)
 		vc->driver->remove(vc);

@@ -2954,6 +3085,7 @@ struct ofono_voicecall *ofono_voicecall_create(struct ofono_modem *modem,
 		break;
 	}

+	vc->filters = __ofono_voicecall_filter_chain_new(vc);
 	return vc;
 }

@@ -3702,6 +3834,7 @@ void ofono_voicecall_register(struct ofono_voicecall *vc)
 	vc->hfp_watch = __ofono_modem_add_atom_watch(modem,
 					OFONO_ATOM_TYPE_EMULATOR_HFP,
 					emulator_hfp_watch, vc, NULL);
+
 }

 void ofono_voicecall_remove(struct ofono_voicecall *vc)
@@ -3719,6 +3852,11 @@ void *ofono_voicecall_get_data(struct ofono_voicecall *vc)
 	return vc->driver_data;
 }

+struct ofono_modem *ofono_voicecall_get_modem(struct ofono_voicecall *vc)
+{
+	return __ofono_atom_get_modem(vc->atom);
+}
+
 int ofono_voicecall_get_next_callid(struct ofono_voicecall *vc)
 {
 	struct ofono_modem *modem;
@@ -3816,10 +3954,14 @@ static void dial_request(struct ofono_voicecall *vc)
 		struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom);

 		__ofono_modem_inc_emergency_mode(modem);
-	}

-	vc->driver->dial(vc, &vc->dial_req->ph, OFONO_CLIR_OPTION_DEFAULT,
+		/* No filtering for emergency calls */
+		vc->driver->dial(vc, &vc->dial_req->ph,
+			OFONO_CLIR_OPTION_DEFAULT, dial_request_cb, vc);
+	} else {
+		dial_filter(vc, &vc->dial_req->ph, OFONO_CLIR_OPTION_DEFAULT,
 				dial_request_cb, vc);
+	}
 }

 static void dial_req_disconnect_cb(const struct ofono_error *error, void *data)
--- a/ofono/unit/coverage
+++ b/ofono/unit/coverage
@@ -22,6 +22,7 @@ TESTS="\
 test-ril_util \
 test-ril_config \
 test-sms-filter \
+ test-voicecall-filter \
 test-sailfish_cell_info \
 test-sailfish_cell_info_dbus \
 test-sailfish_manager \
--- a/ofono/unit/test-gprs-filter.c
+++ b/ofono/unit/test-gprs-filter.c
--- a/ofono/unit/test-voicecall-filter.c
+++ b/ofono/unit/test-voicecall-filter.c
Author	SHA1	Message	Date
Slava Monich	d62f0e6f8a	[ril] Respect state restrictions. JB#42752 Do not allow mobile data connections if packet data access is blocked due to restriction. Conflicts: ofono/drivers/ril/ril_constants.h	2018-09-12 00:54:36 +03:00
Sergey Chupligin	9eea761dcb	[ril] Fix incoming call indication on mtk2 vendor. Fixes JB#40790	2018-09-12 00:53:08 +03:00
NeKit	268e2b2139	[ril] Respond to INCOMING_CALL_INDICATION with SET_CALL_INDICATION. Fixes JB#40950 This is needed to make incoming calls to work on Gemini PDA (and noy only)	2018-09-12 00:53:08 +03:00
Slava Monich	c5cc678b2b	Merge branch 'voicecall-filter2' into 'master' Voicecall filter tweaking See merge request mer-core/ofono!190	2018-06-29 08:11:36 +00:00
Slava Monich	31be9a099b	[ofono] Don't filter emergency calls. JB#41404	2018-06-29 11:09:46 +03:00
Slava Monich	ccaf993977	[ofono] Return AccessDenied if voice call is blocked by the filter. JB#41404	2018-06-28 19:49:01 +03:00
Slava Monich	74d633c58e	dbus: Add D-Bus mapping for OFONO_ERROR_TYPE_ERRNO	2018-06-28 19:48:48 +03:00
Slava Monich	f870880cf9	emulator: Handle OFONO_ERROR_TYPE_ERRNO in switch	2018-06-28 19:48:48 +03:00
Slava Monich	50c06afc73	include: Add OFONO_ERROR_TYPE_ERRNO	2018-06-28 19:48:48 +03:00
Slava Monich	e4e0ccd51d	[ofono] Housekeeping Removed unused OFONO_EINVAL and OFONO_NO_ERROR macros	2018-06-28 19:19:25 +03:00
Slava Monich	ee052af454	dbus: Make cme_errors_mapping static const	2018-06-28 19:11:16 +03:00
Slava Monich	296b272274	Merge branch 'voicecall-filter' into 'master' Voice call filter See merge request mer-core/ofono!189	2018-06-28 09:35:33 +00:00
Slava Monich	9b9e5159f5	[ofono] Hooked up voicecall-filter. JB#41404	2018-06-27 16:45:22 +03:00
Slava Monich	fa8002200c	[ofono] Added voicecall-filter. JB#41404	2018-06-27 16:45:06 +03:00
Slava Monich	4cc71c78ec	[ril] Implement hangup_active in voicecall driver	2018-06-27 16:43:13 +03:00
Slava Monich	27b31e65bb	[ril] set_udub should be implemented as RIL_REQUEST_UDUB	2018-06-26 11:50:07 +03:00
Slava Monich	e26d365a94	voicecall: Implement ofono_voicecall_get_modem	2018-06-26 11:49:04 +03:00
Slava Monich	63f06cd11c	include: Add ofono_voicecall_get_modem	2018-06-26 11:49:03 +03:00
Slava Monich	96ca3aa907	[gprs-filter] Removed unnecessary forward declaration	2018-06-21 11:55:34 +03:00
Slava Monich	11a84853fe	Merge branch 'jb41925' into 'master' Make sure that USSD cancel callback is invoked See merge request mer-core/ofono!188	2018-05-24 15:28:47 +00:00
Slava Monich	a393cf0b11	[ril] Make sure that USSD cancel callback is invoked. JB#41925 Some RILs don't bother to reply. But if we don't invoke the callback provided by ofono core, its USSD machinery gets stuck in active state.	2018-05-24 15:17:30 +03:00
Slava Monich	6f263ee8d5	ussd: Cancel pending requests when unregistering And reset state to idle before unregistering the D-Bus interface. This may occur e.g. when we receive REFRESH from STK.	2018-05-23 20:48:27 +03:00
Slava Monich	92a4760f46	Merge branch 'nettime' into 'master' Handle NITZ string without DST part See merge request mer-core/ofono!187	2018-05-16 08:20:05 +00:00
Slava Monich	c43d41829f	[ril] Handle NITZ string without DST part. Fixes JB#41890	2018-05-16 00:09:13 +03:00
Slava Monich	25638a30c0	[ril] netreg: Housekeeping	2018-05-15 23:55:36 +03:00
Slava Monich	ed669bf66c	Merge branch 'jb41508' into 'master' Don't wait for SIM state change after enabling/disabling pin See merge request mer-core/ofono!186	2018-05-14 15:46:46 +00:00
Slava Monich	e01dbd2b21	[ril] Don't wait for SIM state change after enabling/disabling pin. JB#41508 There's no real need for that, but most importantly no SIM state change event is generated by MTK RIL in such cases.	2018-05-14 16:10:37 +03:00
Slava Monich	a8f0f26df8	Merge branch 'mdm_deactivate' into 'master' Add filter_check to ofono_gprs_filter See merge request mer-core/ofono!185	2018-05-04 13:26:55 +00:00
Slava Monich	56c84395ba	[ofono] Added filter_check to ofono_gprs_filter. JB#41665 It checks if ofono_gprs_filter allows mobile data in general, not just for the particular context.	2018-05-03 19:35:04 +03:00
Slava Monich	3bf2b1df5c	[ofono] Expose gprs_attached_update() to plugins. JB#41665 ofono_gprs_filter plugins implementing API version 1 or later should call this function when their configuration changes and mobile data may have become disallowed for the current SIM.	2018-05-03 19:14:28 +03:00
Slava Monich	75041ccc37	modem: Implement ofono_modem_get_gprs	2018-05-03 19:14:28 +03:00
Slava Monich	e91ef8a701	include: Add ofono_modem_get_gprs	2018-05-03 19:14:28 +03:00
Slava Monich	620a20abdc	[coverage] Remove .gcda and .gcno files on clean	2018-05-03 19:13:57 +03:00
Slava Monich	d85fa8a64d	Merge branch 'mtk_caps' into 'master' Capability switch issues See merge request mer-core/ofono!183	2018-04-25 13:02:30 +00:00
Slava Monich	d33b20889b	[ril] Made SET_PREFERRED_NETWORK_TYPE timeout configurable. JB#41570	2018-04-25 15:55:18 +03:00
Slava Monich	cb8801752c	[ril] Destroying ril_radio_caps cancels its pending requests. JB#41570 Mediatek rild restarts in the middle of the caps switch transaction, destroying ril_radio_caps in the process. That should terminate the transaction.	2018-04-25 12:29:00 +03:00
Slava Monich	a0722f8538	[ril] Don't retry SET_PREFERRED_NETWORK_TYPE too often. JB#41570 That has a disastrous effect with some RILs, slowing things down to almost a complete stop.	2018-04-25 12:29:00 +03:00
Slava Monich	e016281b86	Merge branch 'lte_mode' into 'master' Make LTE mode configurable See merge request mer-core/ofono!184	2018-04-25 09:23:45 +00:00
Sergey Chupligin	781a528625	[rild] make lte mode configurable	2018-04-25 12:02:21 +03:00
Slava Monich	5b1ab91b77	ussd: Don't ignore data from TERMINATED response Typically responses to USSD requests are coming with status zero (NOTIFY) but some are coming with status 2 (TERMINATED). If those contain data, the data should be presented to the user. [ussd] Don't ignore data from TERMINATED response. Fixes JB#41734	2018-04-23 22:05:03 +03:00
Slava Monich	9604d9ef0a	Merge branch 'sim_caps_fix' into 'master' Fix a few issues with caps switch See merge request mer-core/ofono!181	2018-04-20 13:05:28 +00:00
Slava Monich	598acaa1a8	[ril] Some events triggering caps switch, were missed. Fixes JB#41583 As a result, the data slot could be left with GSM caps and the other slot (possibly empty) would keep enjoying LTE caps which it doesn't really need.	2018-04-19 12:00:08 +03:00
Slava Monich	60193032f5	[ril] Make sure cancelled I/O doesn't remain marked as active. JB#41583 Otherwise capability switch may never start after a rild crash waiting forever for SIM I/O to calm down.	2018-04-18 15:57:53 +03:00