[PATCH 0/2] New rilmodem sms test

[PATCH 0/2] New rilmodem sms test

[Tony Espy]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

This patch series adds a second rilmodem test for SMS.
The common server test functions have been extracted
for use by future rilmodem tests.

Tony Espy (2):
  unit: add new test-rilmodem-sms
  build: add support for test-rilmodem-sms

 Makefile.am                 |  14 ++-
 unit/rilmodem-test-server.c | 198 ++++++++++++++++++++++++++++++++
 unit/rilmodem-test-server.h |  40 +++++++
 unit/test-rilmodem-sms.c    | 267 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 518 insertions(+), 1 deletion(-)
 create mode 100644 unit/rilmodem-test-server.c
 create mode 100644 unit/rilmodem-test-server.h
 create mode 100644 unit/test-rilmodem-sms.c

-- 
2.1.4

[PATCH 1/2] unit: add new test-rilmodem-sms

[Tony Espy]

[-- Attachment #1: Type: text/plain, Size: 13894 bytes --]

---
 unit/rilmodem-test-server.c | 198 ++++++++++++++++++++++++++++++++
 unit/rilmodem-test-server.h |  40 +++++++
 unit/test-rilmodem-sms.c    | 267 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 505 insertions(+)
 create mode 100644 unit/rilmodem-test-server.c
 create mode 100644 unit/rilmodem-test-server.h
 create mode 100644 unit/test-rilmodem-sms.c

diff --git a/unit/rilmodem-test-server.c b/unit/rilmodem-test-server.c
new file mode 100644
index 0000000..a09e22c
--- /dev/null
+++ b/unit/rilmodem-test-server.c
@@ -0,0 +1,198 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2015 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+#include <ofono/types.h>
+
+#include <gril.h>
+
+#include "rilmodem-test-server.h"
+
+#define MAX_REQUEST_SIZE 4096
+
+static int server_sk;
+static ConnectFunc connect_func;
+static GIOChannel *server_io;
+static const struct rilmodem_test_data *rtd;
+
+/* Warning: length is stored in network order */
+struct rsp_hdr {
+	uint32_t length;
+	uint32_t unsolicited;
+	uint32_t serial;
+	uint32_t error;
+};
+
+static gboolean read_server(gpointer data)
+{
+	GIOStatus status;
+	gsize offset, rbytes, wbytes;
+	gchar *buf, *bufp;
+	uint32_t req_serial;
+	struct rsp_hdr rsp;
+
+	buf = g_malloc0(MAX_REQUEST_SIZE);
+
+	status = g_io_channel_read_chars(server_io, buf, MAX_REQUEST_SIZE,
+								&rbytes, NULL);
+	g_assert(status == G_IO_STATUS_NORMAL);
+
+	g_assert(rbytes == rtd->req_size);
+
+	/* validate len, and request_id */
+	g_assert(!memcmp(buf, rtd->req_data, (sizeof(uint32_t) * 2)));
+
+	/*
+	 * header: size (uint32), reqid (uin32), serial (uint32)
+	 * header size == 16 ( excludes sizeof(size) )
+	 */
+
+	/* advance past request_no */
+	bufp = buf + (sizeof(uint32_t) * 2);
+
+	req_serial = (uint32_t) *bufp;
+
+	/* advance past serial_no */
+	bufp += sizeof(uint32_t);
+
+	/* validate the rest of the parcel... */
+	offset = (sizeof(uint32_t) * 3);
+	g_assert(!memcmp(bufp, rtd->req_data + offset,
+						rtd->req_size - offset));
+
+	/* Length does not include the length field. Network order. */
+	rsp.length = htonl(sizeof(rsp) - sizeof(rsp.length) + rtd->rsp_size);
+	rsp.unsolicited = 0;
+	rsp.serial = req_serial;
+	rsp.error = rtd->rsp_error;
+
+	/* copy header */
+	memcpy(buf, &rsp, sizeof(rsp));
+
+	if (rtd->rsp_size) {
+		bufp = buf + sizeof(rsp);
+
+		memcpy(bufp, rtd->rsp_data, rtd->rsp_size);
+	}
+
+
+	status = g_io_channel_write_chars(server_io,
+					buf,
+					sizeof(rsp) + rtd->rsp_size,
+					&wbytes, NULL);
+
+	/* FIXME: assert wbytes is correct */
+
+	g_assert(status == G_IO_STATUS_NORMAL);
+
+	g_free(buf);
+	g_io_channel_unref(server_io);
+
+	return FALSE;
+}
+
+static gboolean on_socket_connected(GIOChannel *chan, GIOCondition cond,
+								gpointer data)
+{
+	struct sockaddr saddr;
+	unsigned int len = sizeof(saddr);
+	int fd;
+	GIOStatus status;
+
+	g_assert(cond == G_IO_IN);
+
+	fd = accept(server_sk, &saddr, &len);
+	g_assert(fd != -1);
+
+	server_io = g_io_channel_unix_new(fd);
+	g_assert(server_io != NULL);
+
+	if (connect_func)
+		connect_func(data);
+
+	status = g_io_channel_set_encoding(server_io, NULL, NULL);
+	g_assert(status == G_IO_STATUS_NORMAL);
+
+	g_io_channel_set_buffered(server_io, FALSE);
+	g_io_channel_set_close_on_unref(server_io, TRUE);
+
+	g_idle_add(read_server, data);
+
+	return FALSE;
+}
+
+void rilmodem_test_server_close(void)
+{
+	g_assert(server_sk);
+	close(server_sk);
+	server_sk = 0;
+}
+
+void rilmodem_test_server_create(ConnectFunc connect,
+				const struct rilmodem_test_data *test_data,
+				void *data)
+{
+	GIOChannel *io;
+	struct sockaddr_un addr;
+	int retval;
+
+	g_assert(server_sk == 0);
+
+	connect_func = connect;
+	rtd = test_data;
+
+	server_sk = socket(AF_UNIX, SOCK_STREAM, 0);
+	g_assert(server_sk);
+
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	strncpy(addr.sun_path, RIL_SERVER_SOCK_PATH, sizeof(addr.sun_path) - 1);
+
+	/* Unlink any existing socket for this session */
+	unlink(addr.sun_path);
+
+	retval = bind(server_sk, (struct sockaddr *) &addr, sizeof(addr));
+	g_assert(retval >= 0);
+
+	retval = listen(server_sk, 0);
+	g_assert(retval >= 0);
+
+	io = g_io_channel_unix_new(server_sk);
+	g_assert(io != NULL);
+
+	g_io_channel_set_close_on_unref(io, TRUE);
+	g_io_channel_set_flags(io, G_IO_FLAG_NONBLOCK, NULL);
+
+	g_io_add_watch_full(io,	G_PRIORITY_DEFAULT,
+				G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+				on_socket_connected, data, NULL);
+
+	g_io_channel_unref(io);
+}
diff --git a/unit/rilmodem-test-server.h b/unit/rilmodem-test-server.h
new file mode 100644
index 0000000..ba8b43c
--- /dev/null
+++ b/unit/rilmodem-test-server.h
@@ -0,0 +1,40 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2015 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#define RIL_SERVER_SOCK_PATH    "/tmp/unittestril"
+
+struct rilmodem_test_data {
+	const unsigned char *req_data;
+
+	const size_t req_size;
+
+	uint32_t rsp_error;
+	const unsigned char *rsp_data;
+	const size_t rsp_size;
+};
+
+typedef void (*ConnectFunc)(void *data);
+
+void rilmodem_test_server_close(void);
+
+void rilmodem_test_server_create(ConnectFunc connect,
+				const struct rilmodem_test_data *test_data,
+				void *data);
diff --git a/unit/test-rilmodem-sms.c b/unit/test-rilmodem-sms.c
new file mode 100644
index 0000000..0e3bff3
--- /dev/null
+++ b/unit/test-rilmodem-sms.c
@@ -0,0 +1,267 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2015 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <assert.h>
+#include <errno.h>
+#include <glib.h>
+#include <stdio.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+#include <ofono/modem.h>
+#include <ofono/types.h>
+#include <ofono/sms.h>
+#include <gril.h>
+
+#include "common.h"
+#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;
+	gconstpointer test_data;
+	struct ofono_sms *sms;
+};
+
+typedef gboolean (*StartFunc)(gpointer data);
+
+struct sms_data {
+	StartFunc start_func;
+	const struct ofono_phone_number ph;
+	gint param_int1;
+	gint param_int2;
+
+	struct rilmodem_test_data rtd;
+	enum ofono_error_type error_type;
+	gint cb_int1;
+	gint cb_int2;
+};
+
+static void sca_query_callback(const struct ofono_error *error,
+					const struct ofono_phone_number *ph,
+					gpointer data)
+{
+	struct rilmodem_sms_data *rsd = data;
+	const struct sms_data *sd = rsd->test_data;
+
+	g_assert(error->type == sd->error_type);
+
+	if (error->type == OFONO_ERROR_TYPE_NO_ERROR) {
+		g_assert(ph->type == sd->ph.type);
+		g_assert(strcmp(ph->number, sd->ph.number) == 0);
+	}
+
+	g_main_loop_quit(mainloop);
+}
+
+static gboolean trigger_sca_query(gpointer data)
+{
+	struct rilmodem_sms_data *rsd = data;
+
+	g_assert(smsdriver->sca_query != NULL);
+	smsdriver->sca_query(rsd->sms, sca_query_callback, rsd);
+
+	return FALSE;
+}
+
+/* RIL_REQUEST_GET_SMSC_ADDRESS */
+static const guchar req_get_smsc_address_parcel_1[] = {
+	0x00, 0x00, 0x00, 0x08, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+
+/*
+ * RIL_REQUEST_GET_SMSC_ADDRESS reply with the following data:
+ *
+ * {type=145,number=34607003110}
+ */
+static const guchar rsp_get_smsc_address_data_1[] = {
+	0x12, 0x00, 0x00, 0x00, 0x22, 0x00, 0x2b, 0x00, 0x33, 0x00, 0x34, 0x00,
+	0x36, 0x00, 0x30, 0x00, 0x37, 0x00, 0x30, 0x00, 0x30, 0x00, 0x33, 0x00,
+	0x31, 0x00, 0x31, 0x00, 0x30, 0x00, 0x22, 0x00, 0x2c, 0x00, 0x31, 0x00,
+	0x34, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct sms_data testdata_sca_query_valid_1 = {
+	.start_func = trigger_sca_query,
+	.ph = { .number = "34607003110", .type = 145 },
+	.rtd = {
+		.req_data = req_get_smsc_address_parcel_1,
+		.req_size = sizeof(req_get_smsc_address_parcel_1),
+		.rsp_data = rsp_get_smsc_address_data_1,
+		.rsp_size = sizeof(rsp_get_smsc_address_data_1),
+		.rsp_error = RIL_E_SUCCESS,
+	},
+	.cb_int1 = 1,
+	.error_type = OFONO_ERROR_TYPE_NO_ERROR,
+};
+
+/* TODO: Did these get removed upstream? */
+
+/* Declarations && Re-implementations of core functions. */
+void ril_sms_exit(void);
+void ril_sms_init(void);
+
+struct ofono_sms {
+	void *driver_data;
+};
+
+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)
+{
+	;
+}
+
+void ofono_sms_status_notify(struct ofono_sms *sms, const unsigned char *pdu,
+				int len, int tpdu_len)
+{
+	;
+}
+
+static void server_connect_cb(gpointer data)
+{
+	struct rilmodem_sms_data *rsd = data;
+	const struct sms_data *sd = rsd->test_data;
+
+	/* This causes local impl of _create() to call driver's probe func. */
+	rsd->sms = ofono_sms_create(NULL, OFONO_RIL_VENDOR_AOSP,
+							"rilmodem", rsd);
+
+	/* add_idle doesn't work, read blocks main loop!!! */
+	g_assert(sd->start_func(rsd) == FALSE);
+}
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+/*
+ * This unit test:
+ *  - does some test data setup
+ *  - configures a dummy server socket
+ *  - creates a new gril client instance
+ *    - triggers a connect to the dummy
+ *      server socket
+ *  - starts a mainloop
+ */
+static void test_sms_func(gconstpointer data)
+{
+	const struct sms_data *sd = data;
+	struct rilmodem_sms_data *rsd;
+
+	ril_sms_init();
+
+	rsd = g_new0(struct rilmodem_sms_data, 1);
+
+	rsd->test_data = sd;
+
+	rilmodem_test_server_create(&server_connect_cb, &sd->rtd, rsd);
+
+	rsd->ril = g_ril_new(RIL_SERVER_SOCK_PATH, OFONO_RIL_VENDOR_AOSP);
+	g_assert(rsd->ril != NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+
+	g_main_loop_run(mainloop);
+	g_main_loop_unref(mainloop);
+
+	smsdriver->remove(rsd->sms);
+	g_ril_unref(rsd->ril);
+	g_free(rsd);
+
+	rilmodem_test_server_close();
+
+	ril_sms_exit();
+}
+
+#endif
+
+int main(int argc, char **argv)
+{
+	g_test_init(&argc, &argv, NULL);
+
+/*
+ * 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
+	g_test_add_data_func("/testrilmodemsms/sca_query/valid/1",
+					&testdata_sca_query_valid_1,
+					test_sms_func);
+
+#endif
+	return g_test_run();
+}
-- 
2.1.4

Re: [PATCH 1/2] unit: add new test-rilmodem-sms

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 5682 bytes --]

Hi Tony,

On 11/17/2015 07:45 PM, Tony Espy wrote:
> ---
>   unit/rilmodem-test-server.c | 198 ++++++++++++++++++++++++++++++++
>   unit/rilmodem-test-server.h |  40 +++++++
>   unit/test-rilmodem-sms.c    | 267 ++++++++++++++++++++++++++++++++++++++++++++
>   3 files changed, 505 insertions(+)
>   create mode 100644 unit/rilmodem-test-server.c
>   create mode 100644 unit/rilmodem-test-server.h
>   create mode 100644 unit/test-rilmodem-sms.c
>

<snip>

> +void rilmodem_test_server_create(ConnectFunc connect,
> +				const struct rilmodem_test_data *test_data,
> +				void *data)
> +{
> +	GIOChannel *io;
> +	struct sockaddr_un addr;
> +	int retval;
> +
> +	g_assert(server_sk == 0);
> +
> +	connect_func = connect;
> +	rtd = test_data;
> +
> +	server_sk = socket(AF_UNIX, SOCK_STREAM, 0);
> +	g_assert(server_sk);
> +
> +	memset(&addr, 0, sizeof(addr));
> +	addr.sun_family = AF_UNIX;
> +	strncpy(addr.sun_path, RIL_SERVER_SOCK_PATH, sizeof(addr.sun_path) - 1);
> +
> +	/* Unlink any existing socket for this session */
> +	unlink(addr.sun_path);
> +
> +	retval = bind(server_sk, (struct sockaddr *) &addr, sizeof(addr));
> +	g_assert(retval >= 0);
> +
> +	retval = listen(server_sk, 0);
> +	g_assert(retval >= 0);
> +
> +	io = g_io_channel_unix_new(server_sk);
> +	g_assert(io != NULL);
> +
> +	g_io_channel_set_close_on_unref(io, TRUE);
> +	g_io_channel_set_flags(io, G_IO_FLAG_NONBLOCK, NULL);

Not sure you really need the non-block flag for a socket you will call 
accept on once.  But okay.

> +
> +	g_io_add_watch_full(io,	G_PRIORITY_DEFAULT,
> +				G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
> +				on_socket_connected, data, NULL);
> +
> +	g_io_channel_unref(io);
> +}

<snip>

> diff --git a/unit/test-rilmodem-sms.c b/unit/test-rilmodem-sms.c
> new file mode 100644
> index 0000000..0e3bff3
> --- /dev/null
> +++ b/unit/test-rilmodem-sms.c

<snip>

> +/* TODO: Did these get removed upstream? */
> +

Whats this about?

> +/* Declarations && Re-implementations of core functions. */
> +void ril_sms_exit(void);
> +void ril_sms_init(void);
> +
> +struct ofono_sms {
> +	void *driver_data;
> +};
> +
> +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)
> +{
> +	;

Can we just make these empty functions instead of the ';' thing?

> +}
> +
> +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)
> +{
> +	;
> +}
> +
> +void ofono_sms_status_notify(struct ofono_sms *sms, const unsigned char *pdu,
> +				int len, int tpdu_len)
> +{
> +	;
> +}
> +
> +static void server_connect_cb(gpointer data)
> +{
> +	struct rilmodem_sms_data *rsd = data;
> +	const struct sms_data *sd = rsd->test_data;
> +
> +	/* This causes local impl of _create() to call driver's probe func. */
> +	rsd->sms = ofono_sms_create(NULL, OFONO_RIL_VENDOR_AOSP,
> +							"rilmodem", rsd);
> +
> +	/* add_idle doesn't work, read blocks main loop!!! */
> +	g_assert(sd->start_func(rsd) == FALSE);
> +}
> +
> +#if BYTE_ORDER == LITTLE_ENDIAN
> +

Can we keep the number of these #if conditions to a minimum?  Would it 
suffice to simply #ifdef this out in main.c?  Or better yet, disable 
from the build completely.

> +/*
> + * This unit test:
> + *  - does some test data setup
> + *  - configures a dummy server socket
> + *  - creates a new gril client instance
> + *    - triggers a connect to the dummy
> + *      server socket
> + *  - starts a mainloop
> + */
> +static void test_sms_func(gconstpointer data)
> +{
> +	const struct sms_data *sd = data;
> +	struct rilmodem_sms_data *rsd;
> +
> +	ril_sms_init();
> +
> +	rsd = g_new0(struct rilmodem_sms_data, 1);
> +
> +	rsd->test_data = sd;
> +
> +	rilmodem_test_server_create(&server_connect_cb, &sd->rtd, rsd);
> +
> +	rsd->ril = g_ril_new(RIL_SERVER_SOCK_PATH, OFONO_RIL_VENDOR_AOSP);
> +	g_assert(rsd->ril != NULL);
> +
> +	mainloop = g_main_loop_new(NULL, FALSE);
> +
> +	g_main_loop_run(mainloop);
> +	g_main_loop_unref(mainloop);
> +
> +	smsdriver->remove(rsd->sms);
> +	g_ril_unref(rsd->ril);
> +	g_free(rsd);
> +
> +	rilmodem_test_server_close();
> +
> +	ril_sms_exit();
> +}
> +
> +#endif
> +
> +int main(int argc, char **argv)
> +{
> +	g_test_init(&argc, &argv, NULL);
> +
> +/*
> + * 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
> +	g_test_add_data_func("/testrilmodemsms/sca_query/valid/1",
> +					&testdata_sca_query_valid_1,
> +					test_sms_func);
> +
> +#endif
> +	return g_test_run();
> +}
>

Regards,
-Denis

[PATCH 2/2] build: add support for test-rilmodem-sms

[Tony Espy]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

---
 Makefile.am | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index fba25ba..1cdfc1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -740,7 +740,8 @@ unit_objects =
 unit_tests = unit/test-common unit/test-util unit/test-idmap \
 				unit/test-simutil unit/test-stkutil \
 				unit/test-sms unit/test-cdmasms \
-				unit/test-rilmodem-cs
+				unit/test-rilmodem-cs \
+				unit/test-rilmodem-sms
 
 noinst_PROGRAMS = $(unit_tests) \
 			unit/test-sms-root unit/test-mux unit/test-caif
@@ -801,6 +802,17 @@ unit_test_rilmodem_cs_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
 unit_objects += $(unit_test_rilmodem_cs_OBJECTS)
 
+unit_test_rilmodem_sms_SOURCES = unit/test-rilmodem-sms.c $(gril_sources) \
+			src/log.c src/common.c src/util.c \
+			gatchat/ringbuffer.h gatchat/ringbuffer.c \
+			drivers/rilmodem/sms.c \
+			unit/rilmodem-test-server.h \
+			unit/rilmodem-test-server.c \
+			src/simutil.c
+unit_test_rilmodem_sms_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
+			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
+unit_objects += $(unit_test_rilmodem_sms_OBJECTS)
+
 TESTS = $(unit_tests)
 
 if TOOLS
-- 
2.1.4

Re: [PATCH 2/2] build: add support for test-rilmodem-sms

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

Hi Tony,

On 11/17/2015 07:45 PM, Tony Espy wrote:
> ---
>   Makefile.am | 14 +++++++++++++-
>   1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index fba25ba..1cdfc1f 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -740,7 +740,8 @@ unit_objects =
>   unit_tests = unit/test-common unit/test-util unit/test-idmap \
>   				unit/test-simutil unit/test-stkutil \
>   				unit/test-sms unit/test-cdmasms \
> -				unit/test-rilmodem-cs
> +				unit/test-rilmodem-cs \
> +				unit/test-rilmodem-sms
>
>   noinst_PROGRAMS = $(unit_tests) \
>   			unit/test-sms-root unit/test-mux unit/test-caif
> @@ -801,6 +802,17 @@ unit_test_rilmodem_cs_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
>   			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
>   unit_objects += $(unit_test_rilmodem_cs_OBJECTS)
>
> +unit_test_rilmodem_sms_SOURCES = unit/test-rilmodem-sms.c $(gril_sources) \
> +			src/log.c src/common.c src/util.c \
> +			gatchat/ringbuffer.h gatchat/ringbuffer.c \
> +			drivers/rilmodem/sms.c \
> +			unit/rilmodem-test-server.h \
> +			unit/rilmodem-test-server.c \
> +			src/simutil.c

Can the files common to the ril unit tests be assigned to a variable?  I 
count at least 8 files that are shared between rilmodem_sms & 
rilmodem_cs.  Lets keep duplication to a minimum.

> +unit_test_rilmodem_sms_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
> +			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
> +unit_objects += $(unit_test_rilmodem_sms_OBJECTS)
> +
>   TESTS = $(unit_tests)
>
>   if TOOLS
>

Regards,
-Denis

[PATCH 1/2] unit: add new test-rilmodem-sms

[Tony Espy]

[-- Attachment #1: Type: text/plain, Size: 13894 bytes --]

---
 unit/rilmodem-test-server.c | 198 ++++++++++++++++++++++++++++++++
 unit/rilmodem-test-server.h |  40 +++++++
 unit/test-rilmodem-sms.c    | 267 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 505 insertions(+)
 create mode 100644 unit/rilmodem-test-server.c
 create mode 100644 unit/rilmodem-test-server.h
 create mode 100644 unit/test-rilmodem-sms.c

diff --git a/unit/rilmodem-test-server.c b/unit/rilmodem-test-server.c
new file mode 100644
index 0000000..a09e22c
--- /dev/null
+++ b/unit/rilmodem-test-server.c
@@ -0,0 +1,198 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2015 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+#include <ofono/types.h>
+
+#include <gril.h>
+
+#include "rilmodem-test-server.h"
+
+#define MAX_REQUEST_SIZE 4096
+
+static int server_sk;
+static ConnectFunc connect_func;
+static GIOChannel *server_io;
+static const struct rilmodem_test_data *rtd;
+
+/* Warning: length is stored in network order */
+struct rsp_hdr {
+	uint32_t length;
+	uint32_t unsolicited;
+	uint32_t serial;
+	uint32_t error;
+};
+
+static gboolean read_server(gpointer data)
+{
+	GIOStatus status;
+	gsize offset, rbytes, wbytes;
+	gchar *buf, *bufp;
+	uint32_t req_serial;
+	struct rsp_hdr rsp;
+
+	buf = g_malloc0(MAX_REQUEST_SIZE);
+
+	status = g_io_channel_read_chars(server_io, buf, MAX_REQUEST_SIZE,
+								&rbytes, NULL);
+	g_assert(status == G_IO_STATUS_NORMAL);
+
+	g_assert(rbytes == rtd->req_size);
+
+	/* validate len, and request_id */
+	g_assert(!memcmp(buf, rtd->req_data, (sizeof(uint32_t) * 2)));
+
+	/*
+	 * header: size (uint32), reqid (uin32), serial (uint32)
+	 * header size == 16 ( excludes sizeof(size) )
+	 */
+
+	/* advance past request_no */
+	bufp = buf + (sizeof(uint32_t) * 2);
+
+	req_serial = (uint32_t) *bufp;
+
+	/* advance past serial_no */
+	bufp += sizeof(uint32_t);
+
+	/* validate the rest of the parcel... */
+	offset = (sizeof(uint32_t) * 3);
+	g_assert(!memcmp(bufp, rtd->req_data + offset,
+						rtd->req_size - offset));
+
+	/* Length does not include the length field. Network order. */
+	rsp.length = htonl(sizeof(rsp) - sizeof(rsp.length) + rtd->rsp_size);
+	rsp.unsolicited = 0;
+	rsp.serial = req_serial;
+	rsp.error = rtd->rsp_error;
+
+	/* copy header */
+	memcpy(buf, &rsp, sizeof(rsp));
+
+	if (rtd->rsp_size) {
+		bufp = buf + sizeof(rsp);
+
+		memcpy(bufp, rtd->rsp_data, rtd->rsp_size);
+	}
+
+
+	status = g_io_channel_write_chars(server_io,
+					buf,
+					sizeof(rsp) + rtd->rsp_size,
+					&wbytes, NULL);
+
+	/* FIXME: assert wbytes is correct */
+
+	g_assert(status == G_IO_STATUS_NORMAL);
+
+	g_free(buf);
+	g_io_channel_unref(server_io);
+
+	return FALSE;
+}
+
+static gboolean on_socket_connected(GIOChannel *chan, GIOCondition cond,
+								gpointer data)
+{
+	struct sockaddr saddr;
+	unsigned int len = sizeof(saddr);
+	int fd;
+	GIOStatus status;
+
+	g_assert(cond == G_IO_IN);
+
+	fd = accept(server_sk, &saddr, &len);
+	g_assert(fd != -1);
+
+	server_io = g_io_channel_unix_new(fd);
+	g_assert(server_io != NULL);
+
+	if (connect_func)
+		connect_func(data);
+
+	status = g_io_channel_set_encoding(server_io, NULL, NULL);
+	g_assert(status == G_IO_STATUS_NORMAL);
+
+	g_io_channel_set_buffered(server_io, FALSE);
+	g_io_channel_set_close_on_unref(server_io, TRUE);
+
+	g_idle_add(read_server, data);
+
+	return FALSE;
+}
+
+void rilmodem_test_server_close(void)
+{
+	g_assert(server_sk);
+	close(server_sk);
+	server_sk = 0;
+}
+
+void rilmodem_test_server_create(ConnectFunc connect,
+				const struct rilmodem_test_data *test_data,
+				void *data)
+{
+	GIOChannel *io;
+	struct sockaddr_un addr;
+	int retval;
+
+	g_assert(server_sk == 0);
+
+	connect_func = connect;
+	rtd = test_data;
+
+	server_sk = socket(AF_UNIX, SOCK_STREAM, 0);
+	g_assert(server_sk);
+
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	strncpy(addr.sun_path, RIL_SERVER_SOCK_PATH, sizeof(addr.sun_path) - 1);
+
+	/* Unlink any existing socket for this session */
+	unlink(addr.sun_path);
+
+	retval = bind(server_sk, (struct sockaddr *) &addr, sizeof(addr));
+	g_assert(retval >= 0);
+
+	retval = listen(server_sk, 0);
+	g_assert(retval >= 0);
+
+	io = g_io_channel_unix_new(server_sk);
+	g_assert(io != NULL);
+
+	g_io_channel_set_close_on_unref(io, TRUE);
+	g_io_channel_set_flags(io, G_IO_FLAG_NONBLOCK, NULL);
+
+	g_io_add_watch_full(io,	G_PRIORITY_DEFAULT,
+				G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+				on_socket_connected, data, NULL);
+
+	g_io_channel_unref(io);
+}
diff --git a/unit/rilmodem-test-server.h b/unit/rilmodem-test-server.h
new file mode 100644
index 0000000..ba8b43c
--- /dev/null
+++ b/unit/rilmodem-test-server.h
@@ -0,0 +1,40 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2015 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#define RIL_SERVER_SOCK_PATH    "/tmp/unittestril"
+
+struct rilmodem_test_data {
+	const unsigned char *req_data;
+
+	const size_t req_size;
+
+	uint32_t rsp_error;
+	const unsigned char *rsp_data;
+	const size_t rsp_size;
+};
+
+typedef void (*ConnectFunc)(void *data);
+
+void rilmodem_test_server_close(void);
+
+void rilmodem_test_server_create(ConnectFunc connect,
+				const struct rilmodem_test_data *test_data,
+				void *data);
diff --git a/unit/test-rilmodem-sms.c b/unit/test-rilmodem-sms.c
new file mode 100644
index 0000000..0e3bff3
--- /dev/null
+++ b/unit/test-rilmodem-sms.c
@@ -0,0 +1,267 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2015 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <assert.h>
+#include <errno.h>
+#include <glib.h>
+#include <stdio.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+#include <ofono/modem.h>
+#include <ofono/types.h>
+#include <ofono/sms.h>
+#include <gril.h>
+
+#include "common.h"
+#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;
+	gconstpointer test_data;
+	struct ofono_sms *sms;
+};
+
+typedef gboolean (*StartFunc)(gpointer data);
+
+struct sms_data {
+	StartFunc start_func;
+	const struct ofono_phone_number ph;
+	gint param_int1;
+	gint param_int2;
+
+	struct rilmodem_test_data rtd;
+	enum ofono_error_type error_type;
+	gint cb_int1;
+	gint cb_int2;
+};
+
+static void sca_query_callback(const struct ofono_error *error,
+					const struct ofono_phone_number *ph,
+					gpointer data)
+{
+	struct rilmodem_sms_data *rsd = data;
+	const struct sms_data *sd = rsd->test_data;
+
+	g_assert(error->type == sd->error_type);
+
+	if (error->type == OFONO_ERROR_TYPE_NO_ERROR) {
+		g_assert(ph->type == sd->ph.type);
+		g_assert(strcmp(ph->number, sd->ph.number) == 0);
+	}
+
+	g_main_loop_quit(mainloop);
+}
+
+static gboolean trigger_sca_query(gpointer data)
+{
+	struct rilmodem_sms_data *rsd = data;
+
+	g_assert(smsdriver->sca_query != NULL);
+	smsdriver->sca_query(rsd->sms, sca_query_callback, rsd);
+
+	return FALSE;
+}
+
+/* RIL_REQUEST_GET_SMSC_ADDRESS */
+static const guchar req_get_smsc_address_parcel_1[] = {
+	0x00, 0x00, 0x00, 0x08, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+
+/*
+ * RIL_REQUEST_GET_SMSC_ADDRESS reply with the following data:
+ *
+ * {type=145,number=34607003110}
+ */
+static const guchar rsp_get_smsc_address_data_1[] = {
+	0x12, 0x00, 0x00, 0x00, 0x22, 0x00, 0x2b, 0x00, 0x33, 0x00, 0x34, 0x00,
+	0x36, 0x00, 0x30, 0x00, 0x37, 0x00, 0x30, 0x00, 0x30, 0x00, 0x33, 0x00,
+	0x31, 0x00, 0x31, 0x00, 0x30, 0x00, 0x22, 0x00, 0x2c, 0x00, 0x31, 0x00,
+	0x34, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const struct sms_data testdata_sca_query_valid_1 = {
+	.start_func = trigger_sca_query,
+	.ph = { .number = "34607003110", .type = 145 },
+	.rtd = {
+		.req_data = req_get_smsc_address_parcel_1,
+		.req_size = sizeof(req_get_smsc_address_parcel_1),
+		.rsp_data = rsp_get_smsc_address_data_1,
+		.rsp_size = sizeof(rsp_get_smsc_address_data_1),
+		.rsp_error = RIL_E_SUCCESS,
+	},
+	.cb_int1 = 1,
+	.error_type = OFONO_ERROR_TYPE_NO_ERROR,
+};
+
+/* TODO: Did these get removed upstream? */
+
+/* Declarations && Re-implementations of core functions. */
+void ril_sms_exit(void);
+void ril_sms_init(void);
+
+struct ofono_sms {
+	void *driver_data;
+};
+
+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)
+{
+	;
+}
+
+void ofono_sms_status_notify(struct ofono_sms *sms, const unsigned char *pdu,
+				int len, int tpdu_len)
+{
+	;
+}
+
+static void server_connect_cb(gpointer data)
+{
+	struct rilmodem_sms_data *rsd = data;
+	const struct sms_data *sd = rsd->test_data;
+
+	/* This causes local impl of _create() to call driver's probe func. */
+	rsd->sms = ofono_sms_create(NULL, OFONO_RIL_VENDOR_AOSP,
+							"rilmodem", rsd);
+
+	/* add_idle doesn't work, read blocks main loop!!! */
+	g_assert(sd->start_func(rsd) == FALSE);
+}
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+/*
+ * This unit test:
+ *  - does some test data setup
+ *  - configures a dummy server socket
+ *  - creates a new gril client instance
+ *    - triggers a connect to the dummy
+ *      server socket
+ *  - starts a mainloop
+ */
+static void test_sms_func(gconstpointer data)
+{
+	const struct sms_data *sd = data;
+	struct rilmodem_sms_data *rsd;
+
+	ril_sms_init();
+
+	rsd = g_new0(struct rilmodem_sms_data, 1);
+
+	rsd->test_data = sd;
+
+	rilmodem_test_server_create(&server_connect_cb, &sd->rtd, rsd);
+
+	rsd->ril = g_ril_new(RIL_SERVER_SOCK_PATH, OFONO_RIL_VENDOR_AOSP);
+	g_assert(rsd->ril != NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+
+	g_main_loop_run(mainloop);
+	g_main_loop_unref(mainloop);
+
+	smsdriver->remove(rsd->sms);
+	g_ril_unref(rsd->ril);
+	g_free(rsd);
+
+	rilmodem_test_server_close();
+
+	ril_sms_exit();
+}
+
+#endif
+
+int main(int argc, char **argv)
+{
+	g_test_init(&argc, &argv, NULL);
+
+/*
+ * 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
+	g_test_add_data_func("/testrilmodemsms/sca_query/valid/1",
+					&testdata_sca_query_valid_1,
+					test_sms_func);
+
+#endif
+	return g_test_run();
+}
-- 
2.1.4