Merge pull request #282 from monich/provision

Add ProvisionContext method to ConnectionContext interface

ofono/doc/connman-api.txt

@@ -155,6 +155,15 @@ Methods		dict GetProperties()
 					 [service].Error.AttachInProgress
 					 [service].Error.NotImplemented
 
+Methods		void ProvisionContext()
+			Resets all properties back to default. Fails to make
+			any changes to the context if it is active or in the
+			process of being activated or deactivated.
+
+			Possible Errors: [service].Error.Failed
+					 [service].Error.InProgress
+					 [service].Error.NotAvailable
+
 Signals		PropertyChanged(string property, variant value)
 
 			This signal indicates a changed value of the given

ofono/doc/network-api.txt

@@ -57,6 +57,11 @@ Signals		PropertyChanged(string property, variant value)
 			This signal indicates a changed value of the given
 			property.
 
+		OperatorsChanged(array{object,dict})
+
+			Signal that gets emitted when operator list has
+			changed. It contains the current list of operators.
+
 Properties	string Mode [readonly]
 
 			The current registration mode. The default of this

ofono/drivers/isimodem/cbs.c

@@ -134,7 +134,9 @@ static void routing_resp_cb(const GIsiMessage *msg, void *data)
 	struct cbs_data *cd = ofono_cbs_get_data(cbs);
 
 	if (!check_resp(msg, SMS_GSM_CB_ROUTING_RESP)) {
-		ofono_cbs_remove(cbs);
+		/* on shutdown, cbs is already being removed */
+		if (g_isi_msg_error(msg) != -ESHUTDOWN)
+			ofono_cbs_remove(cbs);
 		return;
 	}
 

ofono/drivers/rilmodem/call-forwarding.c

@@ -214,7 +214,7 @@ static void ril_query_cb(struct ril_msg *message, gpointer user_data)
 				nmbr_of_resps);
 
 		for (i = 0; i < nmbr_of_resps; i++) {
-			const char *str;
+			char *str = NULL;
 
 			list[i].status =  parcel_r_int32(&rilp);
 
@@ -225,16 +225,14 @@ static void ril_query_cb(struct ril_msg *message, gpointer user_data)
 			list[i].phone_number.type = parcel_r_int32(&rilp);
 
 			str = parcel_r_string(&rilp);
-
 			if (str) {
-
 				strncpy(list[i].phone_number.number,
 					str,
 					OFONO_MAX_PHONE_NUMBER_LENGTH);
 
 				list[i].phone_number.number[
 					OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
-
+				g_free(str);
 			}
 			list[i].time = parcel_r_int32(&rilp);
 		}

ofono/drivers/rilmodem/devinfo.c

@@ -42,9 +42,8 @@
 #include "rilmodem.h"
 
 /*
- * TODO: The functions in this file are stubbed out, and
- * will need to be re-worked to talk to the /gril layer
- * in order to get real values from RILD.
+ * TODO: No public RIL api to query manufacturer or model.
+ * Check where to get, could /system/build.prop be updated to have good values?
  */
 guint timer_id;
 
@@ -52,30 +51,14 @@ static void ril_query_manufacturer(struct ofono_devinfo *info,
 					ofono_devinfo_query_cb_t cb,
 					void *data)
 {
-	const char *attr = "Fake Manufacturer";
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct ofono_error error;
-	decode_ril_error(&error, "OK");
-
-	cb(&error, attr, cbd->data);
-
-	/* Note: this will need to change if cbd passed to gril layer */
-	g_free(cbd);
+	CALLBACK_WITH_FAILURE(cb, "", data);
 }
 
 static void ril_query_model(struct ofono_devinfo *info,
 				ofono_devinfo_query_cb_t cb,
 				void *data)
 {
-	const char *attr = "Fake Modem Model";
-	struct cb_data *cbd = cb_data_new(cb, data);
-	struct ofono_error error;
-	decode_ril_error(&error, "OK");
-
-	cb(&error, attr, cbd->data);
-
-	/* Note: this will need to change if cbd passed to gril layer */
-	g_free(cbd);
+	CALLBACK_WITH_FAILURE(cb, "", data);
 }
 
 static void query_revision_cb(struct ril_msg *message, gpointer user_data)

ofono/drivers/rilmodem/gprs-context.c

@@ -43,6 +43,8 @@
 #include "grilrequest.h"
 #include "grilunsol.h"
 
+#include "common.h"
+
 #include "rilmodem.h"
 
 enum data_call_state {
@@ -64,13 +66,10 @@ struct gprs_context_data {
 	gint active_rild_cid;
 	enum state state;
 	guint regid;
+	struct unsol_data_call_list *old_list;
+	guint prev_active_status;
 };
 
-static void ril_gprs_context_deactivate_primary(struct ofono_gprs_context *gc,
-						unsigned int id,
-						ofono_gprs_context_cb_t cb,
-						void *data);
-
 static void set_context_disconnected(struct gprs_context_data *gcd)
 {
 	gcd->active_ctx_cid = -1;
@@ -78,6 +77,102 @@ static void set_context_disconnected(struct gprs_context_data *gcd)
 	gcd->state = STATE_IDLE;
 }
 
+static void ril_gprs_split_ip_by_protocol(char **ip_array,
+						char ***split_ip_addr,
+						char ***split_ipv6_addr,
+						char **ip_addr)
+{
+	const char ipv6_delimiter = ':';
+	const char ip_delimiter = '.';
+	int i;
+
+	*split_ipv6_addr = *split_ip_addr = NULL;
+	for (i=0; i< g_strv_length(ip_array); i++) {
+		if (strchr(ip_array[i], ipv6_delimiter)) {
+			if (*split_ipv6_addr == NULL) {
+				*split_ipv6_addr = g_strsplit(
+							ip_array[i], "/",2);
+			}
+		} else if (strchr(ip_array[i], ip_delimiter)) {
+			if (*split_ip_addr == NULL) {
+				*ip_addr = g_strdup(ip_array[i]);
+				*split_ip_addr = g_strsplit(
+							ip_array[i], "/", 2);
+			}
+		}
+	}
+}
+
+static void ril_gprs_split_gw_by_protocol(char **gw_array, char **ip_gw,
+								char **ipv6_gw)
+{
+	const char ipv6_delimiter = ':';
+	const char ip_delimiter = '.';
+	int i;
+
+	*ip_gw = *ipv6_gw = NULL;
+	for (i=0; i< g_strv_length(gw_array); i++) {
+		if (strchr(gw_array[i],ipv6_delimiter)) {
+			if (*ipv6_gw == NULL) {
+				*ipv6_gw = g_strdup(gw_array[i]);
+			}
+		} else if (strchr(gw_array[i],ip_delimiter)) {
+			if (*ip_gw == NULL)
+				*ip_gw = g_strdup(gw_array[i]);
+		}
+	}
+}
+
+static void ril_gprs_split_dns_by_protocol(char **dns_array, char ***dns_addr,
+							char ***dns_ipv6_addr)
+{
+	const char ipv6_delimiter = ':';
+	const char ip_delimiter = '.';
+	char *temp = NULL;
+	char *temp1 = NULL;
+	char *dnsip = NULL;
+	char *dnsipv6 = NULL;
+	int i, dnsip_len, dnsipv6_len;
+
+	dnsip_len = dnsipv6_len = 0;
+
+	for (i=0; i< g_strv_length(dns_array); i++) {
+		if (strchr(dns_array[i],ipv6_delimiter)) {
+			if (dnsipv6 == NULL) {
+				dnsipv6 = g_strdup(dns_array[i]);
+			} else {
+				temp = g_strconcat(dnsipv6, ",", NULL);
+				g_free(dnsipv6);
+				temp1 = g_strconcat(temp, dns_array[i], NULL);
+				g_free(temp);
+				dnsipv6 = temp1;
+			}
+			dnsipv6_len++;
+		} else if (strchr(dns_array[i],ip_delimiter)) {
+			if (dnsip == NULL) {
+				dnsip = g_strdup(dns_array[i]);
+			} else {
+				temp = g_strconcat(dnsip, ",", NULL);
+				g_free(dnsip);
+				temp1 = g_strconcat(temp, dns_array[i], NULL);
+				g_free(temp);
+				dnsip = temp1;
+
+			}
+			dnsip_len++;
+		}
+	}
+
+	if (dnsip)
+		*dns_addr = g_strsplit(dnsip, ",", dnsip_len);
+
+	if (dnsipv6)
+		*dns_ipv6_addr = g_strsplit(dnsipv6, ",", dnsipv6_len);
+
+	g_free(dnsip);
+	g_free(dnsipv6);
+}
+
 static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 						gpointer user_data)
 {
@@ -86,6 +181,7 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	struct data_call *call = NULL;
 	struct unsol_data_call_list *unsol;
 	gboolean disconnect = FALSE;
+	gboolean signal = FALSE;
 	GSList *iterator = NULL;
 	struct ofono_error error;
 
@@ -94,55 +190,148 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	if (error.type != OFONO_ERROR_TYPE_NO_ERROR)
 		goto error;
 
+	if (g_ril_unsol_cmp_dcl(unsol,gcd->old_list,gcd->active_rild_cid))
+		goto error;
+
+	g_ril_unsol_free_data_call_list(gcd->old_list);
+	gcd->old_list = unsol;
+
 	DBG("number of call in call_list_changed is: %d", unsol->num);
 
 	for (iterator = unsol->call_list; iterator; iterator = iterator->next) {
 		call = (struct data_call *) iterator->data;
 
+		/*
+		 * Every context receives notifications about all data calls
+		 * but should only handle its own.
+		 */
+		if (call->cid != gcd->active_rild_cid)
+			continue;
+
+		if (call->active == DATA_CALL_LINK_DOWN)
+			gcd->prev_active_status = call->active;
+
 		if (call->status != 0)
 			ofono_info("data call status:%d", call->status);
 
 		if (call->active == DATA_CALL_INACTIVE) {
 			disconnect = TRUE;
+			gcd->prev_active_status = call->active;
 			ofono_gprs_context_deactivated(gc, gcd->active_ctx_cid);
 			break;
 		}
 
 		if (call->active == DATA_CALL_ACTIVE) {
-			char **split_ip_addr = NULL;
-			const char **dns_addresses;
+			int protocol = -1;
 
-			if (call->ifname) {
+			if (gcd->prev_active_status != DATA_CALL_LINK_DOWN)
+				signal = TRUE;
+
+			gcd->prev_active_status = call->active;
+
+			if (call->type)
+				protocol = ril_protocol_string_to_ofono_protocol(call->type);
+
+			if (call->ifname)
 				ofono_gprs_context_set_interface(gc,
 								call->ifname);
-			}
 
 			if (call->addresses) {
-				ofono_gprs_context_set_ipv4_netmask(gc,
-					ril_util_get_netmask(call->addresses));
+				char **split_ip_addr = NULL;
+				char **ip_array = NULL;
+				char **split_ipv6_addr = NULL;
+				char *ip_addr = NULL;
 
-				split_ip_addr = g_strsplit(call->addresses,
-									"/", 2);
-				ofono_gprs_context_set_ipv4_address(gc,
+				/*addresses to an array*/
+				ip_array = g_strsplit(call->addresses, " ",-1);
+
+				/*pick 1 address of each protocol*/
+				ril_gprs_split_ip_by_protocol(ip_array,
+								&split_ip_addr,
+								&split_ipv6_addr,
+								&ip_addr);
+
+				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
+						protocol == OFONO_GPRS_PROTO_IPV6)
+						&& split_ipv6_addr != NULL){
+
+					ofono_gprs_context_set_ipv6_address(gc,
+							split_ipv6_addr[0]);
+				}
+
+				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
+						protocol == OFONO_GPRS_PROTO_IP)
+						&& split_ip_addr != NULL) {
+
+					ofono_gprs_context_set_ipv4_netmask(gc,
+						ril_util_get_netmask(ip_addr));
+					ofono_gprs_context_set_ipv4_address(gc,
 							split_ip_addr[0], TRUE);
+				}
+
+				g_strfreev(split_ip_addr);
+				g_strfreev(split_ipv6_addr);
+				g_strfreev(ip_array);
+				g_free(ip_addr);
 			}
 
 			if (call->gateways) {
-				ofono_gprs_context_set_ipv4_gateway(gc,
-								call->gateways);
+				char **gw_array = NULL;
+				char *ip_gw = NULL;
+				char *ipv6_gw = NULL;
+				/*addresses to an array*/
+				gw_array = g_strsplit(call->gateways, " ", -1);
+
+				/*pick 1 gw for each protocol*/
+				ril_gprs_split_gw_by_protocol(gw_array, &ip_gw,
+								&ipv6_gw);
+
+				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
+						protocol == OFONO_GPRS_PROTO_IPV6)
+						&& ipv6_gw != NULL)
+					ofono_gprs_context_set_ipv6_gateway(gc,
+								ipv6_gw);
+
+				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
+						protocol == OFONO_GPRS_PROTO_IP)
+						&& ip_gw != NULL)
+					ofono_gprs_context_set_ipv4_gateway(gc,
+								ip_gw);
+
+				g_strfreev(gw_array);
+				g_free(ip_gw);
+				g_free(ipv6_gw);
 			}
 
+			if (call->dnses) {
+				char **dns_array = NULL;
+				char **dns_ip = NULL;
+				char **dns_ipv6 = NULL;
 
-			if (call->dnses)
-				DBG("dnses:%s", call->dnses);
+				/*addresses to an array*/
+				dns_array = g_strsplit(call->dnses, " ", -1);
 
-			dns_addresses =
-				(const char **)(call->dnses ?
-				g_strsplit((const gchar*)call->dnses, " ", 3)
-									: NULL);
+				/*split based on protocol*/
+				ril_gprs_split_dns_by_protocol(dns_array,
+								&dns_ip,
+								&dns_ipv6);
 
-			ofono_gprs_context_set_ipv4_dns_servers(gc,
-								dns_addresses);
+				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
+						protocol == OFONO_GPRS_PROTO_IPV6)
+						&& dns_ipv6 != NULL)
+					ofono_gprs_context_set_ipv6_dns_servers(
+						gc, (const char **) dns_ipv6);
+
+				if ((protocol == OFONO_GPRS_PROTO_IPV4V6 ||
+						protocol == OFONO_GPRS_PROTO_IP)
+						&& dns_ip != NULL)
+					ofono_gprs_context_set_ipv4_dns_servers(
+						gc, (const char**)dns_ip);
+
+				g_strfreev(dns_ip);
+				g_strfreev(dns_ipv6);
+				g_strfreev(dns_array);
+			}
 			break;
 		}
 	}
@@ -150,8 +339,15 @@ static void ril_gprs_context_call_list_changed(struct ril_msg *message,
 	if (disconnect) {
 		ofono_error("Clearing active context");
 		set_context_disconnected(gcd);
+		gcd->old_list = NULL;
+		goto error;
 	}
 
+	if (signal)
+		ofono_gprs_context_signal_change(gc, gcd->active_ctx_cid);
+
+	return;
+
 error:
 	g_ril_unsol_free_data_call_list(unsol);
 }
@@ -165,6 +361,12 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 	struct ofono_error error;
 	struct reply_setup_data_call *reply = NULL;
 	char **split_ip_addr = NULL;
+	char **split_ipv6_addr = NULL;
+	char* ip_addr = NULL;
+	char* ip_gw = NULL;
+	char* ipv6_gw = NULL;
+	char** dns_addr = NULL;
+	char** dns_ipv6_addr = NULL;
 
 	ofono_info("setting up data call");
 
@@ -199,20 +401,13 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 		goto error;
 	}
 
-	/*
-	 * TODO: consier moving this into parse_data_reply
-	 *
-	 * Note - the address may optionally include a prefix size
-	 * ( Eg. "/30" ).  As this may confuse client, we
-	 * explicitly strip any prefix after calculating the netmask.
-	 */
-	split_ip_addr = g_strsplit(reply->ip_addrs[0], "/", 2);
+	/*check the ip address protocol*/
+	ril_gprs_split_ip_by_protocol(reply->ip_addrs, &split_ip_addr,
+						&split_ipv6_addr, &ip_addr);
 
-	/* TODO: see note above re: invalid messages... */
-	if (split_ip_addr[0] == NULL) {
-		ofono_error("%s: invalid IP address field returned: %s",
-				__func__,
-				reply->ip_addrs[0]);
+	if (split_ip_addr == NULL && split_ipv6_addr == NULL) {
+		ofono_error("%s: No IP address returned",
+				__func__);
 
 		error.type = OFONO_ERROR_TYPE_FAILURE;
 		error.error = EINVAL;
@@ -225,26 +420,48 @@ static void ril_setup_data_call_cb(struct ril_msg *message, gpointer user_data)
 
 	ofono_gprs_context_set_interface(gc, reply->ifname);
 
+	ril_gprs_split_gw_by_protocol(reply->gateways, &ip_gw, &ipv6_gw);
+
+	ril_gprs_split_dns_by_protocol(reply->dns_addresses, &dns_addr,
+								&dns_ipv6_addr);
+
 	/* TODO:
-	 * RILD can return multiple addresses; oFono only supports
-	 * setting a single IPv4 address.  At this time, we only
-	 * use the first address.  It's possible that a RIL may
-	 * just specify the end-points of the point-to-point
-	 * connection, in which case this code will need to
-	 * changed to handle such a device.
+	 * RILD can return multiple addresses; oFono only supports setting
+	 * a single IPv4 and single IPV6 address. At this time, we only use
+	 * the first address. It's possible that a RIL may just specify
+	 * the end-points of the point-to-point connection, in which case this
+	 * code will need to changed to handle such a device.
 	 */
-	ofono_gprs_context_set_ipv4_netmask(gc,
-			ril_util_get_netmask(reply->ip_addrs[0]));
 
-	ofono_gprs_context_set_ipv4_address(gc, split_ip_addr[0], TRUE);
-	ofono_gprs_context_set_ipv4_gateway(gc, reply->gateways[0]);
+	if (split_ipv6_addr != NULL &&
+			(reply->protocol == OFONO_GPRS_PROTO_IPV6 ||
+			reply->protocol == OFONO_GPRS_PROTO_IPV4V6)) {
 
-	ofono_gprs_context_set_ipv4_dns_servers(gc,
-					(const char **) reply->dns_addresses);
+		ofono_gprs_context_set_ipv6_address(gc, split_ipv6_addr[0]);
+		ofono_gprs_context_set_ipv6_gateway(gc, ipv6_gw);
+		ofono_gprs_context_set_ipv6_dns_servers(gc,
+						(const char **) dns_ipv6_addr);
+	}
 
+	if (split_ip_addr != NULL &&
+			(reply->protocol == OFONO_GPRS_PROTO_IP ||
+			reply->protocol == OFONO_GPRS_PROTO_IPV4V6)) {
+		ofono_gprs_context_set_ipv4_netmask(gc,
+					ril_util_get_netmask(ip_addr));
+		ofono_gprs_context_set_ipv4_address(gc, split_ip_addr[0], TRUE);
+		ofono_gprs_context_set_ipv4_gateway(gc, ip_gw);
+		ofono_gprs_context_set_ipv4_dns_servers(gc,
+						(const char **) dns_addr);
+	}
 error:
 	g_ril_reply_free_setup_data_call(reply);
 	g_strfreev(split_ip_addr);
+	g_strfreev(split_ipv6_addr);
+	g_strfreev(dns_addr);
+	g_strfreev(dns_ipv6_addr);
+	g_free(ip_addr);
+	g_free(ip_gw);
+	g_free(ipv6_gw);
 
 	cb(&error, cbd->data);
 }
@@ -260,9 +477,19 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	struct ofono_error error;
 	int reqid = RIL_REQUEST_SETUP_DATA_CALL;
 	int ret = 0;
+	int netreg_status;
+	int roaming = NETWORK_REGISTRATION_STATUS_ROAMING;
 
 	ofono_info("Activating context: %d", ctx->cid);
 
+	/* Let's make sure that we aren't connecting when roaming not allowed */
+	netreg_status = get_current_network_status();
+	if (netreg_status == roaming) {
+		if (!ril_roaming_allowed() && (roaming
+				== check_if_really_roaming(netreg_status)))
+			goto exit;
+	}
+
 	cbd->user = gc;
 
 	/* TODO: implement radio technology selection. */
@@ -276,6 +503,7 @@ static void ril_gprs_context_activate_primary(struct ofono_gprs_context *gc,
 	request.username = g_strdup(ctx->username);
 	request.password = g_strdup(ctx->password);
 	request.auth_type = RIL_AUTH_BOTH;
+
 	request.protocol = ctx->proto;
 
 	if (g_ril_request_setup_data_call(gcd->ril,
@@ -304,7 +532,7 @@ error:
 	g_free(request.apn);
 	g_free(request.username);
 	g_free(request.password);
-
+exit:
 	if (ret <= 0) {
 		ofono_error("Send RIL_REQUEST_SETUP_DATA_CALL failed.");
 
@@ -436,7 +664,6 @@ static int ril_gprs_context_probe(struct ofono_gprs_context *gc,
 	set_context_disconnected(gcd);
 
 	ofono_gprs_context_set_data(gc, gcd);
-	gcd->regid = -1;
 
 	gcd->regid = g_ril_register(gcd->ril, RIL_UNSOL_DATA_CALL_LIST_CHANGED,
 					ril_gprs_context_call_list_changed, gc);
@@ -449,6 +676,8 @@ static void ril_gprs_context_remove(struct ofono_gprs_context *gc)
 
 	DBG("");
 
+	g_ril_unsol_free_data_call_list(gcd->old_list);
+
 	if (gcd->state != STATE_IDLE)
 		ril_gprs_context_detach_shutdown(gc, 0);
 

ofono/drivers/rilmodem/gprs.c

@@ -65,22 +65,21 @@
  *    +CREG ( see 27.003 7.2 ).
  */
 
-#define FAKE_STATE_TIMER 5
-
 struct gprs_data {
 	GRil *ril;
 	gboolean ofono_attached;
 	int max_cids;
-	int rild_status;
-	int true_status;
-	gboolean notified;
+	int rild_status; /* Driver Status */
 	guint registerid;
 	guint timer_id;
-	guint fake_timer_id;
 };
 
+/* Following constants are purely to improve readability */
+static const int roaming = NETWORK_REGISTRATION_STATUS_ROAMING;
+static const int registered = NETWORK_REGISTRATION_STATUS_REGISTERED;
+
 /*if we have called ofono_gprs_register or not*/
-static gboolean registered;
+static gboolean ofono_registered;
 
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb,
@@ -142,8 +141,6 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 	* are met.
 	*/
 
-	gd->notified = (gd->ofono_attached == attached) ? TRUE : FALSE;
-
 	gd->ofono_attached = attached;
 
 	cbd->user = gprs;
@@ -158,20 +155,7 @@ static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 						cbd);
 }
 
-static gboolean ril_fake_response(gpointer user_data)
-{
-	struct cb_data *cbd = user_data;
-	struct ofono_gprs *gprs = cbd->user;
-	struct gprs_data *gd = ofono_gprs_get_data(gprs);
-
-	DBG("");
-
-	ofono_gprs_status_notify(gprs, gd->true_status);
-	g_free(cbd);
-	return FALSE;
-}
-
-static gboolean ril_roaming_allowed()
+gboolean ril_roaming_allowed()
 {
 	GError *error;
 	error = NULL;
@@ -191,6 +175,7 @@ static gboolean ril_roaming_allowed()
 
 	storage_close(imsi, "gprs", settings, FALSE);
 
+	DBG("roaming_allowed: %d", roaming_allowed);
 	return roaming_allowed;
 }
 
@@ -201,10 +186,9 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 	struct ofono_gprs *gprs = cbd->user;
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
 	struct ofono_error error;
-	int status, lac, ci, tech;
+	int lac, ci, tech;
 	int max_cids = 1;
-
-	DBG("");
+	int status = -1;
 
 	if (gd && message->error == RIL_E_SUCCESS) {
 		decode_ril_error(&error, "OK");
@@ -213,32 +197,22 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 				ril_error_to_string(message->error));
 		decode_ril_error(&error, "FAIL");
 		error.error = message->error;
-		status = -1;
-		goto error;
+		goto exit;
 	}
 
 	if (ril_util_parse_reg(gd->ril, message, &status,
 				&lac, &ci, &tech, &max_cids) == FALSE) {
 		ofono_error("Failure parsing data registration response.");
 		decode_ril_error(&error, "FAIL");
-		status = -1;
-		goto error;
-	}
-
-	if ((gd->fake_timer_id > 0) &&
-			((status == (NETWORK_REGISTRATION_STATUS_REGISTERED
-			|| NETWORK_REGISTRATION_STATUS_ROAMING)) ||
-			!(gd->ofono_attached))) {
-		g_source_remove(gd->fake_timer_id);
-		gd->true_status = -1;
+		goto exit;
 	}
 
 	if (status > 10)
 		status = status - 10;
 
-	if (!registered) {
+	if (!ofono_registered) {
 		ofono_gprs_register(gprs);
-		registered = TRUE;
+		ofono_registered = TRUE;
 	}
 
 	if (max_cids > gd->max_cids) {
@@ -247,16 +221,32 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 		ofono_gprs_set_cid_range(gprs, 1, max_cids);
 	}
 
-	ofono_info("data registration status is %d", status);
-
-	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
+	if (status == roaming)
 		status = check_if_really_roaming(status);
 
-	DBG(" attached:%d, status:%d", gd->ofono_attached, status);
+	/* Let's minimize logging */
+	if (status != gd->rild_status)
+		ofono_info("data reg changes %d (%d), attached %d",
+				status, gd->rild_status, gd->ofono_attached);
+
+	/* Must be attached if registered or roaming */
+	if ((gd->rild_status != registered) && (gd->rild_status != roaming)) {
+		if (status == registered)
+			gd->ofono_attached = TRUE;
+		else if ((status == roaming) && (ril_roaming_allowed() == TRUE))
+			gd->ofono_attached = TRUE;
+	}
+
+	if (!ofono_modem_get_online(ofono_gprs_get_modem(gprs)))
+		gd->ofono_attached = FALSE;
+
+	/* if unsolicitated and no state change let's not notify core */
+	if ((status == gd->rild_status) && gd->ofono_attached)
+		goto cb_out;
 
 	if (!gd->ofono_attached) {
-		if (status == NETWORK_REGISTRATION_STATUS_ROAMING) {
-			if (!gd->notified && cb) {
+		if (!cb) {
+			if (status == roaming) {
 				if (ril_roaming_allowed() == FALSE)
 					ofono_gprs_detached_notify(gprs);
 
@@ -265,56 +255,31 @@ static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
 				 * into eternal loop with driver
 				 */
 				decode_ril_error(&error, "FAIL");
-
-				ofono_gprs_status_notify(gprs, status);
 			}
+
+			ofono_gprs_status_notify(gprs, status);
+
 		} else {
-			if (status == NETWORK_REGISTRATION_STATUS_SEARCHING &&
-								!gd->notified &&
-								cb)
-				/*
-				 * This is a hack that prevents core ending
-				 * into eternal loop with driver
-				 */
-				decode_ril_error(&error, "FAIL");
-
-			ofono_gprs_status_notify(gprs, status);
+			/*
+			 * This prevents core ending
+			 * into eternal loop with driver
+			 */
+			decode_ril_error(&error, "FAIL");
 		}
 
-		if (cb)
-			gd->notified = TRUE;
-
 		gd->rild_status = status;
-		goto error;
+		goto exit;
 	}
 
-	if (status == NETWORK_REGISTRATION_STATUS_ROAMING ||
-		status == NETWORK_REGISTRATION_STATUS_REGISTERED) {
-			ofono_gprs_status_notify(gprs, status);
-			gd->rild_status = status;
-	} else {
-		if (gd->fake_timer_id <= 0) {
-			struct cb_data *fake_cbd = cb_data_new(NULL, NULL);
+	if (!cb)
+		ofono_gprs_status_notify(gprs, status);
 
-			fake_cbd->user = gprs;
-			gd->fake_timer_id = g_timeout_add_seconds(
-						FAKE_STATE_TIMER,
-						ril_fake_response, fake_cbd);
-		}
-
-		gd->true_status = status;
-
-		if (gd->rild_status == NETWORK_REGISTRATION_STATUS_ROAMING)
-			status = NETWORK_REGISTRATION_STATUS_ROAMING;
-		else
-			status = NETWORK_REGISTRATION_STATUS_REGISTERED;
-
-		gd->rild_status = status;
-	}
-
-error:
-	ofono_info("data registration status is %d", status);
+	gd->rild_status = status;
 
+exit:
+	DBG("data reg status %d, rild_status %d, attached %d",
+		status, gd->rild_status, gd->ofono_attached);
+cb_out:
 	if (cb)
 		cb(&error, status, cbd->data);
 }
@@ -354,9 +319,12 @@ static void ril_data_probe_reg_cb(struct ril_msg *message, gpointer user_data)
 		goto out;
 	}
 
+	if (status > 10)
+		status = status - 10;
+
 	ofono_gprs_register(gprs);
 
-	registered = TRUE;
+	ofono_registered = TRUE;
 
 	if (max_cids > gd->max_cids) {
 		DBG("Setting max cids to %d", max_cids);
@@ -364,18 +332,16 @@ static void ril_data_probe_reg_cb(struct ril_msg *message, gpointer user_data)
 		ofono_gprs_set_cid_range(gprs, 1, max_cids);
 	}
 
-	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
+	if (status == roaming)
 		status = check_if_really_roaming(status);
 
 out:
-	ofono_info("data registration status is %d", status);
+	ofono_info("data reg status probed %d", status);
 
-	DBG("Starting to listen network status");
 	gd->registerid = g_ril_register(gd->ril,
 			id, ril_gprs_state_change, gprs);
 
 	gd->rild_status = status;
-
 }
 
 static void ril_gprs_registration_status(struct ofono_gprs *gprs,
@@ -425,12 +391,10 @@ static int ril_gprs_probe(struct ofono_gprs *gprs,
 	gd->ofono_attached = FALSE;
 	gd->max_cids = 0;
 	gd->rild_status = -1;
-	gd->true_status = -1;
-	gd->notified = FALSE;
 	gd->registerid = -1;
 	gd->timer_id = 0;
 
-	registered = FALSE;
+	ofono_registered = FALSE;
 
 	ofono_gprs_set_data(gprs, gd);
 
@@ -453,9 +417,6 @@ static void ril_gprs_remove(struct ofono_gprs *gprs)
 	if (gd->timer_id > 0)
 		g_source_remove(gd->timer_id);
 
-	if (gd->fake_timer_id > 0)
-		g_source_remove(gd->fake_timer_id);
-
 	g_ril_unref(gd->ril);
 	g_free(gd);
 }

ofono/drivers/rilmodem/network-registration.c

@@ -55,6 +55,7 @@ struct netreg_data {
 	guint nitz_timeout;
 	unsigned int vendor;
 	guint timer_id;
+	int corestatus; /* Registration status previously reported to core */
 };
 
 /* 27.007 Section 7.3 <stat> */
@@ -78,25 +79,20 @@ static void extract_mcc_mnc(const char *str, char *mcc, char *mnc)
 	mnc[OFONO_MAX_MNC_LENGTH] = '\0';
 }
 
-/*
- * TODO: The functions in this file are stubbed out, and
- * will need to be re-worked to talk to the /gril layer
- * in order to get real values from RILD.
- */
-
 static void ril_creg_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
 	ofono_netreg_status_cb_t cb = cbd->cb;
 	struct netreg_data *nd = cbd->user;
 	struct ofono_error error;
-	int status, lac, ci, tech;
+	int status, logstatus, lac, ci, tech;
 
 	DBG("");
 
 	if (message->error != RIL_E_SUCCESS) {
 		decode_ril_error(&error, "FAIL");
-		ofono_error("Failed to pull registration state");
+		ofono_error("voice registration status query fail");
+		nd->corestatus = -1;
 		cb(&error, -1, -1, -1, -1, cbd->data);
 		return;
 	}
@@ -105,20 +101,31 @@ static void ril_creg_cb(struct ril_msg *message, gpointer user_data)
 
 	if (ril_util_parse_reg(nd->ril, message, &status,
 				&lac, &ci, &tech, NULL) == FALSE) {
+		DBG("voice registration status parsing fail");
+		nd->corestatus = -1;
 		CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, cbd->data);
 		return;
 	}
 
-	DBG("voice registration status is %d", status);
-
 	if (status > 10)
 		status = status - 10;
 
+	logstatus = status;
+
 	if (status == NETWORK_REGISTRATION_STATUS_ROAMING)
 		status = check_if_really_roaming(status);
 
-	ofono_info("voice registration status is %d", status);
+	DBG("status:%d corestatus:%d", status, nd->corestatus);
 
+	if (status != logstatus)
+		ofono_info("voice registration modified %d (%d)",
+				status, logstatus);
+
+	if (nd->corestatus != status)
+		ofono_info("voice registration changes %d (%d)",
+				status, nd->corestatus);
+
+	nd->corestatus = status;
 	nd->tech = tech;
 	cb(&error, status, lac, ci, tech, cbd->data);
 }
@@ -128,15 +135,16 @@ static void ril_creg_notify(struct ofono_error *error, int status, int lac,
 {
 	struct ofono_netreg *netreg = user_data;
 
-        if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
-                DBG("Error during status notification");
-                return;
-        }
+	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+		DBG("Error during status notification");
+		return;
+	}
 
 	ofono_netreg_status_notify(netreg, status, lac, ci, tech);
 }
 
-static void ril_network_state_change(struct ril_msg *message, gpointer user_data)
+static void ril_network_state_change(struct ril_msg *message,
+		gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
@@ -364,6 +372,7 @@ static void ril_cops_list_cb(struct ril_msg *message, gpointer user_data)
 
 	cb(&error, noperators, list, cbd->data);
 
+	g_free(list);
 	return;
 
 error:
@@ -405,7 +414,8 @@ static void ril_register_cb(struct ril_msg *message, gpointer user_data)
 		g_ril_print_response_no_args(nd->ril, message);
 
 	} else {
-		ofono_error("registration failed");
+		ofono_error("registration failed, ril result %d",
+				message->error);
 		decode_ril_error(&error, "FAIL");
 	}
 
@@ -421,6 +431,8 @@ static void ril_register_auto(struct ofono_netreg *netreg,
 	int ret;
 	cbd->user = nd;
 
+	ofono_info("nw select automatic");
+
 	ret = g_ril_send(nd->ril, request,
 				NULL, 0, ril_register_cb, cbd, g_free);
 
@@ -444,6 +456,8 @@ static void ril_register_manual(struct ofono_netreg *netreg,
 	int request = RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL;
 	int ret;
 
+	ofono_info("nw select manual: %s%s", mcc, mnc);
+
 	/* add *netreg_data to callback */
 	cbd->user = nd;
 
@@ -591,14 +605,20 @@ gint check_if_really_roaming(gint status)
 	struct sim_spdi *spdi = ofono_netreg_get_spdi(current_netreg);
 
 	if (spdi && net_mcc && net_mnc) {
-		if (sim_spdi_lookup(spdi, net_mcc, net_mnc))
+		if (sim_spdi_lookup(spdi, net_mcc, net_mnc)) {
+			ofono_info("voice reg: not roaming based on spdi");
 			return NETWORK_REGISTRATION_STATUS_REGISTERED;
-		else
+		} else
 			return status;
 	} else
 		return status;
 }
 
+gint get_current_network_status()
+{
+	return ofono_netreg_get_status(current_netreg);
+}
+
 static gboolean ril_delayed_register(gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
@@ -643,6 +663,7 @@ static int ril_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 	nd->time.year = -1;
 	nd->time.dst = 0;
 	nd->time.utcoff = 0;
+	nd->corestatus = -1;
 	current_netreg = netreg;
 
 	ofono_netreg_set_data(netreg, nd);

ofono/drivers/rilmodem/phonebook.c

@@ -6,7 +6,6 @@
  *  Copyright (C) ST-Ericsson SA 2010.
  *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
  *  Copyright (C) 2013 Jolla Ltd
- *  Contact: Jussi Kangas <jussi.kangas@tieto.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -345,7 +344,7 @@ void handle_anr(size_t len,const unsigned char *msg,char *anr,
 			prefix = 0;
 
 			if ((msg[2] & TON_MASK) ==
-			    TON_INTERNATIONAL) {
+				TON_INTERNATIONAL) {
 				anr[0] = '+';
 				prefix = 1;
 			}
@@ -518,7 +517,7 @@ void handle_ext1(struct pb_data *pbd, const unsigned char *msg,
 						list_entry->data;
 				if (entry) {
 					strcat(entry->anr,
-				       ext_number);
+						ext_number);
 			}
 		}
 	}
@@ -634,8 +633,10 @@ static void pb_adn_sim_data_cb(const struct ofono_error *error,
 	file_info = cbd_outer->user;
 	cbd = cbd_outer->data;
 
-	if (!cbd)
+	if (!cbd) {
+		g_free(cbd_outer);
 		return;
+		}
 
 	pb = cbd->user;
 	cb = cbd->cb;
@@ -718,8 +719,10 @@ static void pb_adn_sim_data_cb(const struct ofono_error *error,
 			g_slist_free(phonebook_entry_start);
 			g_slist_free(pb_files);
 			g_free(cbd_outer);
+			void *pb = cbd->data;
+			g_free(cbd);
 			DBG("Finally all PB data read");
-			CALLBACK_WITH_SUCCESS(cb, cbd->data);
+			CALLBACK_WITH_SUCCESS(cb, pb);
 			return;
 		}
 	}
@@ -744,9 +747,6 @@ static void pb_adn_sim_info_cb(const struct ofono_error *error,
 	if (!cbd)
 		goto error;
 
-	pb = cbd->user;
-	cb = cbd->cb;
-	pbd = ofono_phonebook_get_data(pb);
 	file_info = NULL;
 
 	if (!pbd)
@@ -789,8 +789,12 @@ static void pb_adn_sim_info_cb(const struct ofono_error *error,
 	return;
 error:
 
-	if (cb && cbd)
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	if (cbd){
+		void *pb = cbd->data;
+		g_free(cbd);
+		if(cb)
+			CALLBACK_WITH_FAILURE(cb, pb);
+	}
 }
 
 static gboolean is_reading_required(uint8_t file_type)
@@ -823,9 +827,28 @@ static void pb_content_data_cb(const struct ofono_error *error,
 	if (extension_file_info)
 		file_info = decode_read_response(extension_file_info, sdata,
 						 length, pb);
-	else
+	else {
+	/*
+	 * These checks are crash hacks.
+	 * AFAIK there's a possibility that we end up here and pb_next is NULL
+	 * in case remove has been called while phonebook reading is in
+	 * process. If you find better solution to this issue feel free to
+	 * change this.
+	 */
+		if (pb_next == NULL) {
+			ofono_error("phonebook reading failed");
+			if (cbd){
+				void *pb = cbd->data;
+				g_free(cbd);
+				if(cb && pbd)
+					CALLBACK_WITH_FAILURE(cb, pb);
+				}
+			return;
+		}
+
 		file_info =
 			decode_read_response(pb_next->data, sdata, length, pb);
+	}
 
 	if (file_info) {
 		DBG("Reading extension file %04X, record %d, structure %d",
@@ -879,7 +902,7 @@ static void pb_content_data_cb(const struct ofono_error *error,
 				DBG("All data requested, start vCard creation");
 				while (list_entry) {
 					struct phonebook_entry *entry =
-					    list_entry->data;
+							list_entry->data;
 
 					if (entry) {
 						DBG("vCard:\nname=%s\n",
@@ -916,8 +939,10 @@ static void pb_content_data_cb(const struct ofono_error *error,
 
 				g_slist_free(phonebook_entry_start);
 				g_slist_free(pb_files);
+				void *pb = cbd->data;
+				g_free(cbd);
 				DBG("Finally all PB data read");
-				CALLBACK_WITH_SUCCESS(cb, cbd->data);
+				CALLBACK_WITH_SUCCESS(cb, pb);
 				return;
 			}
 
@@ -982,8 +1007,12 @@ static void pb_content_data_read(struct pb_data *pbd,
 	return;
 error:
 
-	if (cb && cbd)
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	if (cbd){
+		void *pb = cbd->data;
+		g_free(cbd);
+		if(cb)
+			CALLBACK_WITH_FAILURE(cb, pb);
+	}
 
 out:
 	DBG("Exiting");
@@ -1056,9 +1085,11 @@ static void pb_content_info_cb(const struct ofono_error *error,
 	return;
 error:
 
-	if (cb && cbd) {
-		DBG("Error cbd=%p, pbd=%p, file_info=%p", cbd, pbd, file_info);
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	if (cbd){
+		void *pb = cbd->data;
+		g_free(cbd);
+		if(cb)
+			CALLBACK_WITH_FAILURE(cb, pb);
 	}
 }
 
@@ -1173,8 +1204,12 @@ static void pb_reference_data_cb(const struct ofono_error *error,
 	return;
 error:
 
-	if (cb && cbd)
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	if (cbd){
+		void *pb = cbd->data;
+		g_free(cbd);
+		if(cb)
+			CALLBACK_WITH_FAILURE(cb, pb);
+	}
 }
 
 static void pb_reference_info_cb(const struct ofono_error *error,
@@ -1225,8 +1260,12 @@ static void pb_reference_info_cb(const struct ofono_error *error,
 					pb_reference_data_cb, cbd);
 	return;
 error:
-	if (cb && cbd)
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	if (cbd){
+		void *pb = cbd->data;
+		g_free(cbd);
+		if(cb)
+			CALLBACK_WITH_FAILURE(cb, pb);
+	}
 }
 
 static void ril_export_entries(struct ofono_phonebook *pb,
@@ -1265,10 +1304,12 @@ static void ril_export_entries(struct ofono_phonebook *pb,
 
 error:
 
-	if (cb && cbd)
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
-
-	g_free(cbd);
+	if (cbd){
+		void *pb = cbd->data;
+		g_free(cbd);
+		if(cb)
+			CALLBACK_WITH_FAILURE(cb, pb);
+	}
 }
 
 static gboolean ril_delayed_register(gpointer user_data)
@@ -1316,7 +1357,7 @@ static struct ofono_phonebook_driver driver = {
 	.name				= "rilmodem",
 	.probe				= ril_phonebook_probe,
 	.remove				= ril_phonebook_remove,
-	.export_entries		= ril_export_entries
+	.export_entries			= ril_export_entries
 };
 
 void ril_phonebook_init(void)

ofono/drivers/rilmodem/radio-settings.c

@@ -75,7 +75,7 @@ static void ril_set_rat_mode(struct ofono_radio_settings *rs,
 	int pref = rd->ratmode;
 	int ret = 0;
 
-	ofono_info("setting rat mode:%d", mode);
+	ofono_info("rat mode set %d", mode);
 
 	parcel_init(&rilp);
 
@@ -116,6 +116,8 @@ static void ril_force_rat_mode(struct radio_data *rd, int pref)
 	if (pref == rd->ratmode)
 		return;
 
+	DBG("pref ril rat mode %d, ril current %d", pref, rd->ratmode);
+
 	parcel_init(&rilp);
 	parcel_w_int32(&rilp, 1);
 	parcel_w_int32(&rilp, rd->ratmode);
@@ -137,7 +139,7 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)
 
 	if (message->error == RIL_E_SUCCESS) {
 		ril_util_init_parcel(message, &rilp);
-		/*first item in int[] is len so let's skip that*/
+		/* first item in int[] is len so let's skip that */
 		parcel_r_int32(&rilp);
 		pref = parcel_r_int32(&rilp);
 
@@ -167,6 +169,7 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)
 		default:
 			break;
 		}
+		ofono_info("rat mode %d (ril %d)", mode, pref);
 		if (cb)
 			CALLBACK_WITH_SUCCESS(cb, mode, cbd->data);
 	} else {
@@ -287,6 +290,7 @@ static gboolean ril_get_net_config(struct radio_data *rsd)
 
 	storage_close(NULL, RIL_STORE, keyfile, TRUE);
 
+	DBG("needsconfig %d, rat mode %d", needsconfig, rsd->ratmode);
 	return needsconfig;
 }
 

ofono/drivers/rilmodem/rilutil.h

@@ -123,8 +123,12 @@ struct ofono_sim *get_sim();
 
 gint check_if_really_roaming(gint status);
 
+gboolean ril_roaming_allowed();
+
 gboolean check_if_ok_to_attach();
 
+gint get_current_network_status();
+
 void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps);
 
 struct cb_data {

ofono/drivers/rilmodem/sim.c

@@ -103,6 +103,7 @@ struct sim_data {
 	enum ofono_sim_password_type passwd_state;
 	guint card_state;
 	guint idle_id;
+	gboolean initialized;
 	gboolean removed;
 };
 
@@ -325,7 +326,7 @@ static void ril_file_io_cb(struct ril_msg *message, gpointer user_data)
 		decode_ril_error(&error, "OK");
 	} else {
 		ofono_error("RILD reply failure: %s",
-			    ril_error_to_string(message->error));
+				ril_error_to_string(message->error));
 		goto error;
 	}
 
@@ -561,8 +562,13 @@ static void configure_active_app(struct sim_data *sd,
 					guint index)
 {
 	sd->app_type = app->app_type;
+
+	g_free(sd->aid_str);
 	sd->aid_str = g_strdup(app->aid_str);
+
+	g_free(sd->app_str);
 	sd->app_str = g_strdup(app->app_str);
+
 	sd->app_index = index;
 
 	DBG("setting aid_str (AID) to: %s", sd->aid_str);
@@ -633,7 +639,7 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 
 	DBG("");
 
-	if (ril_util_parse_sim_status(sd->ril, message,	&status, apps) &&
+	if (ril_util_parse_sim_status(sd->ril, message, &status, apps) &&
 		status.num_apps) {
 
 		DBG("num_apps: %d gsm_umts_index: %d", status.num_apps,
@@ -701,8 +707,6 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 
 		if (current_online_state == RIL_ONLINE_PREF) {
 
-			parcel_init(&rilp);
-
 			parcel_init(&rilp);
 			parcel_w_int32(&rilp, 1);
 			parcel_w_int32(&rilp, 1);
@@ -735,6 +739,8 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 
 			if (current_passwd)
 				g_stpcpy(current_passwd, defaultpasswd);
+
+			sd->initialized = FALSE;
 		}
 	}
 
@@ -775,16 +781,81 @@ static void ril_query_pin_retries(struct ofono_sim *sim,
 	CALLBACK_WITH_SUCCESS(cb, sd->retries, data);
 }
 
+static void ril_query_passwd_state_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	struct ofono_sim *sim = cbd->user;
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	ofono_sim_passwd_cb_t cb = cbd->cb;
+	void *data = cbd->data;
+	struct sim_app *apps[MAX_UICC_APPS];
+	struct sim_status status;
+	guint i = 0;
+	guint search_index = -1;
+	gint state = ofono_sim_get_state(sim);
+
+	if (ril_util_parse_sim_status(sd->ril, message, &status, apps) &&
+		status.num_apps) {
+
+		DBG("num_apps: %d gsm_umts_index: %d", status.num_apps,
+			status.gsm_umts_index);
+
+		/* TODO(CDMA): need some kind of logic to
+		 * set the correct app_index,
+		 */
+		search_index = status.gsm_umts_index;
+
+		for (i = 0; i < status.num_apps; i++) {
+			if (i == search_index &&
+				apps[i]->app_type != RIL_APPTYPE_UNKNOWN) {
+				current_active_app = apps[i]->app_type;
+				configure_active_app(sd, apps[i], i);
+				set_pin_lock_state(sim, apps[i]);
+				break;
+			}
+		}
+		ril_util_free_sim_apps(apps, status.num_apps);
+	}
+	DBG("passwd_state %u", sd->passwd_state);
+
+	/* if pin code required cannot be initialized yet*/
+	if (sd->passwd_state == OFONO_SIM_PASSWORD_SIM_PIN)
+		sd->initialized = FALSE;
+	/*
+	 * To prevent double call to sim_initialize_after_pin from
+	 * sim_pin_query_cb we must prevent calling sim_pin_query_cb
+	 * when !OFONO_SIM_STATE_READY && OFONO_SIM_PASSWORD_NONE
+	*/
+	if ((state == OFONO_SIM_STATE_READY) || (sd->initialized == FALSE) ||
+				(sd->passwd_state != OFONO_SIM_PASSWORD_NONE)){
+
+		if (sd->passwd_state == OFONO_SIM_PASSWORD_NONE)
+			sd->initialized = TRUE;
+
+		if (state == OFONO_SIM_STATE_LOCKED_OUT)
+			sd->initialized = FALSE;
+
+		if (sd->passwd_state == OFONO_SIM_PASSWORD_INVALID)
+			CALLBACK_WITH_FAILURE(cb, -1, data);
+		else
+			CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
+	}
+
+}
+
 static void ril_query_passwd_state(struct ofono_sim *sim,
 					ofono_sim_passwd_cb_t cb, void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
-	DBG("passwd_state %u", sd->passwd_state);
+	struct cb_data *cbd = cb_data_new2(sim, cb, data);
+	int request = RIL_REQUEST_GET_SIM_STATUS;
+	guint ret;
+
+	ret = g_ril_send(sd->ril, request,
+			NULL, 0, ril_query_passwd_state_cb, cbd, g_free);
+
+	g_ril_print_request_no_args(sd->ril, ret, request);
 
-	if (sd->passwd_state == OFONO_SIM_PASSWORD_INVALID)
-		CALLBACK_WITH_FAILURE(cb, -1, data);
-	else
-		CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
 }
 
 static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
@@ -1108,14 +1179,6 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 
 	sd = g_new0(struct sim_data, 1);
 	sd->ril = g_ril_clone(ril);
-	sd->aid_str = NULL;
-	sd->app_str = NULL;
-	sd->app_type = RIL_APPTYPE_UNKNOWN;
-	sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
-	sd->passwd_type = OFONO_SIM_PASSWORD_NONE;
-	sd->sim_registered = FALSE;
-	sd->card_state = RIL_CARDSTATE_ABSENT;
-	sd->removed = FALSE;
 
 	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
 		sd->retries[i] = -1;

ofono/drivers/rilmodem/sms.c

@@ -139,7 +139,7 @@ static void ril_csca_query_cb(struct ril_msg *message, gpointer user_data)
 		sca.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0';
 
 		DBG("csca_query_cb: %s, %d", sca.number, sca.type);
-
+		g_free(temp_buf); /*g_utf16_to_utf8 used by parcel_r_string*/
 		cb(&error, &sca, cbd->data);
 	} else {
 		ofono_error("return value invalid");
@@ -242,6 +242,8 @@ static void ril_cmgs(struct ofono_sms *sms, const unsigned char *pdu,
 				submit_sms_cb, cbd, g_free);
 
 	g_ril_append_print_buf(sd->ril, "(%s)", tpdu);
+	g_free(tpdu);
+	tpdu = NULL;
 	g_ril_print_request(sd->ril, ret, request);
 
 	parcel_free(&rilp);
@@ -299,6 +301,9 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 	long ril_buf_len;
 	guchar *ril_data;
 
+	ril_pdu = NULL;
+	ril_data = NULL;
+
 	DBG("req: %d; data_len: %d", message->req, message->buf_len);
 
 	switch (message->req) {
@@ -331,6 +336,8 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 	ofono_info("sms received, smsc_len is %d", smsc_len);
 
 	g_ril_append_print_buf(sd->ril, "(%s)", ril_pdu);
+	g_free(ril_pdu);
+	ril_pdu = NULL;
 	g_ril_print_unsol(sd->ril, message);
 
 	if (message->req == RIL_UNSOL_RESPONSE_NEW_SMS) {
@@ -343,11 +350,20 @@ static void ril_sms_notify(struct ril_msg *message, gpointer user_data)
 						ril_buf_len - smsc_len);
 	}
 
+	g_free(ril_data);
+	ril_data = NULL;
+
 	ril_ack_delivery(sms, TRUE);
 
 	return;
 
 error:
+	g_free(ril_pdu);
+	ril_pdu = NULL;
+
+	g_free(ril_data);
+	ril_data = NULL;
+
 	ril_ack_delivery(sms, FALSE);
 
 	ofono_error("Unable to parse NEW_SMS notification");

ofono/drivers/rilmodem/stk.c

@@ -81,11 +81,12 @@ static void ril_stk_envelope(struct ofono_stk *stk, int length,
 	DBG("");
 
 	hex_envelope = encode_hex(command, length, 0);
-
 	DBG("rilmodem envelope: %s", hex_envelope);
 
 	parcel_init(&rilp);
 	parcel_w_string(&rilp, hex_envelope);
+	g_free(hex_envelope);
+	hex_envelope = NULL;
 
 	ret = g_ril_send(sd->ril, request,
 				rilp.data, rilp.size, ril_envelope_cb,
@@ -132,11 +133,12 @@ static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
 	DBG("");
 
 	hex_tr = encode_hex(resp, length, 0);
-
 	DBG("rilmodem terminal response: %s", hex_tr);
 
 	parcel_init(&rilp);
 	parcel_w_string(&rilp, hex_tr);
+	g_free(hex_tr);
+	hex_tr = NULL;
 
 	ret = g_ril_send(sd->ril, request,
 				rilp.data, rilp.size, ril_tr_cb,
@@ -194,7 +196,9 @@ static void ril_stk_pcmd_notify(struct ril_msg *message, gpointer user_data)
 			strlen(pcmd),
 			&len, -1);
 
+	g_free(pcmd);
 	ofono_stk_proactive_command_notify(stk, len, (const guchar *)pdu);
+	g_free(pdu);
 }
 
 static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
@@ -211,13 +215,14 @@ static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
 	ril_util_init_parcel(message, &rilp);
 	pcmd = parcel_r_string(&rilp);
 	DBG("pcmd: %s", pcmd);
-
 	pdu = decode_hex((const char *) pcmd,
 			strlen(pcmd),
 			&len, -1);
-
+	g_free(pcmd);
+	pcmd = NULL;
 	ofono_stk_proactive_command_handled_notify(stk, len,
 			(const guchar *)pdu);
+	g_free(pdu);
 }
 
 static void ril_stk_session_end_notify(struct ril_msg *message,

ofono/drivers/rilmodem/ussd.c

@@ -68,7 +68,7 @@ static void ril_ussd_request(struct ofono_ussd *ussd, int dcs,
 	enum sms_charset charset;
 	int ret = -1;
 
-	ofono_info("send ussd");
+	ofono_info("send ussd, len:%d", len);
 
 	if (cbs_dcs_decode(dcs, NULL, NULL, &charset,
 					NULL, NULL, NULL)) {
@@ -167,9 +167,9 @@ static void ril_ussd_notify(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_ussd *ussd = user_data;
 	struct parcel rilp;
-	gchar *ussd_from_network;
-	gchar *type;
-	gint ussdtype;
+	gchar *ussd_from_network = NULL;
+	gchar *type = NULL;
+	gint ussdtype = 0;
 
 	ofono_info("ussd_received");
 
@@ -177,13 +177,17 @@ static void ril_ussd_notify(struct ril_msg *message, gpointer user_data)
 	parcel_r_int32(&rilp);
 	type = parcel_r_string(&rilp);
 	ussdtype = g_ascii_xdigit_value(*type);
+	g_free(type);
+	type = NULL;
 	ussd_from_network = parcel_r_string(&rilp);
 
-	if (ussd_from_network)
+	/* ussd_from_network not freed because core does that if dcs is 0xFF */
+	if (ussd_from_network) {
+		DBG("ussd_received, length %d", strlen(ussd_from_network));
 		ofono_ussd_notify(ussd, ussdtype, 0xFF,
 			(const unsigned char *)ussd_from_network,
 			strlen(ussd_from_network));
-	else
+	} else
 		ofono_ussd_notify(ussd, ussdtype, 0, NULL, 0);
 
 	return;

ofono/drivers/rilmodem/voicecall.c

@@ -45,9 +45,7 @@
 
 /* Amount of ms we wait between CLCC calls */
 #define POLL_CLCC_INTERVAL 300
-
 #define FLAG_NEED_CLIP 1
-
 #define MAX_DTMF_BUFFER 32
 
 struct voicecall_data {
@@ -384,15 +382,17 @@ static void ril_dial(struct ofono_voicecall *vc,
 	struct parcel rilp;
 	int request = RIL_REQUEST_DIAL;
 	int ret;
+	char *phstr = NULL;
 
-	ofono_info("dialing");
+	phstr = (char *) phone_number_to_string(ph);
+	ofono_info("dialing \"%s\"", phstr);
 
 	cbd->user = vc;
 
 	parcel_init(&rilp);
 
 	/* Number to dial */
-        parcel_w_string(&rilp, (char *) phone_number_to_string(ph));
+	parcel_w_string(&rilp, phstr);
 	/* CLIR mode */
 	parcel_w_int32(&rilp, clir);
 	/* USS, need it twice for absent */
@@ -525,6 +525,7 @@ static void ril_ss_notify(struct ril_msg *message, gpointer user_data)
 				strncpy(number.number, tmp_number,
 					OFONO_MAX_PHONE_NUMBER_LENGTH);
 
+			g_free(tmp_number);
 			DBG("RIL data: MT/MO: %i, code: %i, index: %i",
 				notification_type, code, index);
 		break;

ofono/gril/gril.c

@@ -85,6 +85,7 @@ struct ril_s {
 	guint next_cmd_id;			/* Next command id */
 	guint next_notify_id;			/* Next notify id */
 	guint next_gid;				/* Next group id */
+	int sk;					/* Socket */
 	GRilIO *io;				/* GRil IO */
 	GQueue *command_queue;			/* Command queue */
 	GQueue *out_queue;			/* Commands sent/been sent */
@@ -786,6 +787,7 @@ static void ril_unref(struct ril_s *ril)
 		g_ril_io_unref(ril->io);
 		ril->io = NULL;
 		ril_cleanup(ril);
+		close(ril->sk);
 	}
 
 	if (ril->in_read_handler)
@@ -810,7 +812,6 @@ static struct ril_s *create_ril()
 {
 	struct ril_s *ril;
 	struct sockaddr_un addr;
-	int sk;
 	GIOChannel *io;
 	GKeyFile *keyfile;
 	char **subscriptions = NULL;
@@ -831,8 +832,8 @@ static struct ril_s *create_ril()
 	ril->trace = FALSE;
 	ril->connected = FALSE;
 
-	sk = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (sk < 0) {
+	ril->sk = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (ril->sk < 0) {
 		ofono_error("create_ril: can't create unix socket: %s (%d)\n",
 				strerror(errno), errno);
 		goto error;
@@ -842,13 +843,13 @@ static struct ril_s *create_ril()
 	addr.sun_family = AF_UNIX;
 	strncpy(addr.sun_path, RILD_CMD_SOCKET, sizeof(addr.sun_path) - 1);
 
-	if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+	if (connect(ril->sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 		ofono_error("create_ril: can't connect to RILD: %s (%d)\n",
 				strerror(errno), errno);
 		goto error;
 	}
 
-	io = g_io_channel_unix_new(sk);
+	io = g_io_channel_unix_new(ril->sk);
 	if (io == NULL) {
 		ofono_error("create_ril: can't connect to RILD: %s (%d)\n",
 				strerror(errno), errno);

ofono/gril/grilio.c

@@ -73,6 +73,7 @@ static void read_watcher_destroy_notify(gpointer user_data)
 	io->read_handler = NULL;
 	io->read_data = NULL;
 
+	g_io_channel_unref(io->channel);
 	io->channel = NULL;
 
 	if (io->destroyed)

ofono/gril/grilreply.c

@@ -159,19 +159,8 @@ struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
 
 	}
 
-	/* TODO:
-	 * RILD can return multiple addresses; oFono only supports
-	 * setting a single IPv4 address.  At this time, we only
-	 * use the first address.  It's possible that a RIL may
-	 * just specify the end-points of the point-to-point
-	 * connection, in which case this code will need to
-	 * changed to handle such a device.
-	 *
-	 * For now split into a maximum of three, and only use
-	 * the first address for the remaining operations.
-	 */
 	if (raw_ip_addrs)
-		reply->ip_addrs = g_strsplit(raw_ip_addrs, " ", 3);
+		reply->ip_addrs = g_strsplit(raw_ip_addrs, " ", -1);
 	else
 		reply->ip_addrs = NULL;
 
@@ -191,7 +180,7 @@ struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
 	 * setting a single IPv4 gateway.
 	 */
 	if (raw_gws)
-		reply->gateways = g_strsplit(raw_gws, " ", 3);
+		reply->gateways = g_strsplit(raw_gws, " ", -1);
 	else
 		reply->gateways = NULL;
 
@@ -203,7 +192,7 @@ struct reply_setup_data_call *g_ril_reply_parse_data_call(GRil *gril,
 
 	/* Split DNS addresses */
 	if (dnses)
-		reply->dns_addresses = g_strsplit(dnses, " ", 3);
+		reply->dns_addresses = g_strsplit(dnses, " ", -1);
 	else
 		reply->dns_addresses = NULL;
 

ofono/gril/grilunsol.c

@@ -77,6 +77,58 @@ void g_ril_unsol_free_data_call_list(struct unsol_data_call_list *unsol)
 	}
 }
 
+gboolean g_ril_unsol_cmp_dcl(struct unsol_data_call_list *current,
+				struct unsol_data_call_list *old,
+				gint cid)
+{
+	GSList *nl,*ol;
+	struct data_call *new_call, *old_call;
+
+	new_call = old_call = NULL;
+	gboolean no_cid = TRUE;
+
+
+	if (!current || !old)
+		return FALSE;
+
+	if (current->num != old->num)
+		return FALSE;
+
+	for (nl = current->call_list; nl; nl = nl->next) {
+		new_call = (struct data_call *) nl->data;
+
+		if (new_call->cid != cid)
+			continue;
+
+		for (ol = old->call_list; ol; ol = ol->next) {
+			old_call = (struct data_call *) ol->data; 
+			if(new_call->cid == old_call->cid) {
+				no_cid = FALSE;
+				break;
+			}
+		}
+		if (no_cid)
+			return FALSE;
+
+		if (new_call->active != old_call->active)
+			return FALSE;
+		if (g_strcmp0(new_call->type,old_call->type))
+			return FALSE;
+		if (g_strcmp0(new_call->ifname,old_call->ifname))
+			return FALSE;
+		if (g_strcmp0(new_call->addresses,old_call->addresses))
+			return FALSE;
+		if (g_strcmp0(new_call->dnses,old_call->dnses))
+			return FALSE;
+		if (g_strcmp0(new_call->gateways,old_call->gateways))
+			return FALSE;
+	}
+	if (no_cid)
+		return FALSE;
+
+	return TRUE;
+}
+
 struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
 					struct ril_msg *message,
 					struct ofono_error *error)

ofono/gril/grilunsol.h

@@ -51,6 +51,9 @@ struct data_call {
 
 void g_ril_unsol_free_data_call_list(struct unsol_data_call_list *unsol);
 
+gboolean g_ril_unsol_cmp_dcl(struct unsol_data_call_list *current,
+				struct unsol_data_call_list *old, gint cid);
+
 struct unsol_data_call_list *g_ril_unsol_parse_data_call_list(GRil *gril,
 					struct ril_msg *message,
 					struct ofono_error *error);

ofono/include/gprs-context.h

@@ -117,6 +117,10 @@ void ofono_gprs_context_set_ipv6_gateway(struct ofono_gprs_context *gc,
 						const char *gateway);
 void ofono_gprs_context_set_ipv6_dns_servers(struct ofono_gprs_context *gc,
 						const char **dns);
+
+void ofono_gprs_context_signal_change(struct ofono_gprs_context *gc,
+							unsigned int cid);
+
 #ifdef __cplusplus
 }
 #endif

ofono/include/gprs.h

@@ -78,6 +78,8 @@ void ofono_gprs_set_cid_range(struct ofono_gprs *gprs,
 void ofono_gprs_add_context(struct ofono_gprs *gprs,
 				struct ofono_gprs_context *gc);
 
+struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs);
+
 #ifdef __cplusplus
 }
 #endif

ofono/plugins/hfp_hf_bluez5.c

@@ -49,6 +49,7 @@
 #include <ofono/handsfree.h>
 #include <ofono/handsfree-audio.h>
 #include <ofono/siri.h>
+#include <ofono.h>
 
 #include <drivers/atmodem/atutil.h>
 #include <drivers/hfpmodem/slc.h>
@@ -762,6 +763,8 @@ static int hfp_init(void)
 	if (DBUS_TYPE_UNIX_FD < 0)
 		return -EBADF;
 
+	__ofono_handsfree_audio_manager_init();
+
 	/* Registers External Profile handler */
 	if (!g_dbus_register_interface(conn, HFP_EXT_PROFILE_PATH,
 					BLUEZ_PROFILE_INTERFACE,
@@ -817,6 +820,8 @@ static void hfp_exit(void)
 	g_dbus_client_unref(bluez);
 
 	ofono_handsfree_audio_unref();
+
+	__ofono_handsfree_audio_manager_cleanup();
 }
 
 OFONO_PLUGIN_DEFINE(hfp_bluez5, "External Hands-Free Profile Plugin", VERSION,

ofono/plugins/ril.c

@@ -402,12 +402,14 @@ static void ril_connected(struct ril_msg *message, gpointer user_data)
 
 	struct ofono_modem *modem = (struct ofono_modem *) user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
+	int ril_version = 0;
+	struct parcel rilp;
 
-	/* TODO: make conditional */
-	ofono_debug("[UNSOL]< %s", ril_unsol_request_to_string(message->req));
-	/* TODO: make conditional */
+	ril_util_init_parcel(message, &rilp);
+	ril_version = parcel_r_int32(&rilp);
+	ofono_debug("[UNSOL]< %s, RIL_VERSION %d",
+			ril_unsol_request_to_string(message->req), ril_version);
 
-	/* TODO: need a disconnect function to restart things! */
 	ril->connected = TRUE;
 
 	send_get_sim_status(modem);
@@ -430,8 +432,7 @@ static gboolean ril_re_init(gpointer user_data)
 
 static void gril_disconnected(gpointer user_data)
 {
-	/* Signal clients modem going down
-	 */
+	ofono_info("gril disconnected");
 	struct ofono_modem *modem = user_data;
 	DBusConnection *conn = ofono_dbus_get_connection();
 
@@ -539,6 +540,10 @@ static int ril_disable(struct ofono_modem *modem)
 
 	parcel_free(&rilp);
 
+	/* this will trigger the cleanup of g_io_channel */
+	g_ril_unref(ril->modem);
+	ril->modem = NULL;
+
 	return 0;
 }
 

ofono/src/gprs.c

@@ -58,6 +58,7 @@
 #define MAX_CONTEXTS 256
 #define SUSPEND_TIMEOUT 8
 #define MAX_MMS_MTU 1280
+#define MAX_GPRS_MTU 1280
 
 /* 27.007 Section 7.29 */
 enum packet_bearer {
@@ -150,6 +151,8 @@ struct pri_context {
 
 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,
+						struct pri_context *context);
 
 static GSList *g_drivers = NULL;
 static GSList *g_context_drivers = NULL;
@@ -560,13 +563,16 @@ static void pri_context_signal_settings(struct pri_context *ctx,
 				context_settings_append_ipv6);
 }
 
-static void pri_parse_proxy(struct pri_context *ctx, const char *proxy)
+static gboolean pri_parse_proxy(struct pri_context *ctx, const char *proxy)
 {
 	char *scheme, *host, *port, *path;
 
+	if (proxy[0] == 0)
+		return FALSE;
+
 	scheme = g_strdup(proxy);
 	if (scheme == NULL)
-		return;
+		return FALSE;
 
 	host = strstr(scheme, "://");
 	if (host != NULL) {
@@ -579,7 +585,7 @@ static void pri_parse_proxy(struct pri_context *ctx, const char *proxy)
 			ctx->proxy_port = 80;
 		else {
 			g_free(scheme);
-			return;
+			return FALSE;
 		}
 	} else {
 		host = scheme;
@@ -601,10 +607,16 @@ static void pri_parse_proxy(struct pri_context *ctx, const char *proxy)
 		}
 	}
 
+	if (host[0] == 0) {
+		g_free(scheme);
+		return FALSE;
+	}
+
 	g_free(ctx->proxy_host);
 	ctx->proxy_host = g_strdup(host);
 
 	g_free(scheme);
+	return TRUE;
 }
 
 static void pri_ifupdown(const char *interface, ofono_bool_t active)
@@ -690,11 +702,16 @@ static void pri_setproxy(const char *interface, const char *proxy)
 {
 	struct rtentry rt;
 	struct sockaddr_in addr;
+	in_addr_t proxy_addr;
 	int sk;
 
 	if (interface == NULL)
 		return;
 
+	proxy_addr = inet_addr(proxy);
+	if (proxy_addr == INADDR_NONE)
+		return;
+
 	sk = socket(PF_INET, SOCK_DGRAM, 0);
 	if (sk < 0)
 		return;
@@ -705,7 +722,7 @@ static void pri_setproxy(const char *interface, const char *proxy)
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
-	addr.sin_addr.s_addr = inet_addr(proxy);
+	addr.sin_addr.s_addr = proxy_addr;
 	memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
 
 	memset(&addr, 0, sizeof(addr));
@@ -792,7 +809,8 @@ static void pri_update_mms_context_settings(struct pri_context *ctx)
 	if (ctx->message_proxy)
 		settings->ipv4->proxy = g_strdup(ctx->message_proxy);
 
-	pri_parse_proxy(ctx, ctx->message_proxy);
+	if (!pri_parse_proxy(ctx, ctx->message_proxy))
+		pri_parse_proxy(ctx, ctx->message_center);
 
 	DBG("proxy %s port %u", ctx->proxy_host, ctx->proxy_port);
 
@@ -804,6 +822,185 @@ static void pri_update_mms_context_settings(struct pri_context *ctx)
 	pri_limit_mtu(settings->interface, MAX_MMS_MTU);
 }
 
+static gboolean pri_str_changed(const char *val, const char *newval)
+{
+	return newval ? (strcmp(val, newval) != 0) : (val[0] != 0);
+}
+
+static gboolean pri_str_update(char *val, const char *newval)
+{
+	if (newval) {
+		if (strcmp(val, newval)) {
+			strcpy(val, newval);
+			return TRUE;
+		}
+	} else {
+		if (val[0]) {
+			val[0] = 0;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+static void pri_str_signal_change(struct pri_context *ctx,
+					const char *name, const char *value)
+{
+	ofono_dbus_signal_property_changed(ofono_dbus_get_connection(),
+			ctx->path, OFONO_CONNECTION_CONTEXT_INTERFACE,
+					name, DBUS_TYPE_STRING, &value);
+}
+
+static void pri_reset_context_properties(struct pri_context *ctx,
+				const struct ofono_gprs_provision_data *ap)
+{
+	struct ofono_gprs *gprs = ctx->gprs;
+	gboolean changed = FALSE;
+
+	DBG("%s", ctx->path);
+
+	if (strcmp(ctx->context.apn, ap->apn)) {
+		changed = TRUE;
+		strcpy(ctx->context.apn, ap->apn);
+		pri_str_signal_change(ctx, "AccessPointName", ap->apn);
+	}
+
+	if (ap->name && strncmp(ctx->name, ap->name, MAX_CONTEXT_NAME_LENGTH)) {
+		changed = TRUE;
+		strncpy(ctx->name, ap->name, MAX_CONTEXT_NAME_LENGTH);
+		pri_str_signal_change(ctx, "Name", ap->name);
+	}
+
+	if (pri_str_update(ctx->context.username, ap->username)) {
+		changed = TRUE;
+		pri_str_signal_change(ctx, "Username", ap->username);
+	}
+
+	if (pri_str_update(ctx->context.password, ap->password)) {
+		changed = TRUE;
+		pri_str_signal_change(ctx, "Password", ap->password);
+	}
+
+	if (ctx->context.proto != ap->proto) {
+		ctx->context.proto = ap->proto;
+		changed = TRUE;
+		pri_str_signal_change(ctx, "Protocol",
+					gprs_proto_to_string(ap->proto));
+	}
+
+	if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
+		if (pri_str_update(ctx->message_proxy, ap->message_proxy)) {
+			changed = TRUE;
+			pri_str_signal_change(ctx, "MessageProxy",
+							ap->message_proxy);
+		}
+
+		if (pri_str_update(ctx->message_center, ap->message_center)) {
+			changed = TRUE;
+			pri_str_signal_change(ctx, "MessageCenter",
+							ap->message_center);
+		}
+	}
+
+	if (gprs->settings && changed) {
+		write_context_settings(gprs, ctx);
+		storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings);
+	}
+}
+
+static gboolean ap_valid(const struct ofono_gprs_provision_data *ap)
+{
+	if (!ap->apn || strlen(ap->apn) > OFONO_GPRS_MAX_APN_LENGTH ||
+							!is_valid_apn(ap->apn))
+		return FALSE;
+
+	if (ap->username &&
+			strlen(ap->username) > OFONO_GPRS_MAX_USERNAME_LENGTH)
+		return FALSE;
+
+	if (ap->password &&
+			strlen(ap->password) > OFONO_GPRS_MAX_PASSWORD_LENGTH)
+		return FALSE;
+
+	if (ap->message_proxy &&
+			strlen(ap->message_proxy) > MAX_MESSAGE_PROXY_LENGTH)
+		return FALSE;
+
+	if (ap->message_center &&
+			strlen(ap->message_center) > MAX_MESSAGE_CENTER_LENGTH)
+		return FALSE;
+
+	return TRUE;
+}
+
+static gboolean pri_deactivation_required(struct pri_context *ctx,
+				const struct ofono_gprs_provision_data *ap)
+{
+	if (ctx->context.proto != ap->proto)
+		return TRUE;
+
+	if (strcmp(ctx->context.apn, ap->apn))
+		return TRUE;
+
+	if (pri_str_changed(ctx->context.username, ap->username))
+		return TRUE;
+
+	if (pri_str_changed(ctx->context.password, ap->password))
+		return TRUE;
+
+	if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
+		if (pri_str_changed(ctx->message_proxy, ap->message_proxy))
+			return TRUE;
+
+		if (pri_str_changed(ctx->message_center, ap->message_center))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static DBusMessage *pri_provision_context(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	struct pri_context *ctx = data;
+	struct ofono_gprs *gprs = ctx->gprs;
+	struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
+	struct ofono_sim *sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);
+	struct ofono_gprs_provision_data *settings;
+	DBusMessage *reply = NULL;
+	int i, count = 0;
+
+	if (sim == NULL)
+		return __ofono_error_failed(msg);
+
+	if (__ofono_gprs_provision_get_settings(ofono_sim_get_mcc(sim),
+				ofono_sim_get_mnc(sim), ofono_sim_get_spn(sim),
+						 &settings, &count) == FALSE)
+		return __ofono_error_failed(msg);
+
+	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)) {
+				/* Re-provision the context */
+				pri_reset_context_properties(ctx, ap);
+				reply =  dbus_message_new_method_return(msg);
+			} else {
+				/* Othwise context must be deactivated first */
+				if (ctx->gprs->pending || ctx->pending)
+					reply = __ofono_error_busy(msg);
+			}
+			break;
+		}
+	}
+
+	__ofono_gprs_provision_free_settings(settings, count);
+
+	return reply ? reply : __ofono_error_not_available(msg);
+}
+
 static void append_context_properties(struct pri_context *ctx,
 					DBusMessageIter *dict)
 {
@@ -909,6 +1106,9 @@ static void pri_activate_callback(const struct ofono_error *error, void *data)
 
 		pri_context_signal_settings(ctx, gc->settings->ipv4 != NULL,
 						gc->settings->ipv6 != NULL);
+
+		if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET)
+			pri_limit_mtu(gc->settings->interface, MAX_GPRS_MTU);
 	}
 
 	value = ctx->active;
@@ -1318,6 +1518,8 @@ static const GDBusMethodTable context_methods[] = {
 	{ GDBUS_ASYNC_METHOD("SetProperty",
 			GDBUS_ARGS({ "property", "s" }, { "value", "v" }),
 			NULL, pri_set_property) },
+	{ GDBUS_METHOD("ProvisionContext", NULL, NULL,
+			pri_provision_context) },
 	{ }
 };
 
@@ -2546,6 +2748,29 @@ void ofono_gprs_context_set_ipv6_dns_servers(struct ofono_gprs_context *gc,
 	settings->ipv6->dns = g_strdupv((char **) dns);
 }
 
+void ofono_gprs_context_signal_change(struct ofono_gprs_context *gc,
+							unsigned int cid)
+{
+	GSList *l;
+	struct pri_context *ctx;
+
+	if (gc->gprs == NULL)
+		return;
+
+	for (l = gc->gprs->contexts; l; l = l->next) {
+		ctx = l->data;
+
+		if (ctx->context.cid != cid)
+			continue;
+
+		if (ctx->active == FALSE)
+			break;
+
+		pri_context_signal_settings(ctx, gc->settings->ipv4 != NULL,
+						gc->settings->ipv6 != NULL);
+	}
+}
+
 int ofono_gprs_driver_register(const struct ofono_gprs_driver *d)
 {
 	DBG("driver: %p, name: %s", d, d->name);
@@ -3134,3 +3359,8 @@ void *ofono_gprs_get_data(struct ofono_gprs *gprs)
 {
 	return gprs->driver_data;
 }
+
+struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs)
+{
+	return __ofono_atom_get_modem(gprs->atom);
+}

ofono/src/main.c

@@ -244,7 +244,11 @@ int main(int argc, char **argv)
 
 	__ofono_manager_init();
 
-	__ofono_handsfree_audio_manager_init();
+	/*
+	 * BT HFP SCO socket creation moved to Bluez5 plugin.
+	 * Bluez4 handles the SCO socket, it will conflict with oFono.
+	 */
+	//__ofono_handsfree_audio_manager_init();
 
 	__ofono_plugin_init(option_plugin, option_noplugin);
 
@@ -255,7 +259,7 @@ int main(int argc, char **argv)
 
 	__ofono_plugin_cleanup();
 
-	__ofono_handsfree_audio_manager_cleanup();
+	//__ofono_handsfree_audio_manager_cleanup(); See comment above
 
 	__ofono_manager_cleanup();
 

ofono/src/modem.c

@@ -414,7 +414,9 @@ static void flush_atoms(struct ofono_modem *modem, enum modem_state new_state)
 	while (cur) {
 		struct ofono_atom *atom = cur->data;
 
-		if (atom->modem_state <= new_state) {
+		/* in case we are powering off the modem, flush everything */
+		if (atom->modem_state <= new_state &&
+			new_state > MODEM_STATE_POWER_OFF) {
 			prev = cur;
 			cur = cur->next;
 			continue;

ofono/src/network.c

@@ -934,6 +934,40 @@ static void append_operator_struct_list(struct ofono_netreg *netreg,
 	dbus_free_string_array(children);
 }
 
+static void network_signal_operators_changed(struct ofono_netreg *netreg)
+{
+	const char *path = __ofono_atom_get_path(netreg->atom);
+	DBusConnection *conn = ofono_dbus_get_connection();
+	DBusMessage *signal;
+	DBusMessageIter iter;
+	DBusMessageIter array;
+
+	signal = dbus_message_new_signal(path,
+		OFONO_NETWORK_REGISTRATION_INTERFACE, "OperatorsChanged");
+	if (signal == NULL) {
+		ofono_error("Unable to allocate new "
+					OFONO_NETWORK_REGISTRATION_INTERFACE
+					".OperatorsChanged signal");
+		return;
+	}
+
+	dbus_message_iter_init_append(signal, &iter);
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+					DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+					DBUS_TYPE_OBJECT_PATH_AS_STRING
+					DBUS_TYPE_ARRAY_AS_STRING
+					DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+					DBUS_TYPE_STRING_AS_STRING
+					DBUS_TYPE_VARIANT_AS_STRING
+					DBUS_DICT_ENTRY_END_CHAR_AS_STRING
+					DBUS_STRUCT_END_CHAR_AS_STRING,
+					&array);
+	append_operator_struct_list(netreg, &array);
+	dbus_message_iter_close_container(&iter, &array);
+
+	g_dbus_send_message(conn, signal);
+}
+
 static void operator_list_callback(const struct ofono_error *error, int total,
 				const struct ofono_network_operator *list,
 				void *data)
@@ -942,6 +976,7 @@ static void operator_list_callback(const struct ofono_error *error, int total,
 	DBusMessage *reply;
 	DBusMessageIter iter;
 	DBusMessageIter array;
+	gboolean changed;
 
 	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
 		DBG("Error occurred during operator list");
@@ -950,7 +985,7 @@ static void operator_list_callback(const struct ofono_error *error, int total,
 		return;
 	}
 
-	update_operator_list(netreg, total, list);
+	changed = update_operator_list(netreg, total, list);
 
 	reply = dbus_message_new_method_return(netreg->pending);
 
@@ -970,6 +1005,11 @@ static void operator_list_callback(const struct ofono_error *error, int total,
 	dbus_message_iter_close_container(&iter, &array);
 
 	__ofono_dbus_pending_reply(&netreg->pending, reply);
+
+	DBG("operator list %schanged", changed ? "" : "not ");
+
+	if (changed)
+		network_signal_operators_changed(netreg);
 }
 
 static DBusMessage *network_scan(DBusConnection *conn,
@@ -1041,6 +1081,8 @@ static const GDBusMethodTable network_registration_methods[] = {
 static const GDBusSignalTable network_registration_signals[] = {
 	{ GDBUS_SIGNAL("PropertyChanged",
 			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+	{ GDBUS_SIGNAL("OperatorsChanged",
+			GDBUS_ARGS({ "operators", "a(oa{sv})"})) },
 	{ }
 };
 

ofono/src/smsutil.c

@@ -524,7 +524,8 @@ static gboolean encode_validity_period(const struct sms_validity_period *vp,
 gboolean sms_encode_address_field(const struct sms_address *in, gboolean sc,
 					unsigned char *pdu, int *offset)
 {
-	size_t len = strlen(in->address);
+	const char *addr = (const char *)&in->address;
+	size_t len = strlen(addr);
 	unsigned char addr_len = 0;
 	unsigned char p[10];
 
@@ -546,13 +547,19 @@ gboolean sms_encode_address_field(const struct sms_address *in, gboolean sc,
 		unsigned char *gsm;
 		unsigned char *r;
 
-		if (len > 11)
+		/* TP-OA's 10 octets transport 11 8-bit chars */
+		if (g_utf8_strlen(addr, strlen(addr)) > 11)
 			return FALSE;
 
 		gsm = convert_utf8_to_gsm(in->address, len, NULL, &written, 0);
 		if (gsm == NULL)
 			return FALSE;
 
+		if (written > 11) {
+			g_free(gsm);
+			return FALSE;
+		}
+
 		r = pack_7bit_own_buf(gsm, written, 0, FALSE, &packed, 0, p);
 
 		g_free(gsm);
@@ -675,7 +682,11 @@ gboolean sms_decode_address_field(const unsigned char *pdu, int len,
 		if (utf8 == NULL)
 			return FALSE;
 
-		if (strlen(utf8) > 20) {
+		/*
+		 * TP-OA's 10 octets transport 11 8-bit chars,
+		 * 22 bytes+terminator in UTF-8.
+		 */
+		if (strlen(utf8) > 22) {
 			g_free(utf8);
 			return FALSE;
 		}

ofono/src/smsutil.h

@@ -220,7 +220,11 @@ enum cbs_geo_scope {
 struct sms_address {
 	enum sms_number_type number_type;
 	enum sms_numbering_plan numbering_plan;
-	char address[21]; /* Max 20 in semi-octet, 11 in alnum */
+	/*
+	 * An alphanum TP-OA is 10 7-bit coded octets, which can carry
+	 * 11 8-bit characters. 22 bytes + terminator in UTF-8.
+	 */
+	char address[23];
 };
 
 struct sms_scts {

ofono/src/voicecall.c

@@ -1502,6 +1502,19 @@ static void manager_dial_callback(const struct ofono_error *error, void *data)
 		if (is_emergency_number(vc, number) == TRUE)
 			__ofono_modem_dec_emergency_mode(modem);
 
+		if (vc->settings) {
+			/*Save the last dialled number for HFP AT+BLDN*/
+			if (number) {
+				g_key_file_set_string(vc->settings,
+							SETTINGS_GROUP,
+							"Number", number);
+
+				storage_sync(vc->imsi, SETTINGS_STORE,
+						vc->settings);
+			}
+
+		}
+
 		reply = __ofono_error_failed(vc->pending);
 	}
 
@@ -1545,12 +1558,6 @@ static int voicecall_dial(struct ofono_voicecall *vc, const char *number,
 
 	string_to_phone_number(number, &ph);
 
-	if (vc->settings) {
-		g_key_file_set_string(vc->settings, SETTINGS_GROUP,
-					"Number", number);
-		storage_sync(vc->imsi, SETTINGS_STORE, vc->settings);
-	}
-
 	vc->driver->dial(vc, &ph, clir, cb, vc);
 
 	return 0;
@@ -2317,6 +2324,19 @@ void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,
 		voicecall_emit_disconnect_reason(call, reason);
 
 	number = phone_number_to_string(&call->call->phone_number);
+
+	if (vc->settings) {
+		/*Save the last dialled number for HFP AT+BLDN*/
+		if (call->call->direction == CALL_DIRECTION_MOBILE_ORIGINATED
+					&& number) {
+			g_key_file_set_string(vc->settings, SETTINGS_GROUP,
+						"Number", number);
+
+			storage_sync(vc->imsi, SETTINGS_STORE, vc->settings);
+		}
+
+	}
+
 	if (is_emergency_number(vc, number) == TRUE)
 		__ofono_modem_dec_emergency_mode(modem);
 
@@ -2428,6 +2448,21 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 	return;
 
 error:
+	if (vc->settings) {
+
+		/*Save the last dialled number for HFP AT+BLDN*/
+		if (call->direction == CALL_DIRECTION_MOBILE_ORIGINATED
+					&& call->phone_number.number) {
+			const char *number =
+				phone_number_to_string(&call->phone_number);
+			g_key_file_set_string(vc->settings, SETTINGS_GROUP,
+						"Number", number);
+
+			storage_sync(vc->imsi, SETTINGS_STORE, vc->settings);
+		}
+
+	}
+
 	if (newcall)
 		g_free(newcall);
 

ofono/unit/test-sms.c

@@ -38,6 +38,12 @@ static const char *simple_deliver = "07911326040000F0"
 		"040B911346610089F60000208062917314480CC8F71D14969741F977FD07";
 static const char *alnum_sender = "0791447758100650"
 		"040DD0F334FC1CA6970100008080312170224008D4F29CDE0EA7D9";
+static const char *unicode_deliver = "04819999990414D0FBFD7EBFDFEFF77BFE1E001"
+		"9512090801361807E00DC00FC00C400E400D600F600C500E500D800F800C"
+		"600E600C700E700C900E900CA00EA00DF003100320033003400350036003"
+		"7003800390030002000540068006900730020006D0065007300730061006"
+		"7006500200069007300200036003300200075006E00690063006F0064006"
+		"5002000630068006100720073002E";
 static const char *simple_submit = "0011000B916407281553F80000AA"
 		"0AE8329BFD4697D9EC37";
 
@@ -362,6 +368,38 @@ static void test_deliver_encode(void)
 	g_assert(strcmp(alnum_sender, encoded_pdu) == 0);
 
 	g_free(encoded_pdu);
+
+	/* test unicode_deliver*/
+	decoded_pdu = decode_hex(unicode_deliver, -1, &pdu_len, 0);
+	g_assert(decoded_pdu);
+	g_assert(pdu_len == (long)strlen(unicode_deliver) / 2);
+
+	ret = sms_decode(decoded_pdu, pdu_len, FALSE, 149, &sms);
+
+	g_free(decoded_pdu);
+
+	g_assert(ret);
+	g_assert(sms.type == SMS_TYPE_DELIVER);
+
+	ret = sms_encode(&sms, &encoded_pdu_len, &encoded_tpdu_len, pdu);
+
+	if (g_test_verbose()) {
+		int i;
+
+		for (i = 0; i < encoded_pdu_len; i++)
+			g_print("%02X", pdu[i]);
+		g_print("\n");
+	}
+
+	g_assert(ret);
+	g_assert(encoded_tpdu_len == 149);
+	g_assert(encoded_pdu_len == pdu_len);
+
+	encoded_pdu = encode_hex(pdu, encoded_pdu_len, 0);
+
+	g_assert(strcmp(unicode_deliver, encoded_pdu) == 0);
+
+	g_free(encoded_pdu);
 }
 
 static void test_simple_submit(void)

rpm/ofono.changes

@@ -239,7 +239,7 @@
 - upgrade to 0.15
 - add patch 0001-add-netmask-to-hso-gprs-context-driver.patch 
 
-* Monday Dec 14 2009 Martin Xu <martin.xu@intel.com> - 0.14
+* Mon Dec 14 2009 Martin Xu <martin.xu@intel.com> - 0.14
 - upgrade to 0.14
 
 * Thu Dec 7 2009 Martin Xu <martin.xu@intel.com> - 0.13