[PATCH v2, 7/7] cdmaphonesim: Add CDMA SMS Support

[PATCH v2, 7/7] cdmaphonesim: Add CDMA SMS Support

[Lei Yu]

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

---
 Makefile.am               |   10 ++
 plugins/cdmaphonesim.c    |  328 +++++++++++++++++++++++++++++++++++++++++++++
 plugins/cdmaphonesim.conf |   14 ++
 3 files changed, 352 insertions(+), 0 deletions(-)
 create mode 100644 plugins/cdmaphonesim.c
 create mode 100644 plugins/cdmaphonesim.conf

diff --git a/Makefile.am b/Makefile.am
index 771f57d..2e6814e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -247,6 +247,16 @@ builtin_modules += cdma_atmodem
 builtin_sources += drivers/cdmamodem/cdmamodem.h \
 			drivers/cdmamodem/cdmamodem.c \
 			drivers/cdmamodem/sms.c
+
+if PHONESIM
+builtin_modules += cdmaphonesim
+builtin_sources += plugins/cdmaphonesim.c
+
+if DATAFILES
+conf_DATA += plugins/cdmaphonesim.conf
+endif
+endif
+
 endif
 
 builtin_modules += g1
diff --git a/plugins/cdmaphonesim.c b/plugins/cdmaphonesim.c
new file mode 100644
index 0000000..ca9e358
--- /dev/null
+++ b/plugins/cdmaphonesim.c
@@ -0,0 +1,328 @@
+/*
+ * This file is part of oFono - Open Source Telephony
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * 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
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <glib.h>
+#include <gatmux.h>
+#include <gatchat.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/cdma-sms.h>
+#include <drivers/atmodem/atutil.h>
+
+struct cdmaphonesim_data {
+	GAtChat *chat;
+};
+
+static int cdmaphonesim_probe(struct ofono_modem *modem)
+{
+	struct cdmaphonesim_data *data;
+
+	DBG("%p", modem);
+
+	data = g_try_new0(struct cdmaphonesim_data, 1);
+	if (data == NULL)
+		return -ENOMEM;
+
+	ofono_modem_set_data(modem, data);
+
+	return 0;
+}
+
+static void cdmaphonesim_remove(struct ofono_modem *modem)
+{
+	struct cdmaphonesim_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	g_free(data);
+	ofono_modem_set_data(modem, NULL);
+}
+
+static void cdmaphonesim_debug(const char *str, void *user_data)
+{
+	ofono_info("%s", str);
+}
+
+static void cfun_set_on_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+
+	DBG("");
+
+	ofono_modem_set_powered(modem, ok);
+}
+
+static void cdmaphonesim_disconnected(gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct cdmaphonesim_data *data = ofono_modem_get_data(modem);
+
+	DBG("");
+
+	ofono_modem_set_powered(modem, FALSE);
+
+	g_at_chat_unref(data->chat);
+	data->chat = NULL;
+}
+
+static int cdmaphonesim_enable(struct ofono_modem *modem)
+{
+	struct cdmaphonesim_data *data = ofono_modem_get_data(modem);
+	GIOChannel *io;
+	GAtSyntax *syntax;
+	struct sockaddr_in addr;
+	const char *address;
+	int sk, err, port;
+
+	DBG("%p", modem);
+
+	address = ofono_modem_get_string(modem, "Address");
+	if (address == NULL)
+		return -EINVAL;
+
+	port = ofono_modem_get_integer(modem, "Port");
+	if (port < 0)
+		return -EINVAL;
+
+	sk = socket(PF_INET, SOCK_STREAM, 0);
+	if (sk < 0)
+		return -EINVAL;
+
+	memset(&addr, 0, sizeof(addr));
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = inet_addr(address);
+	addr.sin_port = htons(port);
+
+	err = connect(sk, (struct sockaddr *) &addr, sizeof(addr));
+	if (err < 0) {
+		close(sk);
+		return err;
+	}
+
+	io = g_io_channel_unix_new(sk);
+	if (io == NULL) {
+		close(sk);
+		return -ENOMEM;
+	}
+
+	syntax = g_at_syntax_new_gsmv1();
+
+	data->chat = g_at_chat_new(io, syntax);
+
+	g_at_syntax_unref(syntax);
+	g_io_channel_unref(io);
+
+	if (data->chat == NULL)
+		return -ENOMEM;
+
+	if (getenv("OFONO_AT_DEBUG"))
+		g_at_chat_set_debug(data->chat, cdmaphonesim_debug, NULL);
+
+	g_at_chat_set_disconnect_function(data->chat,
+					cdmaphonesim_disconnected, modem);
+
+	g_at_chat_send(data->chat, "AT+CFUN=1", NULL,
+					cfun_set_on_cb, modem, NULL);
+
+	return -EINPROGRESS;
+}
+
+static int cdmaphonesim_disable(struct ofono_modem *modem)
+{
+	struct cdmaphonesim_data *data = ofono_modem_get_data(modem);
+
+	DBG("%p", modem);
+
+	g_at_chat_unref(data->chat);
+	data->chat = NULL;
+
+	return 0;
+}
+
+static void cdmaphonesim_pre_sim(struct ofono_modem *modem)
+{
+	DBG("%p", modem);
+}
+
+static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_modem_online_cb_t callback = cbd->cb;
+	struct ofono_error error;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	callback(&error, cbd->data);
+}
+
+static void cdmaphonesim_set_online(struct ofono_modem *modem,
+					ofono_bool_t online,
+					ofono_modem_online_cb_t cb,
+					void *user_data)
+{
+	struct cdmaphonesim_data *data = ofono_modem_get_data(modem);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	char const *command = online ? "AT+CFUN=1" : "AT+CFUN=4";
+
+	DBG("modem %p %s", modem, online ? "online" : "offline");
+
+	if (cbd == NULL)
+		goto error;
+
+	if (g_at_chat_send(data->chat, command, NULL,
+				set_online_cb, cbd, g_free))
+		return;
+
+error:
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+}
+
+static void cdmaphonesim_post_online(struct ofono_modem *modem)
+{
+	struct cdmaphonesim_data *data = ofono_modem_get_data(modem);
+
+	ofono_cdma_sms_create(modem, 0, "cdmamodem", data->chat);
+}
+
+static struct ofono_modem_driver cdmaphonesim_driver = {
+	.name		= "cdmaphonesim",
+	.probe		= cdmaphonesim_probe,
+	.remove		= cdmaphonesim_remove,
+	.enable		= cdmaphonesim_enable,
+	.disable	= cdmaphonesim_disable,
+	.pre_sim	= cdmaphonesim_pre_sim,
+	.set_online	= cdmaphonesim_set_online,
+	.post_online	= cdmaphonesim_post_online,
+};
+
+static struct ofono_modem *create_modem(GKeyFile *keyfile, const char *group)
+{
+	struct ofono_modem *modem;
+	char *value;
+
+	DBG("group %s", group);
+
+	modem = ofono_modem_create(group, "cdmaphonesim");
+	if (modem == NULL)
+		return NULL;
+
+	value = g_key_file_get_string(keyfile, group, "Address", NULL);
+	if (value == NULL)
+		goto error;
+
+	ofono_modem_set_string(modem, "Address", value);
+	g_free(value);
+
+	value = g_key_file_get_string(keyfile, group, "Port", NULL);
+	if (value == NULL)
+		goto error;
+
+	ofono_modem_set_integer(modem, "Port", atoi(value));
+	g_free(value);
+
+	DBG("%p", modem);
+
+	return modem;
+
+error:
+	ofono_error("Missing address or port setting for %s", group);
+
+	ofono_modem_remove(modem);
+
+	return NULL;
+}
+
+static GSList *modem_list;
+
+static void parse_config(const char *filename)
+{
+	GKeyFile *keyfile;
+	GError *err = NULL;
+	char **modems;
+	int i;
+
+	DBG("filename %s", filename);
+
+	keyfile = g_key_file_new();
+
+	g_key_file_set_list_separator(keyfile, ',');
+
+	if (!g_key_file_load_from_file(keyfile, filename, 0, &err)) {
+		ofono_warn("Reading of %s failed: %s", filename, err->message);
+		g_error_free(err);
+		goto done;
+	}
+
+	modems = g_key_file_get_groups(keyfile, NULL);
+
+	for (i = 0; modems[i]; i++) {
+		struct ofono_modem *modem;
+
+		modem = create_modem(keyfile, modems[i]);
+		if (modem == NULL)
+			continue;
+
+		modem_list = g_slist_prepend(modem_list, modem);
+
+		ofono_modem_register(modem);
+	}
+
+	g_strfreev(modems);
+
+done:
+	g_key_file_free(keyfile);
+}
+
+static int cdmaphonesim_init(void)
+{
+	int err;
+
+	err = ofono_modem_driver_register(&cdmaphonesim_driver);
+	if (err < 0)
+		return err;
+
+	parse_config(CONFIGDIR "/cdmaphonesim.conf");
+	return 0;
+}
+
+static void cdmaphonesim_exit(void)
+{
+	ofono_modem_driver_unregister(&cdmaphonesim_driver);
+}
+
+OFONO_PLUGIN_DEFINE(cdmaphonesim, "CDMA PhoneSIM driver", VERSION,
+	OFONO_PLUGIN_PRIORITY_DEFAULT, cdmaphonesim_init, cdmaphonesim_exit)
diff --git a/plugins/cdmaphonesim.conf b/plugins/cdmaphonesim.conf
new file mode 100644
index 0000000..9b8bdac
--- /dev/null
+++ b/plugins/cdmaphonesim.conf
@@ -0,0 +1,14 @@
+# This is a sample file for the cdmaphonesim configuration
+#
+# It should be installed in your oFono system directory,
+# e.g. /etc/ofono/cdmaphonesim.conf
+#
+# Each group is parsed as a modem device
+#
+# Each group shall@least define the address and port
+#   Address = <valid IPv4 address format>
+#   Port = <valid TCP port>
+
+#[cdmaphonesim]
+#Address=127.0.0.1
+#Port=12345
-- 
1.7.0.4

Re: [PATCH v2, 7/7] cdmaphonesim: Add CDMA SMS Support

[Marcel Holtmann]

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

Hi Lei,

>  Makefile.am               |   10 ++
>  plugins/cdmaphonesim.c    |  328 +++++++++++++++++++++++++++++++++++++++++++++
>  plugins/cdmaphonesim.conf |   14 ++
>  3 files changed, 352 insertions(+), 0 deletions(-)
>  create mode 100644 plugins/cdmaphonesim.c
>  create mode 100644 plugins/cdmaphonesim.conf

do we really want to do it this way? I am not so sure that this is the
best way.

I would prefer to just have one /etc/ofono/phonesim.conf configuration
file. And maybe we need to start splitting phonesim plugin into a view
pieces and move it to its own directory. It then could also contain its
own atom driver implementations there.

So my main concern here is really that phonesim support is just for
engineering. It has nothing to do with real production hardware. And I
don't wanna clutter the source or its installation with it.

Regards

Marcel

Re: [PATCH v2, 7/7] cdmaphonesim: Add CDMA SMS Support

[Marcel Holtmann]

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

Hi Lei,

> >>   Makefile.am               |   10 ++
> >>   plugins/cdmaphonesim.c    |  328 +++++++++++++++++++++++++++++++++++++++++++++
> >>   plugins/cdmaphonesim.conf |   14 ++
> >>   3 files changed, 352 insertions(+), 0 deletions(-)
> >>   create mode 100644 plugins/cdmaphonesim.c
> >>   create mode 100644 plugins/cdmaphonesim.conf
> >
> > do we really want to do it this way? I am not so sure that this is the
> > best way.
> >
> > I would prefer to just have one /etc/ofono/phonesim.conf configuration
> > file. And maybe we need to start splitting phonesim plugin into a view
> > pieces and move it to its own directory. It then could also contain its
> > own atom driver implementations there.
> >
> > So my main concern here is really that phonesim support is just for
> > engineering. It has nothing to do with real production hardware. And I
> > don't wanna clutter the source or its installation with it.
> 
> I do see your points. I agree having one phonesim.conf instead of 
> creating a separate installation/configuration file for cdmaphonesim.
> In terms of whether having seperate cdmaphonesim plugin from phonesim, 
> Denis and myself has discussed in the mailing list, please see:
>     http://lists.ofono.org/pipermail/ofono/2010-December/006629.html
> To re-cap some of the points and what we have agreed in previous discussion:
>     The benefit of having separate cdmaphonesim plugin is to not clutter 
> existing GSM based phonesim plugin with a lot of if/else to cover CDMA 
> and let CDMA evolve on its own path for a while, at least having most of
> the atoms supported, we can then evaluate how much commonality we have 
> and whether it makes sense to merge cdmaphonesim.c with phonesim.c.
>     Another benefit or point we have considered is to cause as little 
> disruption to GSM side as possible.
> 
> Thus, I would propose followings:
>      a). Remove cdmaphonesim.conf and add one additional entry within 
> phonesim.conf to support cdmaphonesim plugin.
>      b). Keep cdmaphonesim.c and phonesim.c separated and let CDMA 
> evolving on its own for now.

sounds good enough for me now. Have one /etc/ofono/phonesim.conf and
each plugin picks the entries it cares about. And for now we keep two
plugins, but at some point we have to revisit this.

Regards

Marcel

Re: [PATCH v2, 7/7] cdmaphonesim: Add CDMA SMS Support

[Lei Yu]

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

Hi Marcel,

On 12/22/2010 05:41 AM, ext Marcel Holtmann wrote:
> Hi Lei,
>
>>   Makefile.am               |   10 ++
>>   plugins/cdmaphonesim.c    |  328 +++++++++++++++++++++++++++++++++++++++++++++
>>   plugins/cdmaphonesim.conf |   14 ++
>>   3 files changed, 352 insertions(+), 0 deletions(-)
>>   create mode 100644 plugins/cdmaphonesim.c
>>   create mode 100644 plugins/cdmaphonesim.conf
>
> do we really want to do it this way? I am not so sure that this is the
> best way.
>
> I would prefer to just have one /etc/ofono/phonesim.conf configuration
> file. And maybe we need to start splitting phonesim plugin into a view
> pieces and move it to its own directory. It then could also contain its
> own atom driver implementations there.
>
> So my main concern here is really that phonesim support is just for
> engineering. It has nothing to do with real production hardware. And I
> don't wanna clutter the source or its installation with it.

I do see your points. I agree having one phonesim.conf instead of 
creating a separate installation/configuration file for cdmaphonesim.
In terms of whether having seperate cdmaphonesim plugin from phonesim, 
Denis and myself has discussed in the mailing list, please see:
    http://lists.ofono.org/pipermail/ofono/2010-December/006629.html
To re-cap some of the points and what we have agreed in previous discussion:
    The benefit of having separate cdmaphonesim plugin is to not clutter 
existing GSM based phonesim plugin with a lot of if/else to cover CDMA 
and let CDMA evolve on its own path for a while, at least having most of
the atoms supported, we can then evaluate how much commonality we have 
and whether it makes sense to merge cdmaphonesim.c with phonesim.c.
    Another benefit or point we have considered is to cause as little 
disruption to GSM side as possible.

Thus, I would propose followings:
     a). Remove cdmaphonesim.conf and add one additional entry within 
phonesim.conf to support cdmaphonesim plugin.
     b). Keep cdmaphonesim.c and phonesim.c separated and let CDMA 
evolving on its own for now.

Looking forward to hearing you, Denis and other people's oppinions on 
this topic.

>
> Regards
>
> Marcel
>
>
> _______________________________________________
> ofono mailing list
> ofono(a)ofono.org
> http://lists.ofono.org/listinfo/ofono

Regards,
Lei

Re: [PATCH v2, 7/7] cdmaphonesim: Add CDMA SMS Support

[Lei Yu]

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

Hi Marcel,

On 12/22/2010 08:09 AM, ext Marcel Holtmann wrote:
> Hi Lei,
>
>>>>    Makefile.am               |   10 ++
>>>>    plugins/cdmaphonesim.c    |  328 +++++++++++++++++++++++++++++++++++++++++++++
>>>>    plugins/cdmaphonesim.conf |   14 ++
>>>>    3 files changed, 352 insertions(+), 0 deletions(-)
>>>>    create mode 100644 plugins/cdmaphonesim.c
>>>>    create mode 100644 plugins/cdmaphonesim.conf
>>>
>>> do we really want to do it this way? I am not so sure that this is the
>>> best way.
>>>
>>> I would prefer to just have one /etc/ofono/phonesim.conf configuration
>>> file. And maybe we need to start splitting phonesim plugin into a view
>>> pieces and move it to its own directory. It then could also contain its
>>> own atom driver implementations there.
>>>
>>> So my main concern here is really that phonesim support is just for
>>> engineering. It has nothing to do with real production hardware. And I
>>> don't wanna clutter the source or its installation with it.
>>
>> I do see your points. I agree having one phonesim.conf instead of
>> creating a separate installation/configuration file for cdmaphonesim.
>> In terms of whether having seperate cdmaphonesim plugin from phonesim,
>> Denis and myself has discussed in the mailing list, please see:
>>      http://lists.ofono.org/pipermail/ofono/2010-December/006629.html
>> To re-cap some of the points and what we have agreed in previous discussion:
>>      The benefit of having separate cdmaphonesim plugin is to not clutter
>> existing GSM based phonesim plugin with a lot of if/else to cover CDMA
>> and let CDMA evolve on its own path for a while, at least having most of
>> the atoms supported, we can then evaluate how much commonality we have
>> and whether it makes sense to merge cdmaphonesim.c with phonesim.c.
>>      Another benefit or point we have considered is to cause as little
>> disruption to GSM side as possible.
>>
>> Thus, I would propose followings:
>>       a). Remove cdmaphonesim.conf and add one additional entry within
>> phonesim.conf to support cdmaphonesim plugin.
>>       b). Keep cdmaphonesim.c and phonesim.c separated and let CDMA
>> evolving on its own for now.
>
> sounds good enough for me now. Have one /etc/ofono/phonesim.conf and
> each plugin picks the entries it cares about. And for now we keep two
> plugins, but at some point we have to revisit this.

Yes, we will need to revisit this and other part of the CDMA for 
similarities with GSM down the road. Will get going on v3 of the patch. :-)

>
> Regards
>
> Marcel
>
>

Regards
Lei

Re: [PATCH v2, 7/7] cdmaphonesim: Add CDMA SMS Support

[Lei Yu]

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

Hi, Marcel and all,

On 12/22/2010 08:23 AM, ext Lei Yu wrote:
> Hi Marcel,
>
> On 12/22/2010 08:09 AM, ext Marcel Holtmann wrote:
>> Hi Lei,
>>
>>>>> Makefile.am | 10 ++
>>>>> plugins/cdmaphonesim.c | 328
>>>>> +++++++++++++++++++++++++++++++++++++++++++++
>>>>> plugins/cdmaphonesim.conf | 14 ++
>>>>> 3 files changed, 352 insertions(+), 0 deletions(-)
>>>>> create mode 100644 plugins/cdmaphonesim.c
>>>>> create mode 100644 plugins/cdmaphonesim.conf
>>>>
>>>> do we really want to do it this way? I am not so sure that this is the
>>>> best way.
>>>>
>>>> I would prefer to just have one /etc/ofono/phonesim.conf configuration
>>>> file. And maybe we need to start splitting phonesim plugin into a view
>>>> pieces and move it to its own directory. It then could also contain its
>>>> own atom driver implementations there.
>>>>
>>>> So my main concern here is really that phonesim support is just for
>>>> engineering. It has nothing to do with real production hardware. And I
>>>> don't wanna clutter the source or its installation with it.
>>>
>>> I do see your points. I agree having one phonesim.conf instead of
>>> creating a separate installation/configuration file for cdmaphonesim.
>>> In terms of whether having seperate cdmaphonesim plugin from phonesim,
>>> Denis and myself has discussed in the mailing list, please see:
>>> http://lists.ofono.org/pipermail/ofono/2010-December/006629.html
>>> To re-cap some of the points and what we have agreed in previous
>>> discussion:
>>> The benefit of having separate cdmaphonesim plugin is to not clutter
>>> existing GSM based phonesim plugin with a lot of if/else to cover CDMA
>>> and let CDMA evolve on its own path for a while, at least having most of
>>> the atoms supported, we can then evaluate how much commonality we have
>>> and whether it makes sense to merge cdmaphonesim.c with phonesim.c.
>>> Another benefit or point we have considered is to cause as little
>>> disruption to GSM side as possible.
>>>
>>> Thus, I would propose followings:
>>> a). Remove cdmaphonesim.conf and add one additional entry within
>>> phonesim.conf to support cdmaphonesim plugin.
>>> b). Keep cdmaphonesim.c and phonesim.c separated and let CDMA
>>> evolving on its own for now.
>>
>> sounds good enough for me now. Have one /etc/ofono/phonesim.conf and
>> each plugin picks the entries it cares about. And for now we keep two
>> plugins, but at some point we have to revisit this.
>
> Yes, we will need to revisit this and other part of the CDMA for
> similarities with GSM down the road. Will get going on v3 of the patch. :-)
>
>>
>> Regards
>>
>> Marcel
>>
>>
>
> Regards
> Lei
> _______________________________________________
> ofono mailing list
> ofono(a)ofono.org
> http://lists.ofono.org/listinfo/ofono


I just submitted v3 of this patch fixing the issue Marcel brought up. 
Pls review v3 instead of v2.

Regards
Lei