Merge lp:~phablet-team/ofono/lp1598181 into lp:~phablet-team/ofono/ubuntu

[Alfonso Sanchez-Beato]

Fix network name parsing for turbo (LP: #1598181)

[Konrad Zapałowicz (kzapalowicz)]

LGTM

review: Approve (code)

[lp:~phablet-team/ofono/lp1598181]

6921. By Alfonso Sanchez-Beato on 2016-08-19

Fix unit test

6922. By Alfonso Sanchez-Beato on 2016-08-19

Fix compilation with gcc 6

6923. By Alfonso Sanchez-Beato on 2016-08-19

Fix glibc 2.23.9+ issues

6924. By Alfonso Sanchez-Beato on 2016-08-19

Fix gcc 6.0 compilation on big endian archs

[Tony Espy (awe)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-19 15:39:18 +0000
+++ debian/changelog	2016-08-19 11:05:27 +0000
@@ -1,3 +1,9 @@
+ofono (1.17.bzr6921+16.10.20160819.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Fix network name parsing for turbo (LP: #1598181)
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Fri, 19 Aug 2016 08:46:21 +0200
+
 ofono (1.17.bzr6919+16.10.20160719.1-0ubuntu1) yakkety; urgency=medium
 
   [ Alfonso Sanchez-Beato ]

=== modified file 'drivers/isimodem/voicecall.c'
--- drivers/isimodem/voicecall.c	2012-09-12 04:30:25 +0000
+++ drivers/isimodem/voicecall.c	2016-08-19 11:05:27 +0000
@@ -1715,7 +1715,7 @@
 
 		if ((status->mode_info & CALL_MODE_ORIGINATOR))
 			cause = CALL_CAUSE_BUSY_USER_REQUEST;
-			break;
+		break;
 	}
 
 	isi_call_release_req(ovc, id, CALL_CAUSE_TYPE_CLIENT, cause, cb, data);

=== modified file 'drivers/rilmodem/network-registration.c'
--- drivers/rilmodem/network-registration.c	2016-06-15 14:10:26 +0000
+++ drivers/rilmodem/network-registration.c	2016-08-19 11:05:27 +0000
@@ -201,26 +201,26 @@
 static void set_oper_name(const struct reply_operator *reply,
 				struct ofono_network_operator *op)
 {
-	const char *spn = NULL;
+	if (reply->lalpha != NULL &&
+			g_strcmp0(reply->numeric, reply->lalpha) != 0) {
+		strncpy(op->name, reply->lalpha,
+						OFONO_MAX_OPERATOR_NAME_LENGTH);
+	} else if (reply->salpha != NULL &&
+			g_strcmp0(reply->numeric, reply->salpha) != 0) {
+		strncpy(op->name, reply->salpha,
+						OFONO_MAX_OPERATOR_NAME_LENGTH);
+	} else {
+		const char *spn = NULL;
 
-	/* Use SPN list if we do not have name */
-	if (strcmp(reply->numeric, reply->lalpha) == 0) {
 		spn = __ofono_spn_table_get_spn(reply->numeric);
 		if (spn != NULL) {
 			DBG("using spn override %s", spn);
 			strncpy(op->name, spn, OFONO_MAX_OPERATOR_NAME_LENGTH);
+		} else {
+			strncpy(op->name, reply->numeric,
+						OFONO_MAX_OPERATOR_NAME_LENGTH);
 		}
 	}
-
-	if (spn == NULL) {
-		/* Try to use long by default */
-		if (reply->lalpha)
-			strncpy(op->name, reply->lalpha,
-				OFONO_MAX_OPERATOR_NAME_LENGTH);
-		else if (reply->salpha)
-			strncpy(op->name, reply->salpha,
-				OFONO_MAX_OPERATOR_NAME_LENGTH);
-	}
 }
 
 static void ril_cops_cb(struct ril_msg *message, gpointer user_data)

=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2016-07-19 15:08:32 +0000
+++ gril/grilreply.c	2016-08-19 11:05:27 +0000
@@ -248,14 +248,6 @@
 	reply->salpha = parcel_r_string(&rilp);
 	reply->numeric = parcel_r_string(&rilp);
 
-	if (reply->lalpha == NULL && reply->salpha == NULL) {
-		ofono_error("%s: invalid OPERATOR reply: "
-				" no names returned.",
-				__func__);
-
-		goto error;
-	}
-
 	if (reply->numeric == NULL) {
 		ofono_error("%s: invalid OPERATOR reply: "
 				" no numeric returned.",
@@ -265,7 +257,8 @@
 
 	g_ril_append_print_buf(gril,
 				"(lalpha=%s, salpha=%s, numeric=%s)",
-				reply->lalpha, reply->salpha, reply->numeric);
+				PRINTABLE_STR(reply->lalpha),
+				PRINTABLE_STR(reply->salpha), reply->numeric);
 
 	g_ril_print_response(gril, message);
 

=== modified file 'plugins/nokia-gpio.c'
--- plugins/nokia-gpio.c	2011-05-11 18:29:33 +0000
+++ plugins/nokia-gpio.c	2016-08-19 11:05:27 +0000
@@ -635,7 +635,7 @@
 	char const *gpiodir = "/sys/class/gpio";
 	char const *cmtdir = "/dev/cmt";
 	DIR *gpio;
-	struct dirent *d, entry[1];
+	struct dirent *d;
 
 	if (file_exists(cmtdir)) {
 		DBG("Using %s", cmtdir);
@@ -657,16 +657,11 @@
 		return -(errno = ENODEV);
 	}
 
-	while (readdir_r(gpio, entry, &d) == 0) {
+	while ((d = readdir(gpio)) != NULL) {
 		char nn[PATH_MAX], name[PATH_MAX], from[PATH_MAX], to[PATH_MAX];
 		FILE *nf;
 		size_t len;
 
-		if (d == NULL) {
-			(void) closedir(gpio);
-			return 0;
-		}
-
 		snprintf(nn, sizeof nn, "%s/%s/name", gpiodir, d->d_name);
 
 		nf = fopen(nn, "rb");

=== modified file 'unit/test-rilmodem-cb.c'
--- unit/test-rilmodem-cb.c	2016-03-10 10:48:53 +0000
+++ unit/test-rilmodem-cb.c	2016-08-19 11:05:27 +0000
@@ -42,10 +42,6 @@
 #include "ril_constants.h"
 #include "rilmodem-test-server.h"
 
-static GMainLoop *mainloop;
-
-static const struct ofono_call_barring_driver *cbdriver;
-
 struct rilmodem_cb_data {
 	GRil *ril;
 	struct ofono_modem *modem;
@@ -71,6 +67,68 @@
 	int status;
 };
 
+static const struct ofono_call_barring_driver *cbdriver;
+
+/* Declarations && Re-implementations of core functions. */
+void ril_call_barring_exit(void);
+void ril_call_barring_init(void);
+
+struct ofono_call_barring {
+	void *driver_data;
+	const struct cb_data *cbd;
+};
+
+struct ofono_call_barring *ofono_call_barring_create(struct ofono_modem *modem,
+							unsigned int vendor,
+							const char *driver,
+							void *data)
+{
+	struct rilmodem_cb_data *rsd = data;
+	struct ofono_call_barring *cb = g_new0(struct ofono_call_barring, 1);
+	int retval;
+
+	retval = cbdriver->probe(cb, OFONO_RIL_VENDOR_AOSP, rsd->ril);
+	g_assert(retval == 0);
+
+	return cb;
+}
+
+int ofono_call_barring_driver_register(const struct ofono_call_barring_driver *d)
+{
+	if (cbdriver == NULL)
+		cbdriver = d;
+
+	return 0;
+}
+
+void ofono_call_barring_set_data(struct ofono_call_barring *cb, void *data)
+{
+	cb->driver_data = data;
+}
+
+void *ofono_call_barring_get_data(struct ofono_call_barring *cb)
+{
+	return cb->driver_data;
+}
+
+void ofono_call_barring_register(struct ofono_call_barring *cb)
+{
+}
+
+void ofono_call_barring_driver_unregister(const struct ofono_call_barring_driver *d)
+{
+}
+
+/*
+ * As all our architectures are little-endian except for
+ * PowerPC, and the Binder wire-format differs slightly
+ * depending on endian-ness, the following guards against test
+ * failures when run on PowerPC.
+ */
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+static GMainLoop *mainloop;
+
 static void query_callback(const struct ofono_error *error, int status,
 								gpointer data)
 {
@@ -434,64 +492,6 @@
 	.error_type = OFONO_ERROR_TYPE_FAILURE,
 };
 
-/* Declarations && Re-implementations of core functions. */
-void ril_call_barring_exit(void);
-void ril_call_barring_init(void);
-
-struct ofono_call_barring {
-	void *driver_data;
-	const struct cb_data *cbd;
-};
-
-struct ofono_call_barring *ofono_call_barring_create(struct ofono_modem *modem,
-							unsigned int vendor,
-							const char *driver,
-							void *data)
-{
-	struct rilmodem_cb_data *rsd = data;
-	struct ofono_call_barring *cb = g_new0(struct ofono_call_barring, 1);
-	int retval;
-
-	retval = cbdriver->probe(cb, OFONO_RIL_VENDOR_AOSP, rsd->ril);
-	g_assert(retval == 0);
-
-	return cb;
-}
-
-int ofono_call_barring_driver_register(const struct ofono_call_barring_driver *d)
-{
-	if (cbdriver == NULL)
-		cbdriver = d;
-
-	return 0;
-}
-
-void ofono_call_barring_set_data(struct ofono_call_barring *cb, void *data)
-{
-	cb->driver_data = data;
-}
-
-void *ofono_call_barring_get_data(struct ofono_call_barring *cb)
-{
-	return cb->driver_data;
-}
-
-void ofono_call_barring_register(struct ofono_call_barring *cb)
-{
-}
-
-void ofono_call_barring_driver_unregister(const struct ofono_call_barring_driver *d)
-{
-}
-
-/*
- * As all our architectures are little-endian except for
- * PowerPC, and the Binder wire-format differs slightly
- * depending on endian-ness, the following guards against test
- * failures when run on PowerPC.
- */
-#if BYTE_ORDER == LITTLE_ENDIAN
-
 static void server_connect_cb(gpointer data)
 {
 	struct rilmodem_cb_data *rsd = data;
@@ -577,7 +577,7 @@
 					&testdata_query_invalid_3,
 					test_call_barring_func);
 	g_test_add_data_func("/testrilmodemcallbarring/query/invalid/4",
-					&testdata_query_invalid_3,
+					&testdata_query_invalid_4,
 					test_call_barring_func);
 	g_test_add_data_func("/testrilmodemcallbarring/set/valid/1",
 					&testdata_set_valid_1,

=== modified file 'unit/test-rilmodem-cs.c'
--- unit/test-rilmodem-cs.c	2016-03-10 10:48:53 +0000
+++ unit/test-rilmodem-cs.c	2016-08-19 11:05:27 +0000
@@ -42,10 +42,6 @@
 #include "ril_constants.h"
 #include "rilmodem-test-server.h"
 
-static GMainLoop *mainloop;
-
-static const struct ofono_call_settings_driver *csdriver;
-
 struct rilmodem_cs_data {
 	GRil *ril;
 	struct ofono_modem *modem;
@@ -67,6 +63,67 @@
 	gint cb_int2;
 };
 
+static const struct ofono_call_settings_driver *csdriver;
+
+/* Declarations && Re-implementations of core functions. */
+void ril_call_settings_exit(void);
+void ril_call_settings_init(void);
+
+struct ofono_call_settings {
+	void *driver_data;
+};
+
+struct ofono_call_settings *ofono_call_settings_create(struct ofono_modem *modem,
+							unsigned int vendor,
+							const char *driver,
+							void *data)
+{
+	struct rilmodem_cs_data *rcd = data;
+	struct ofono_call_settings *cs = g_new0(struct ofono_call_settings, 1);
+	int retval;
+
+	retval = csdriver->probe(cs, OFONO_RIL_VENDOR_AOSP, rcd->ril);
+	g_assert(retval == 0);
+
+	return cs;
+}
+
+int ofono_call_settings_driver_register(const struct ofono_call_settings_driver *d)
+{
+	if (csdriver == NULL)
+		csdriver = d;
+
+	return 0;
+}
+
+void ofono_call_settings_set_data(struct ofono_call_settings *cs, void *data)
+{
+	cs->driver_data = data;
+}
+
+void *ofono_call_settings_get_data(struct ofono_call_settings *cs)
+{
+	return cs->driver_data;
+}
+
+void ofono_call_settings_register(struct ofono_call_settings *cs)
+{
+}
+
+void ofono_call_settings_driver_unregister(const struct ofono_call_settings_driver *d)
+{
+}
+
+/*
+ * As all our architectures are little-endian except for
+ * PowerPC, and the Binder wire-format differs slightly
+ * depending on endian-ness, the following guards against test
+ * failures when run on PowerPC.
+ */
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+static GMainLoop *mainloop;
+
 static void status_query_callback(const struct ofono_error *error, int status,
 								 gpointer data)
 {
@@ -387,63 +444,6 @@
 	.error_type = OFONO_ERROR_TYPE_FAILURE,
 };
 
-/* Declarations && Re-implementations of core functions. */
-void ril_call_settings_exit(void);
-void ril_call_settings_init(void);
-
-struct ofono_call_settings {
-	void *driver_data;
-};
-
-struct ofono_call_settings *ofono_call_settings_create(struct ofono_modem *modem,
-							unsigned int vendor,
-							const char *driver,
-							void *data)
-{
-	struct rilmodem_cs_data *rcd = data;
-	struct ofono_call_settings *cs = g_new0(struct ofono_call_settings, 1);
-	int retval;
-
-	retval = csdriver->probe(cs, OFONO_RIL_VENDOR_AOSP, rcd->ril);
-	g_assert(retval == 0);
-
-	return cs;
-}
-
-int ofono_call_settings_driver_register(const struct ofono_call_settings_driver *d)
-{
-	if (csdriver == NULL)
-		csdriver = d;
-
-	return 0;
-}
-
-void ofono_call_settings_set_data(struct ofono_call_settings *cs, void *data)
-{
-	cs->driver_data = data;
-}
-
-void *ofono_call_settings_get_data(struct ofono_call_settings *cs)
-{
-	return cs->driver_data;
-}
-
-void ofono_call_settings_register(struct ofono_call_settings *cs)
-{
-}
-
-void ofono_call_settings_driver_unregister(const struct ofono_call_settings_driver *d)
-{
-}
-
-/*
- * As all our architectures are little-endian except for
- * PowerPC, and the Binder wire-format differs slightly
- * depending on endian-ness, the following guards against test
- * failures when run on PowerPC.
- */
-#if BYTE_ORDER == LITTLE_ENDIAN
-
 static void server_connect_cb(gpointer data)
 {
 	struct rilmodem_cs_data *rcd = data;

=== modified file 'unit/test-rilmodem-sms.c'
--- unit/test-rilmodem-sms.c	2016-03-10 10:48:53 +0000
+++ unit/test-rilmodem-sms.c	2016-08-19 11:05:27 +0000
@@ -42,10 +42,6 @@
 #include "ril_constants.h"
 #include "rilmodem-test-server.h"
 
-static GMainLoop *mainloop;
-
-static const struct ofono_sms_driver *smsdriver;
-
 struct rilmodem_sms_data {
 	GRil *ril;
 	struct ofono_modem *modem;
@@ -71,6 +67,84 @@
 	gint mr;
 };
 
+static GMainLoop *mainloop;
+
+static const struct ofono_sms_driver *smsdriver;
+
+/* Declarations && Re-implementations of core functions. */
+void ril_sms_exit(void);
+void ril_sms_init(void);
+
+struct ofono_sms {
+	void *driver_data;
+	const struct sms_data *sd;
+};
+
+struct ofono_sms *ofono_sms_create(struct ofono_modem *modem,
+					unsigned int vendor,
+					const char *driver,
+					void *data)
+{
+	struct rilmodem_sms_data *rsd = data;
+	struct ofono_sms *sms = g_new0(struct ofono_sms, 1);
+	int retval;
+
+	retval = smsdriver->probe(sms, OFONO_RIL_VENDOR_AOSP, rsd->ril);
+	g_assert(retval == 0);
+
+	return sms;
+}
+
+int ofono_sms_driver_register(const struct ofono_sms_driver *d)
+{
+	if (smsdriver == NULL)
+		smsdriver = d;
+
+	return 0;
+}
+
+void ofono_sms_set_data(struct ofono_sms *sms, void *data)
+{
+	sms->driver_data = data;
+}
+
+void *ofono_sms_get_data(struct ofono_sms *sms)
+{
+	return sms->driver_data;
+}
+
+void ofono_sms_register(struct ofono_sms *sms)
+{
+}
+
+void ofono_sms_driver_unregister(const struct ofono_sms_driver *d)
+{
+}
+
+void ofono_sms_deliver_notify(struct ofono_sms *sms, const unsigned char *pdu,
+							int len, int tpdu_len)
+{
+	g_assert(sms->sd->pdu_len == len);
+	g_assert(sms->sd->tpdu_len == tpdu_len);
+	g_assert(!memcmp(pdu, sms->sd->pdu, len));
+
+	g_main_loop_quit(mainloop);
+}
+
+void ofono_sms_status_notify(struct ofono_sms *sms, const unsigned char *pdu,
+							int len, int tpdu_len)
+{
+	ofono_sms_deliver_notify(sms, pdu, len, tpdu_len);
+}
+
+/*
+ * As all our architectures are little-endian except for
+ * PowerPC, and the Binder wire-format differs slightly
+ * depending on endian-ness, the following guards against test
+ * failures when run on PowerPC.
+ */
+#if BYTE_ORDER == LITTLE_ENDIAN
+
 static void sca_query_callback(const struct ofono_error *error,
 					const struct ofono_phone_number *ph,
 					gpointer data)
@@ -414,80 +488,6 @@
 	.tpdu_len = 28,
 };
 
-/* Declarations && Re-implementations of core functions. */
-void ril_sms_exit(void);
-void ril_sms_init(void);
-
-struct ofono_sms {
-	void *driver_data;
-	const struct sms_data *sd;
-};
-
-struct ofono_sms *ofono_sms_create(struct ofono_modem *modem,
-					unsigned int vendor,
-					const char *driver,
-					void *data)
-{
-	struct rilmodem_sms_data *rsd = data;
-	struct ofono_sms *sms = g_new0(struct ofono_sms, 1);
-	int retval;
-
-	retval = smsdriver->probe(sms, OFONO_RIL_VENDOR_AOSP, rsd->ril);
-	g_assert(retval == 0);
-
-	return sms;
-}
-
-int ofono_sms_driver_register(const struct ofono_sms_driver *d)
-{
-	if (smsdriver == NULL)
-		smsdriver = d;
-
-	return 0;
-}
-
-void ofono_sms_set_data(struct ofono_sms *sms, void *data)
-{
-	sms->driver_data = data;
-}
-
-void *ofono_sms_get_data(struct ofono_sms *sms)
-{
-	return sms->driver_data;
-}
-
-void ofono_sms_register(struct ofono_sms *sms)
-{
-}
-
-void ofono_sms_driver_unregister(const struct ofono_sms_driver *d)
-{
-}
-
-void ofono_sms_deliver_notify(struct ofono_sms *sms, const unsigned char *pdu,
-							int len, int tpdu_len)
-{
-	g_assert(sms->sd->pdu_len == len);
-	g_assert(sms->sd->tpdu_len == tpdu_len);
-	g_assert(!memcmp(pdu, sms->sd->pdu, len));
-
-	g_main_loop_quit(mainloop);
-}
-
-void ofono_sms_status_notify(struct ofono_sms *sms, const unsigned char *pdu,
-							int len, int tpdu_len)
-{
-	ofono_sms_deliver_notify(sms, pdu, len, tpdu_len);
-}
-
-/*
- * As all our architectures are little-endian except for
- * PowerPC, and the Binder wire-format differs slightly
- * depending on endian-ness, the following guards against test
- * failures when run on PowerPC.
- */
-#if BYTE_ORDER == LITTLE_ENDIAN
-
 static void server_connect_cb(gpointer data)
 {
 	struct rilmodem_sms_data *rsd = data;

=== modified file 'unit/test-stkutil.c'
--- unit/test-stkutil.c	2012-11-02 19:17:17 +0000
+++ unit/test-stkutil.c	2016-08-19 11:05:27 +0000
@@ -16867,13 +16867,7 @@
 	},
 };
 
-static const unsigned char get_input_response_191b[] = {
-	0x81, 0x03, 0x01, 0x23, 0x01, 0x82, 0x02, 0x82,
-	0x81, 0x83, 0x01, 0x00, 0x8d, 0x00,
-};
-
 static const struct terminal_response_test get_input_response_data_191 = {
-	/* Either get_input_response_191a or get_input_response_191b is ok */
 	.pdu = get_input_response_191a,
 	.pdu_len = sizeof(get_input_response_191a),
 	.response = {
@@ -17349,11 +17343,6 @@
 	0x81, 0x83, 0x01, 0x00, 0x84, 0x02, 0x00, 0x01,
 };
 
-static const unsigned char poll_interval_response_111b[] = {
-	0x81, 0x03, 0x01, 0x03, 0x00, 0x82, 0x02, 0x82,
-	0x81, 0x83, 0x01, 0x00, 0x84, 0x02, 0x01, 0x3c,
-};
-
 static const struct terminal_response_test poll_interval_response_data_111a = {
 	/* Either poll_interval_response_111a or b is ok */
 	.pdu = poll_interval_response_111a,
@@ -17476,26 +17465,6 @@
 	},
 };
 
-static const unsigned char refresh_response_131b[] = {
-	0x81, 0x03, 0x01, 0x01, 0x02, 0x82, 0x02, 0x82,
-	0x81, 0x83, 0x01, 0x03,
-};
-
-static const struct terminal_response_test refresh_response_data_131b = {
-	.pdu = refresh_response_131b,
-	.pdu_len = sizeof(refresh_response_131b),
-	.response = {
-		.number = 1,
-		.type = STK_COMMAND_TYPE_REFRESH,
-		.qualifier = 0x02, /* USIM Initialization & File Change */
-		.src = STK_DEVICE_IDENTITY_TYPE_TERMINAL,
-		.dst = STK_DEVICE_IDENTITY_TYPE_UICC,
-		.result = {
-			.type = STK_RESULT_TYPE_REFRESH_WITH_EFS,
-		},
-	},
-};
-
 static const unsigned char refresh_response_141a[] = {
 	0x81, 0x03, 0x01, 0x01, 0x00, 0x82, 0x02, 0x82,
 	0x81, 0x83, 0x01, 0x00,
@@ -18338,9 +18307,6 @@
 	0x06, 0x45, 0x91, 0xa4, 0x90,
 };
 
-static const short bcch_channels_131[] = {
-};
-
 static const struct terminal_response_test
 		provide_local_info_response_data_131 = {
 	.pdu = provide_local_info_response_131,