add LTE atom
v4 cover add LTE atom
Changes since v3:
* Fixed style issues.
* Fixed double registration of LTE atom in case of success.
* Return busy if set operation on LTE atom is pending.
Dragos Tatulea (5):
lte: add implementation for LTE atom
build: add lte atom support
ubloxmodem: add lte atom driver
build: add support for ublox lte atom driver
plugins: ublox: enable lte driver for tobyl2
Makefile.am | 8 +- drivers/ubloxmodem/lte.c | 142 +++++++++++++++ drivers/ubloxmodem/ubloxmodem.c | 3 + drivers/ubloxmodem/ubloxmodem.h | 5 + plugins/ublox.c | 3 + src/lte.c | 375 ++++++++++++++++++++++++++++++++++++++++ src/ofono.h | 1 + 7 files changed, 534 insertions(+), 3 deletions(-) create mode 100644 drivers/ubloxmodem/lte.c create mode 100644 src/lte.c
Signature · 1 line
2.7.4
PATCH v4 1/5 lte: add implementation for LTE atom
This implementation can only get/set the default APN setting. But anything expected for this atom is there:
* D-Bus interface
* sync-ing settings to/from file
* interaction with driver
--- src/lte.c | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/ofono.h | 1 + 2 files changed, 376 insertions(+) create mode 100644 src/lte.c
src/lte.c new file +375 -0
@@ -0,0 +1,375 @@ +/* +* +* oFono - Open Source Telephony +* +* Copyright (C) 2016 Endocode AG. All rights reserved. +* +* 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 <string.h> +#include <stdio.h> +#include <stdint.h> +#include <stdarg.h> +#include <errno.h> + +#include <glib.h> +#include <gdbus.h> + +#include "ofono.h" + +#include "common.h" +#include "storage.h" + +#define SETTINGS_STORE "lte" +#define SETTINGS_GROUP "Settings" +#define DEFAULT_APN_KEY "DefaultAccessPointName" + +struct ofono_lte { +const struct ofono_lte_driver *driver; +void *driver_data; +struct ofono_atom *atom; +char *imsi; +GKeyFile *settings; +DBusMessage *pending; +struct ofono_lte_default_attach_info pending_info; +struct ofono_lte_default_attach_info info; +}; + +static GSList *g_drivers =NULL ; + +static void lte_load_settings (struct ofono_lte *lte) +{ +char *apn; + +if (lte->imsi ==NULL ) +return ; + + lte->settings =storage_open (lte->imsi,SETTINGS_STORE ); + +if (lte->settings ==NULL ) { +ofono_error ("LTE: Can't open settings file, " +"changes won't be persistent" ); +return ; + } + + apn =g_key_file_get_string (lte->settings,SETTINGS_GROUP , +DEFAULT_APN_KEY ,NULL ); +if (apn) { +strcpy (lte->info.apn, apn); +g_free (apn); + } +} + +static DBusMessage *lte_get_properties (DBusConnection *conn, +DBusMessage *msg,void *data) +{ +struct ofono_lte *lte = data; +const char *apn = lte->info.apn; +DBusMessage *reply; +DBusMessageIter iter; +DBusMessageIter dict; + + reply =dbus_message_new_method_return (msg); +if (reply ==NULL ) +return NULL ; + +dbus_message_iter_init_append (reply, &iter); + +dbus_message_iter_open_container (&iter,DBUS_TYPE_ARRAY , +OFONO_PROPERTIES_ARRAY_SIGNATURE , + &dict); +ofono_dbus_dict_append (&dict,DEFAULT_APN_KEY ,DBUS_TYPE_STRING , &apn); +dbus_message_iter_close_container (&iter, &dict); + +return reply; +} + +static void lte_set_default_attach_info_cb (const struct ofono_error *error, +void *data) +{ +struct ofono_lte *lte = data; +const char *path =__ofono_atom_get_path (lte->atom); +DBusConnection *conn =ofono_dbus_get_connection (); +DBusMessage *reply; +const char *apn = lte->info.apn; + +DBG ("%s error %d" , path, error->type); + +if (error->type !=OFONO_ERROR_TYPE_NO_ERROR ) { +__ofono_dbus_pending_reply (<e->pending, +__ofono_error_failed (lte->pending)); +return ; + } + +g_strlcpy (lte->info.apn, lte->pending_info.apn, +OFONO_GPRS_MAX_APN_LENGTH +1 ); + +if (lte->settings) { +if (strlen (lte->info.apn) ==0 ) +/* Clear entry on empty APN. */ +g_key_file_remove_key (lte->settings,SETTINGS_GROUP , +DEFAULT_APN_KEY ,NULL ); +else +g_key_file_set_string (lte->settings,SETTINGS_GROUP , +DEFAULT_APN_KEY , lte->info.apn); + +storage_sync (lte->imsi,SETTINGS_STORE , lte->settings); + } + + reply =dbus_message_new_method_return (lte->pending); +__ofono_dbus_pending_reply (<e->pending, reply); + +ofono_dbus_signal_property_changed (conn, path, +OFONO_CONNECTION_CONTEXT_INTERFACE , +DEFAULT_APN_KEY , +DBUS_TYPE_STRING , &apn); +} + +static DBusMessage *lte_set_default_apn (struct ofono_lte *lte, +DBusConnection *conn,DBusMessage *msg, +const char *apn) +{ +if (strlen (apn) >OFONO_GPRS_MAX_APN_LENGTH ) +return __ofono_error_invalid_format (msg); + +if (g_str_equal (apn, lte->info.apn)) +return dbus_message_new_method_return (msg); + +/* We do care about empty value: it can be used for reset. */ +if (is_valid_apn (apn) == FALSE && apn[0 ] !='\0' ) +return __ofono_error_invalid_format (msg); + +if (lte->pending) +return __ofono_error_busy (msg); + + lte->pending =dbus_message_ref (msg); + +g_strlcpy (lte->pending_info.apn, apn,OFONO_GPRS_MAX_APN_LENGTH +1 ); + +if (lte->driver->set_default_attach_info) + lte->driver->set_default_attach_info (lte, <e->pending_info, + lte_set_default_attach_info_cb, lte); + +return NULL ; +} + +static DBusMessage *lte_set_property (DBusConnection *conn, +DBusMessage *msg,void *data) +{ +struct ofono_lte *lte = data; +DBusMessageIter iter; +DBusMessageIter var; +const char *property; +const char *str; + +if (!dbus_message_iter_init (msg, &iter)) +return __ofono_error_invalid_args (msg); + +if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_STRING ) +return __ofono_error_invalid_args (msg); + +dbus_message_iter_get_basic (&iter, &property); +dbus_message_iter_next (&iter); + +if (dbus_message_iter_get_arg_type (&iter) !=DBUS_TYPE_VARIANT ) +return __ofono_error_invalid_args (msg); + +dbus_message_iter_recurse (&iter, &var); + +if (!strcmp (property,DEFAULT_APN_KEY )) { +if (dbus_message_iter_get_arg_type (&var) !=DBUS_TYPE_STRING ) +return __ofono_error_invalid_args (msg); + +dbus_message_iter_get_basic (&var, &str); + +return lte_set_default_apn (lte, conn, msg, str); + } + +return __ofono_error_invalid_args (msg); +} + +static const GDBusMethodTable lte_methods[] = { + {GDBUS_METHOD ("GetProperties" , + NULL, GDBUS_ARGS({ "properties", "a{sv}" }), + lte_get_properties) }, + {GDBUS_ASYNC_METHOD ("SetProperty" , + GDBUS_ARGS({ "property", "s" }, { "value", "v" }), +NULL , lte_set_property) }, + { } +}; + +static const GDBusSignalTable lte_signals[] = { + {GDBUS_SIGNAL ("PropertyChanged" , + GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, + { } +}; + +static void lte_atom_remove (struct ofono_atom *atom) +{ +struct ofono_lte *lte =__ofono_atom_get_data (atom); + +DBG ("atom: %p" , atom); + +if (lte ==NULL ) +return ; + +if (lte->settings) { +storage_close (lte->imsi,SETTINGS_STORE , lte->settings, TRUE); + +g_free (lte->imsi); + lte->imsi =NULL ; + lte->settings =NULL ; + } + +if (lte->driver && lte->driver->remove) + lte->driver->remove (lte); + +g_free (lte); +} + +struct ofono_lte *ofono_lte_create (struct ofono_modem *modem, +const char *driver,void *data) +{ +struct ofono_lte *lte; +GSList *l; + +if (driver ==NULL ) +return NULL ; + + lte = g_try_new0(struct ofono_lte, 1); + +if (lte ==NULL ) +return NULL ; + + lte->atom =__ofono_modem_add_atom (modem,OFONO_ATOM_TYPE_LTE , + lte_atom_remove, lte); + +for (l = g_drivers; l; l = l->next) { +const struct ofono_lte_driver *drv = l->data; + +if (g_strcmp0 (drv->name, driver)) +continue ; + +if (drv->probe (lte, data) <0 ) +continue ; + + lte->driver = drv; +break ; + } + +DBG ("LTE atom created" ); + +return lte; +} + +int ofono_lte_driver_register (const struct ofono_lte_driver *d) +{ +DBG ("driver: %p, name: %s" , d, d->name); + +if (d->probe ==NULL ) +return -EINVAL ; + + g_drivers =g_slist_prepend (g_drivers, (void *) d); + +return 0 ; +} + +void ofono_lte_driver_unregister (const struct ofono_lte_driver *d) +{ +DBG ("driver: %p, name: %s" , d, d->name); + + g_drivers =g_slist_remove (g_drivers, (void *) d); +} + +static void lte_atom_unregister (struct ofono_atom *atom) +{ +DBusConnection *conn =ofono_dbus_get_connection (); +struct ofono_modem *modem =__ofono_atom_get_modem (atom); +const char *path =__ofono_atom_get_path (atom); + +ofono_modem_remove_interface (modem,OFONO_LTE_INTERFACE ); +g_dbus_unregister_interface (conn, path,OFONO_LTE_INTERFACE ); +} + +static void ofono_lte_finish_register (struct ofono_lte *lte) +{ +DBusConnection *conn =ofono_dbus_get_connection (); +struct ofono_modem *modem =__ofono_atom_get_modem (lte->atom); +const char *path =__ofono_atom_get_path (lte->atom); + +if (!g_dbus_register_interface (conn, path, +OFONO_LTE_INTERFACE , + lte_methods, lte_signals,NULL , + lte,NULL )) { +ofono_error ("could not create %s interface" , +OFONO_LTE_INTERFACE ); +return ; + } + +ofono_modem_add_interface (modem,OFONO_LTE_INTERFACE ); + +__ofono_atom_register (lte->atom, lte_atom_unregister); +} + +static void lte_init_default_attach_info_cb (const struct ofono_error *error, +void *data) +{ +struct ofono_lte *lte = data; + +ofono_lte_finish_register (lte); +} + +void ofono_lte_register (struct ofono_lte *lte) +{ +struct ofono_modem *modem =__ofono_atom_get_modem (lte->atom); +struct ofono_sim *sim =__ofono_atom_find (OFONO_ATOM_TYPE_SIM , modem); +const char *imsi =ofono_sim_get_imsi (sim); + +if (imsi ==NULL ) { +ofono_error ("No sim atom required for registering LTE atom." ); +return ; + } + + lte->imsi =g_strdup (imsi); + +lte_load_settings (lte); +if (lte->driver->set_default_attach_info) { + lte->driver->set_default_attach_info (lte, <e->info, + lte_init_default_attach_info_cb, lte); +return ; + } + +ofono_lte_finish_register (lte); +} + +void ofono_lte_remove (struct ofono_lte *lte) +{ +__ofono_atom_free (lte->atom); +} + +void ofono_lte_set_data (struct ofono_lte *lte,void *data) +{ + lte->driver_data = data; +} + +void *ofono_lte_get_data (const struct ofono_lte *lte) +{ +return lte->driver_data; +}
src/ofono.h +1 -0
@@ -533,3 +533,4 @@ ofono_bool_t __ofono_private_network_request(ofono_private_network_cb_t cb, int *id, void *data);#include <ofono/netmon.h> +#include <ofono/lte.h>
Signature · 1 line
2.7.4
PATCH v4 2/5 build: add lte atom support
In reply to Dragos Tatulea--- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile.am +2 -2
@@ -22,7 +22,7 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \ include/private-network.h include/cdma-netreg.h \ include/cdma-provision.h include/handsfree.h \ include/handsfree-audio.h include/siri.h \ - include/netmon.h + include/netmon.h include/lte.h nodist_pkginclude_HEADERS = include/version.h
@@ -605,7 +605,7 @@ src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \ src/cdma-provision.c src/handsfree.c \ src/handsfree-audio.c src/bluetooth.h \ src/hfp.h src/siri.c \ - src/netmon.c + src/netmon.c src/lte.c src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \ @GLIB_LIBS@ @DBUS_LIBS@ -ldl
Signature · 1 line
2.7.4
PATCH v4 3/5 ubloxmodem: add lte atom driver
In reply to Dragos TatuleaAdds U-Blox Toby L2 driver for setting the default APN via the +UCGDFLT command. Currently only IPv4 is supported. APN is not stored to modem's non-volatile memory. oFono will manage this default APN via it's config storage.
When receiving an empty default APN, the value is reset.
--- drivers/ubloxmodem/lte.c | 142 ++++++++++++++++++++++++++++++++++++++++ drivers/ubloxmodem/ubloxmodem.c | 3 + drivers/ubloxmodem/ubloxmodem.h | 5 ++ 3 files changed, 150 insertions(+) create mode 100644 drivers/ubloxmodem/lte.c
drivers/ubloxmodem/lte.c new file +142 -0
@@ -0,0 +1,142 @@ +/* +* +* oFono - Open Source Telephony +* +* Copyright (C) 2016 Endocode AG. All rights reserved. +* +* 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 <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <glib.h> + +#include <ofono/modem.h> +#include <ofono/gprs-context.h> +#include <ofono/log.h> +#include <ofono/lte.h> + +#include "gatchat.h" +#include "gatresult.h" + +#include "ubloxmodem.h" + +static const char *ucgdflt_prefix[] = {"+UCGDFLT:" ,NULL }; + +struct lte_driver_data { +GAtChat *chat; +}; + +static void ucgdflt_cb (gboolean ok,GAtResult *result,gpointer user_data) +{ +struct cb_data *cbd = user_data; +ofono_lte_cb_t cb = cbd->cb; +struct ofono_error error; + +DBG ("ok %d" , ok); + +decode_at_error (&error,g_at_result_final_response (result)); +cb (&error, cbd->data); +} + +static void ublox_lte_set_default_attach_info (const struct ofono_lte *lte, +const struct ofono_lte_default_attach_info *info, +ofono_lte_cb_t cb,void *data) +{ +struct lte_driver_data *ldd =ofono_lte_get_data (lte); +char buf[32 +OFONO_GPRS_MAX_APN_LENGTH +1 ]; +struct cb_data *cbd =cb_data_new (cb, data); + +DBG ("LTE config with APN: %s" , info->apn); + +if (strlen (info->apn) >0 ) +snprintf (buf,sizeof (buf),"AT+UCGDFLT=0,\"IP\",\"%s\"" , + info->apn); +else +snprintf (buf,sizeof (buf),"AT+UCGDFLT=0" ); + +/* We can't do much in case of failure so don't check response. */ +if (g_at_chat_send (ldd->chat, buf, ucgdflt_prefix, + ucgdflt_cb, cbd, g_free) >0 ) +return ; + +CALLBACK_WITH_FAILURE (cb, data); +} + +static gboolean lte_delayed_register (gpointer user_data) +{ +struct ofono_lte *lte = user_data; + +ofono_lte_register (lte); + +return FALSE; +} + +static int ublox_lte_probe (struct ofono_lte *lte,void *data) +{ +GAtChat *chat = data; +struct lte_driver_data *ldd; + +DBG ("ublox lte probe" ); + + ldd = g_try_new0(struct lte_driver_data, 1); +if (!ldd) +return -ENOMEM ; + + ldd->chat =g_at_chat_clone (chat); + +ofono_lte_set_data (lte, ldd); + +g_idle_add (lte_delayed_register, lte); + +return 0 ; +} + +static void ublox_lte_remove (struct ofono_lte *lte) +{ +struct lte_driver_data *ldd =ofono_lte_get_data (lte); + +DBG ("ublox lte remove" ); + +g_at_chat_unref (ldd->chat); + +ofono_lte_set_data (lte,NULL ); + +g_free (ldd); +} + +static struct ofono_lte_driver driver = { + .name =UBLOXMODEM , + .probe = ublox_lte_probe, + .remove = ublox_lte_remove, + .set_default_attach_info = ublox_lte_set_default_attach_info, +}; + +void ublox_lte_init (void ) +{ +ofono_lte_driver_register (&driver); +} + +void ublox_lte_exit (void ) +{ +ofono_lte_driver_unregister (&driver); +}
drivers/ubloxmodem/ubloxmodem.c +3 -0
@@ -29,12 +29,14 @@#define OFONO_API_SUBJECT_TO_CHANGE #include <ofono/plugin.h> #include <ofono/types.h> +#include <ofono/modem.h> #include "ubloxmodem.h" static int ubloxmodem_init (void ) {ublox_gprs_context_init (); +ublox_lte_init ();return 0 ; }
@@ -42,6 +44,7 @@ static int ubloxmodem_init(void)static void ubloxmodem_exit (void ) {ublox_gprs_context_exit (); +ublox_lte_exit (); } OFONO_PLUGIN_DEFINE(ubloxmodem, "U-Blox Toby L2 high speed modem driver",
drivers/ubloxmodem/ubloxmodem.h +5 -0
@@ -21,5 +21,10 @@#include <drivers/atmodem/atutil.h> +#define UBLOXMODEM "ubloxmodem" +extern void ublox_gprs_context_init (void );extern void ublox_gprs_context_exit (void ); + +extern void ublox_lte_init (void ); +extern void ublox_lte_exit (void );
Signature · 1 line
2.7.4
PATCH v4 4/5 build: add support for ublox lte atom driver
In reply to Dragos Tatulea--- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Makefile.am +3 -1
@@ -382,7 +382,9 @@ builtin_modules += ubloxmodem builtin_sources += drivers/atmodem/atutil.h \ drivers/ubloxmodem/ubloxmodem.h \ drivers/ubloxmodem/ubloxmodem.c \ - drivers/ubloxmodem/gprs-context.c + drivers/ubloxmodem/gprs-context.c \ + drivers/ubloxmodem/lte.c + if PHONESIM
Signature · 1 line
2.7.4
PATCH v4 5/5 plugins: ublox: enable lte driver for tobyl2
In reply to Dragos Tatulea--- plugins/ublox.c | 3 +++ 1 file changed, 3 insertions(+)
plugins/ublox.c +3 -0
@@ -38,6 +38,7 @@#include <ofono/sim.h> #include <ofono/gprs.h> #include <ofono/gprs-context.h> +#include <ofono/lte.h> #include <drivers/atmodem/atutil.h> #include <drivers/atmodem/vendor.h>
@@ -313,6 +314,8 @@ static void ublox_post_sim(struct ofono_modem *modem) --ncontexts; } + +ofono_lte_create (modem,"ubloxmodem" , data->aux); }static void ublox_post_online (struct ofono_modem *modem)
Signature · 1 line
2.7.4
Hi Dragos,
Quoted 20 lines · Dragos Tatulea
Changes since v3:
* Fixed style issues.
* Fixed double registration of LTE atom in case of success.
* Return busy if set operation on LTE atom is pending.Dragos Tatulea (5):
lte: add implementation for LTE atom
build: add lte atom support
ubloxmodem: add lte atom driver
build: add support for ublox lte atom driver
plugins: ublox: enable lte driver for tobyl2Makefile.am | 8 +- drivers/ubloxmodem/lte.c | 142 +++++++++++++++ drivers/ubloxmodem/ubloxmodem.c | 3 + drivers/ubloxmodem/ubloxmodem.h | 5 + plugins/ublox.c | 3 + src/lte.c | 375 ++++++++++++++++++++++++++++++++++++++++ src/ofono.h | 1 + 7 files changed, 534 insertions(+), 3 deletions(-)
Quoted 3 lines
create mode 100644
drivers/ubloxmodem/lte.c
create mode 100644src/lte.c
All applied, thanks. I did add a couple of small fixes in between. Please eyeball these and make sure I didn't screw something up.
Regards,
-Denis