6:27 p.m.
added 4 properties for handling the type of context and the
authentication method, exactly like in any gprs context handling.
The properties are named after the equivalent gprs-context one, for
compatibility and uniformity.
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
---
doc/lte-api.txt | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/doc/lte-api.txt b/doc/lte-api.txt
index 8a2a97d9..fe575cc6 100644
--- a/doc/lte-api.txt
+++ b/doc/lte-api.txt
@@ -33,3 +33,43 @@ Properties string DefaultAccessPointName [readwrite]
Setting this property to an empty string clears the
default APN from the modem.
+
+ string Protocol [readwrite]
+
+ Holds the protocol for this context. Valid values
+ are: "ip", "ipv6" and "dual". Default value is
"ip".
+
+ string AuthenticationMethod [readwrite]
+
+ Sets the Method used for the authentication
+ for the default APN.
+
+ Available values are "none", "pap" and "chap".
+ Default is "none".
+
+ If the AuthenticationMethod is set to 'none' it remove
+ the authentication for the DefaultAPN.
+ In case of AuthenticationMethod 'none',
+ if the Username and Password properties are not empty,
+ the values are preserved in the properties, but they
+ are not used or transmitted to the module.
+ Conversely, if Username or Password are empty, the
+ authentication method selected internally is 'none',
+ but the property AuthenticationMethod is left unchanged.
+
+ If the default APN supports authentication and it
+ fails, then it is up to the network how to proceed.
+ In general LTE access is denied and the modem can
+ fallback to a legacy technology if capable and another
+ radio technology is available.
+
+ string Username [readwrite]
+
+ Holds the username to be used for authentication
+ purposes.
+
+ string Password [readwrite]
+
+ Holds the password to be used for authentication
+ purposes.
+
--
2.17.1
6:27 p.m.
New subject: [PATCH 2/5] lte.h: added proto and authentication handling
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
The ofono_lte_default_attach_info is extended with protocol,
authentication method, username and password.
The transmission of this info from the src to the atom happens
through the existing set_default_attach_info.
A signal is emitted when one of these properties changes
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
---
include/lte.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/lte.h b/include/lte.h
index 0f2501c0..2f12ac29 100644
--- a/include/lte.h
+++ b/include/lte.h
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2016 Endocode AG. All rights reserved.
+ * Copyright (C) 2018 Gemalto M2M
*
* 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
@@ -32,6 +33,10 @@ struct ofono_lte;
struct ofono_lte_default_attach_info {
char apn[OFONO_GPRS_MAX_APN_LENGTH + 1];
+ enum ofono_gprs_proto proto;
+ enum ofono_gprs_auth_method auth_method;
+ char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
+ char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
};
typedef void (*ofono_lte_cb_t)(const struct ofono_error *error, void *data);
--
2.17.1
6:44 p.m.
New subject: [PATCH 2/5] lte.h: added proto and authentication handling
Hi,
Pass --prefix="PATCH v2" and --cover-letter options to git-format-patch
in order to differentiate your patch submissions from each other.
On 12/10/18 09:27, Giacinto Cifelli wrote:
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
Tags go after description, and you've already got this down below anyway.
>
> The ofono_lte_default_attach_info is extended with protocol,
> authentication method, username and password.
> The transmission of this info from the src to the atom happens
> through the existing set_default_attach_info.
> A signal is emitted when one of these properties changes
>
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
> ---
> include/lte.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/include/lte.h b/include/lte.h
> index 0f2501c0..2f12ac29 100644
> --- a/include/lte.h
> +++ b/include/lte.h
> @@ -3,6 +3,7 @@
> * oFono - Open Source Telephony
> *
> * Copyright (C) 2016 Endocode AG. All rights reserved.
> + * Copyright (C) 2018 Gemalto M2M
I wouldn't add a copyright line for a trivial change like this...
*
* 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
@@ -32,6 +33,10 @@ struct ofono_lte;
struct ofono_lte_default_attach_info {
char apn[OFONO_GPRS_MAX_APN_LENGTH + 1];
+ enum ofono_gprs_proto proto;
+ enum ofono_gprs_auth_method auth_method;
+ char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
+ char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
};
typedef void (*ofono_lte_cb_t)(const struct ofono_error *error, void *data);
/Jonas
6:48 p.m.
New subject: [PATCH 2/5] lte.h: added proto and authentication handling
Hi,
On Fri, Oct 12, 2018 at 9:44 AM Jonas Bonn <jonas(a)southpole.se> wrote:
Hi,
Pass --prefix="PATCH v2" and --cover-letter options to git-format-patch
in order to differentiate your patch submissions from each other.
thanks. I will re-submit with all this.
On 12/10/18 09:27, Giacinto Cifelli wrote:
> Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
Tags go after description, and you've already got this down below anyway.
yes, I have noticed too late, sorry.
>
> The ofono_lte_default_attach_info is extended with protocol,
> authentication method, username and password.
> The transmission of this info from the src to the atom happens
> through the existing set_default_attach_info.
> A signal is emitted when one of these properties changes
>
> Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
> ---
> include/lte.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/include/lte.h b/include/lte.h
> index 0f2501c0..2f12ac29 100644
> --- a/include/lte.h
> +++ b/include/lte.h
> @@ -3,6 +3,7 @@
> * oFono - Open Source Telephony
> *
> * Copyright (C) 2016 Endocode AG. All rights reserved.
> + * Copyright (C) 2018 Gemalto M2M
I wouldn't add a copyright line for a trivial change like this...
> *
> * 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
> @@ -32,6 +33,10 @@ struct ofono_lte;
>
> struct ofono_lte_default_attach_info {
> char apn[OFONO_GPRS_MAX_APN_LENGTH + 1];
> + enum ofono_gprs_proto proto;
> + enum ofono_gprs_auth_method auth_method;
> + char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
> + char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
> };
>
> typedef void (*ofono_lte_cb_t)(const struct ofono_error *error, void *data);
/Jonas
6:27 p.m.
New subject: [PATCH 3/5] src/lte: added proto and authentication handling
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
The ofono_lte_default_attach_info is extended with protocol,
authentication method, username and password.
The transmission of this info from the src to the atom happens
through the existing set_default_attach_info.
A signal is emitted when one of these properties changes
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
---
src/lte.c | 236 +++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 180 insertions(+), 56 deletions(-)
diff --git a/src/lte.c b/src/lte.c
index 23fe8e1c..c1f6d86a 100644
--- a/src/lte.c
+++ b/src/lte.c
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2016 Endocode AG. All rights reserved.
+ * Copyright (C) 2018 Gemalto M2M
*
* 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
@@ -39,7 +40,11 @@
#define SETTINGS_STORE "lte"
#define SETTINGS_GROUP "Settings"
-#define DEFAULT_APN_KEY "DefaultAccessPointName"
+#define LTE_APN "DefaultAccessPointName"
+#define LTE_PROTO "Protocol"
+#define LTE_USERNAME "Username"
+#define LTE_PASSWORD "Password"
+#define LTE_AUTH_METHOD "AuthenticationMethod"
struct ofono_lte {
const struct ofono_lte_driver *driver;
@@ -57,6 +62,10 @@ static GSList *g_drivers = NULL;
static void lte_load_settings(struct ofono_lte *lte)
{
char *apn;
+ char *proto_str;
+ char *auth_method_str;
+ char *username;
+ char *password;
if (lte->imsi == NULL)
return;
@@ -69,19 +78,57 @@ static void lte_load_settings(struct ofono_lte *lte)
return;
}
- apn = g_key_file_get_string(lte->settings, SETTINGS_GROUP ,
- DEFAULT_APN_KEY, NULL);
- if (apn) {
+ apn = g_key_file_get_string(lte->settings, SETTINGS_GROUP,
+ LTE_APN, NULL);
+ proto_str = g_key_file_get_string(lte->settings, SETTINGS_GROUP,
+ LTE_PROTO, NULL);
+ auth_method_str = g_key_file_get_string(lte->settings, SETTINGS_GROUP,
+ LTE_AUTH_METHOD, NULL);
+ username = g_key_file_get_string(lte->settings, SETTINGS_GROUP,
+ LTE_USERNAME, NULL);
+ password = g_key_file_get_string(lte->settings, SETTINGS_GROUP,
+ LTE_PASSWORD, NULL);
+ if (apn && is_valid_apn(apn))
strcpy(lte->info.apn, apn);
- g_free(apn);
- }
+
+ if (proto_str == NULL)
+ proto_str = g_strdup("ip");
+
+ /* this must have a valid default */
+ if (!gprs_proto_from_string(proto_str, <e->info.proto))
+ lte->info.proto = OFONO_GPRS_PROTO_IP;
+
+ if (auth_method_str == NULL)
+ auth_method_str = g_strdup("none");
+
+ /* this must have a valid default */
+ if (!gprs_auth_method_from_string(auth_method_str,
+ <e->info.auth_method))
+ lte->info.auth_method = OFONO_GPRS_AUTH_METHOD_NONE;
+
+ if (username && strlen(username) <= OFONO_GPRS_MAX_USERNAME_LENGTH)
+ strcpy(lte->info.username, username);
+
+ if (password && strlen(password) <= OFONO_GPRS_MAX_PASSWORD_LENGTH)
+ strcpy(lte->info.password, password);
+
+ g_free(apn);
+ g_free(proto_str);
+ g_free(auth_method_str);
+ g_free(username);
+ g_free(password);
}
static DBusMessage *lte_get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct ofono_lte *lte = data;
+ const char *proto = gprs_proto_to_string(lte->info.proto);
const char *apn = lte->info.apn;
+ const char* auth_method =
+ gprs_auth_method_to_string(lte->info.auth_method);
+ const char *username = lte->info.username;
+ const char *password = lte->info.password;
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter dict;
@@ -95,20 +142,28 @@ static DBusMessage *lte_get_properties(DBusConnection *conn,
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);
+ ofono_dbus_dict_append(&dict, LTE_APN, DBUS_TYPE_STRING, &apn);
+ ofono_dbus_dict_append(&dict, LTE_PROTO, DBUS_TYPE_STRING, &proto);
+ ofono_dbus_dict_append(&dict, LTE_AUTH_METHOD, DBUS_TYPE_STRING,
+ &auth_method);
+ ofono_dbus_dict_append(&dict, LTE_USERNAME, DBUS_TYPE_STRING,
+ &username);
+ ofono_dbus_dict_append(&dict, LTE_PASSWORD, DBUS_TYPE_STRING,
+ &password);
dbus_message_iter_close_container(&iter, &dict);
return reply;
}
static void lte_set_default_attach_info_cb(const struct ofono_error *error,
- void *data)
+ 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;
+ const char *key;
+ const char *propstr = NULL;
DBG("%s error %d", path, error->type);
@@ -118,55 +173,65 @@ static void lte_set_default_attach_info_cb(const struct ofono_error
*error,
return;
}
- g_strlcpy(lte->info.apn, lte->pending_info.apn,
- OFONO_GPRS_MAX_APN_LENGTH + 1);
+ if (!g_str_equal(lte->pending_info.apn, lte->info.apn)) {
+ g_strlcpy(lte->info.apn, lte->pending_info.apn,
+ OFONO_GPRS_MAX_APN_LENGTH + 1);
+ key = LTE_APN;
+ propstr = lte->info.apn;
+ } else if (lte->pending_info.proto != lte->info.proto) {
+ lte->info.proto = lte->pending_info.proto;
+ key = LTE_PROTO;
+ propstr = gprs_proto_to_string(lte->info.proto);
+ } else if (lte->pending_info.auth_method != lte->info.auth_method) {
+ lte->info.auth_method = lte->pending_info.auth_method;
+ key = LTE_AUTH_METHOD;
+ propstr = gprs_auth_method_to_string(lte->info.auth_method);
+
+ } else if (!g_str_equal(lte->pending_info.username,
+ lte->info.username)) {
+ g_strlcpy(lte->info.username, lte->pending_info.username,
+ OFONO_GPRS_MAX_USERNAME_LENGTH + 1);
+ key = LTE_USERNAME;
+ propstr = lte->info.username;
+ } else if (!g_str_equal(lte->pending_info.password,
+ lte->info.password)) {
+ g_strlcpy(lte->info.password, lte->pending_info.password,
+ OFONO_GPRS_MAX_PASSWORD_LENGTH + 1);
+ key = LTE_PASSWORD;
+ propstr = lte->info.password;
+ } else {
+ /*
+ * this should never happen, because no property change is
+ * checked before.
+ * Neverthelss, in this case it will answer the D-Bus message
+ * but emit no signal
+ */
+ ofono_error("unexpected property change: ignored");
+ key = NULL;
+ }
+
+ reply = dbus_message_new_method_return(lte->pending);
+ __ofono_dbus_pending_reply(<e->pending, reply);
+
+ if(!key)
+ return;
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);
+ if (!*propstr)
+ /* Clear entry on empty string. */
+ g_key_file_remove_key(lte->settings,
+ SETTINGS_GROUP, key, NULL);
else
- g_key_file_set_string(lte->settings, SETTINGS_GROUP,
- DEFAULT_APN_KEY, lte->info.apn);
+ g_key_file_set_string(lte->settings,
+ SETTINGS_GROUP, key, propstr);
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 (lte->driver->set_default_attach_info == NULL)
- return __ofono_error_not_implemented(msg);
-
- if (lte->pending)
- return __ofono_error_busy(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);
-
- lte->pending = dbus_message_ref(msg);
-
- g_strlcpy(lte->pending_info.apn, apn, OFONO_GPRS_MAX_APN_LENGTH + 1);
-
- lte->driver->set_default_attach_info(lte, <e->pending_info,
- lte_set_default_attach_info_cb, lte);
-
- return NULL;
+ key,
+ DBUS_TYPE_STRING, &propstr);
}
static DBusMessage *lte_set_property(DBusConnection *conn,
@@ -177,6 +242,14 @@ static DBusMessage *lte_set_property(DBusConnection *conn,
DBusMessageIter var;
const char *property;
const char *str;
+ enum ofono_gprs_auth_method auth_method;
+ enum ofono_gprs_proto proto;
+
+ if (lte->driver->set_default_attach_info == NULL)
+ return __ofono_error_not_implemented(msg);
+
+ if (lte->pending)
+ return __ofono_error_busy(msg);
if (!dbus_message_iter_init(msg, &iter))
return __ofono_error_invalid_args(msg);
@@ -192,16 +265,67 @@ static DBusMessage *lte_set_property(DBusConnection *conn,
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);
+ if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING)
+ return __ofono_error_invalid_args(msg);
- dbus_message_iter_get_basic(&var, &str);
+ dbus_message_iter_get_basic(&var, &str);
- return lte_set_default_apn(lte, conn, msg, str);
- }
+ if ((strcmp(property, LTE_APN) == 0)) {
+
+ if (g_str_equal(str, 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(str) == FALSE && str[0] != '\0')
+ return __ofono_error_invalid_format(msg);
+
+ g_strlcpy(lte->pending_info.apn, str,
+ OFONO_GPRS_MAX_APN_LENGTH + 1);
+
+ } else if ((strcmp(property, LTE_PROTO) == 0)) {
+
+ if (!gprs_proto_from_string(str, &proto))
+ return __ofono_error_invalid_format(msg);
+
+ if (proto == lte->info.proto)
+ return dbus_message_new_method_return(msg);
+
+ lte->pending_info.proto = proto;
- return __ofono_error_invalid_args(msg);
+ } else if (strcmp(property, LTE_AUTH_METHOD) == 0) {
+
+ if (!gprs_auth_method_from_string(str, &auth_method))
+ return __ofono_error_invalid_format(msg);
+
+ if (auth_method == lte->info.auth_method)
+ return dbus_message_new_method_return(msg);
+
+ lte->pending_info.auth_method = auth_method;
+
+ } else if (strcmp(property, LTE_USERNAME) == 0) {
+
+ if (g_str_equal(str, lte->info.username))
+ return dbus_message_new_method_return(msg);
+
+ g_strlcpy(lte->pending_info.username, str,
+ OFONO_GPRS_MAX_USERNAME_LENGTH + 1);
+
+ } else if (strcmp(property, LTE_PASSWORD) == 0) {
+
+ if (g_str_equal(str, lte->info.password))
+ return dbus_message_new_method_return(msg);
+
+ g_strlcpy(lte->pending_info.password, str,
+ OFONO_GPRS_MAX_PASSWORD_LENGTH + 1);
+
+ } else
+ return __ofono_error_invalid_args(msg);
+
+ lte->pending = dbus_message_ref(msg);
+ lte->driver->set_default_attach_info(lte, <e->pending_info,
+ lte_set_default_attach_info_cb, lte);
+
+ return NULL;
}
static const GDBusMethodTable lte_methods[] = {
--
2.17.1
6:27 p.m.
New subject: [PATCH 4/5] atmodem/lte: proto and authentication handling
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
The ofono_lte_default_attach_info now handles also the protocol and the
authentication method, username and password.
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
---
drivers/atmodem/lte.c | 82 +++++++++++++++++++++++++++++++++++++------
1 file changed, 71 insertions(+), 11 deletions(-)
diff --git a/drivers/atmodem/lte.c b/drivers/atmodem/lte.c
index efa4e5fe..d9dcb5c8 100644
--- a/drivers/atmodem/lte.c
+++ b/drivers/atmodem/lte.c
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2017 Intel Corporation. All rights reserved.
+ * Copyright (C) 2018 Gemalto M2M
*
* 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
@@ -39,16 +40,25 @@
#include "gatchat.h"
#include "gatresult.h"
+#include "common.h"
+
#include "atmodem.h"
struct lte_driver_data {
GAtChat *chat;
};
-static void at_lte_set_default_attach_info_cb(gboolean ok, GAtResult *result,
+struct lte_callbackdata {
+ ofono_lte_cb_t cb;
+ void *data;
+ struct lte_driver_data *ldd;
+ const struct ofono_lte_default_attach_info *info;
+};
+
+static void at_lte_set_auth_cb(gboolean ok, GAtResult *result,
gpointer user_data)
{
- struct cb_data *cbd = user_data;
+ struct lte_callbackdata *cbd = user_data;
ofono_lte_cb_t cb = cbd->cb;
struct ofono_error error;
@@ -58,25 +68,77 @@ static void at_lte_set_default_attach_info_cb(gboolean ok, GAtResult
*result,
cb(&error, cbd->data);
}
+static void at_lte_set_auth(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct lte_callbackdata *cbd = user_data;
+ ofono_lte_cb_t cb = cbd->cb;
+ void *data = cbd->data;
+ struct ofono_error error;
+ char buf[32 + OFONO_GPRS_MAX_USERNAME_LENGTH +
+ OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
+ guint buflen = sizeof(buf);
+ guint len;
+ enum ofono_gprs_auth_method auth_method;
+
+ if (!ok) {
+ g_free(cbd);
+ decode_at_error(&error, g_at_result_final_response(result));
+ cb(&error, data);
+ }
+
+ len = snprintf(buf, buflen, "AT+CGAUTH=0,");
+ buflen -= len;
+ auth_method = cbd->info->auth_method;
+
+ /* change the authentication method if the parameters are invalid */
+ if (!*cbd->info->username || !*cbd->info->password)
+ auth_method = OFONO_GPRS_AUTH_METHOD_NONE;
+
+ switch (auth_method) {
+ case OFONO_GPRS_AUTH_METHOD_PAP:
+ snprintf(buf + len, buflen, "1,\"%s\",\"%s\"",
+ cbd->info->username, cbd->info->password);
+ break;
+ case OFONO_GPRS_AUTH_METHOD_CHAP:
+ snprintf(buf + len, buflen, "2,\"%s\",\"%s\"",
+ cbd->info->username, cbd->info->password);
+ break;
+ case OFONO_GPRS_AUTH_METHOD_NONE:
+ snprintf(buf + len, buflen, "0");
+ break;
+ }
+
+ if (g_at_chat_send(cbd->ldd->chat, buf, NULL,
+ at_lte_set_auth_cb, cbd, g_free) > 0)
+ return;
+
+ CALLBACK_WITH_FAILURE(cb, data);
+}
+
static void at_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);
+ struct lte_callbackdata *cbd = g_new0(struct lte_callbackdata ,1);
+ const char *proto = gprs_proto_to_string(info->proto);
DBG("LTE config with APN: %s", info->apn);
+ cbd->cb = cb;
+ cbd->data = data;
+ cbd->ldd = ldd;
+ cbd->info = info;
+
if (strlen(info->apn) > 0)
- snprintf(buf, sizeof(buf), "AT+CGDCONT=0,\"IP\",\"%s\"",
- info->apn);
+ snprintf(buf, sizeof(buf),
+ "AT+CGDCONT=0,\"%s\",\"%s\"", proto, info->apn);
else
- snprintf(buf, sizeof(buf), "AT+CGDCONT=0,\"IP\"");
+ snprintf(buf, sizeof(buf), "AT+CGDCONT=0,\"%s\"", proto);
- /* We can't do much in case of failure so don't check response. */
if (g_at_chat_send(ldd->chat, buf, NULL,
- at_lte_set_default_attach_info_cb, cbd, g_free) > 0)
+ at_lte_set_auth, cbd, NULL) > 0)
return;
CALLBACK_WITH_FAILURE(cb, data);
@@ -84,9 +146,7 @@ static void at_lte_set_default_attach_info(const struct ofono_lte
*lte,
static gboolean lte_delayed_register(gpointer user_data)
{
- struct ofono_lte *lte = user_data;
-
- ofono_lte_register(lte);
+ ofono_lte_register(user_data);
return FALSE;
}
--
2.17.1
6:27 p.m.
New subject: [PATCH 5/5] Gemalto contributors so far
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
---
AUTHORS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/AUTHORS b/AUTHORS
index 2d360e6e..f64cc03c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -138,3 +138,5 @@ Florent Beillonnet <florent.beillonnet(a)gmail.com>
Martin Hundebøll <martin(a)geanix.com>
Julien Tournier <tournier.julien(a)gmail.com>
Nandini Rebello <nandini.rebello(a)intel.com>
+Martin Baschin <martin.baschin(a)googlemail.com>
+Giacinto Cifelli <gciofono(a)gmail.com>
--
2.17.1
7:13 p.m.
New subject: [PATCH 5/5] Gemalto contributors so far
Hi,
Denis already asked you to drop this patch.
/Jonas
On 12/10/18 09:27, Giacinto Cifelli wrote:
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
---
AUTHORS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/AUTHORS b/AUTHORS
index 2d360e6e..f64cc03c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -138,3 +138,5 @@ Florent Beillonnet <florent.beillonnet(a)gmail.com>
Martin Hundebøll <martin(a)geanix.com>
Julien Tournier <tournier.julien(a)gmail.com>
Nandini Rebello <nandini.rebello(a)intel.com>
+Martin Baschin <martin.baschin(a)googlemail.com>
+Giacinto Cifelli <gciofono(a)gmail.com>
7:30 p.m.
New subject: [PATCH 5/5] Gemalto contributors so far
I missed that part, I only noticed the co-author bit.
To be honest, I don't really care that I get mentioned, but I would
like that the people who work with me aren't forgotten.
thanks :)
On Fri, Oct 12, 2018 at 10:13 AM Jonas Bonn <jonas(a)southpole.se> wrote:
Hi,
Denis already asked you to drop this patch.
/Jonas
On 12/10/18 09:27, Giacinto Cifelli wrote:
> Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
> ---
> AUTHORS | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/AUTHORS b/AUTHORS
> index 2d360e6e..f64cc03c 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -138,3 +138,5 @@ Florent Beillonnet <florent.beillonnet(a)gmail.com>
> Martin Hundebøll <martin(a)geanix.com>
> Julien Tournier <tournier.julien(a)gmail.com>
> Nandini Rebello <nandini.rebello(a)intel.com>
> +Martin Baschin <martin.baschin(a)googlemail.com>
> +Giacinto Cifelli <gciofono(a)gmail.com>
7:17 p.m.
Hi Giacinto,
Could you provide an ofono log showing the network registration
behaviour for both the case where you pass incorrect authentication
parameters via the default context and the case where you pass valid
parameters?
/Jonas
On 12/10/18 09:27, Giacinto Cifelli wrote:
added 4 properties for handling the type of context and the
authentication method, exactly like in any gprs context handling.
The properties are named after the equivalent gprs-context one, for
compatibility and uniformity.
Co-authored-by: Martin Baschin <martin.baschin(a)googlemail.com>
---
doc/lte-api.txt | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/doc/lte-api.txt b/doc/lte-api.txt
index 8a2a97d9..fe575cc6 100644
--- a/doc/lte-api.txt
+++ b/doc/lte-api.txt
@@ -33,3 +33,43 @@ Properties string DefaultAccessPointName [readwrite]
Setting this property to an empty string clears the
default APN from the modem.
+
+ string Protocol [readwrite]
+
+ Holds the protocol for this context. Valid values
+ are: "ip", "ipv6" and "dual". Default value is
"ip".
+
+ string AuthenticationMethod [readwrite]
+
+ Sets the Method used for the authentication
+ for the default APN.
+
+ Available values are "none", "pap" and "chap".
+ Default is "none".
+
+ If the AuthenticationMethod is set to 'none' it remove
+ the authentication for the DefaultAPN.
+ In case of AuthenticationMethod 'none',
+ if the Username and Password properties are not empty,
+ the values are preserved in the properties, but they
+ are not used or transmitted to the module.
+ Conversely, if Username or Password are empty, the
+ authentication method selected internally is 'none',
+ but the property AuthenticationMethod is left unchanged.
+
+ If the default APN supports authentication and it
+ fails, then it is up to the network how to proceed.
+ In general LTE access is denied and the modem can
+ fallback to a legacy technology if capable and another
+ radio technology is available.
+
+ string Username [readwrite]
+
+ Holds the username to be used for authentication
+ purposes.
+
+ string Password [readwrite]
+
+ Holds the password to be used for authentication
+ purposes.
+
7:33 p.m.
Hi,
On Fri, Oct 12, 2018 at 10:17 AM Jonas Bonn <jonas(a)southpole.se> wrote:
Hi Giacinto,
Could you provide an ofono log showing the network registration
behaviour for both the case where you pass incorrect authentication
parameters via the default context and the case where you pass valid
parameters?
ok, I can do it with a network simulator. I will try to do it next week.
By the way, now that I remember, authentication on the default context
is a requirement for the Softbank certification.
/Jonas
Giacinto
2:25 a.m.
Hi Jonas,
it turns out we have setup in our testnet an apn with authentication,
so I didn't need to wait until next week for this test.
However, as I was going to test, I have noticed a few things:
- the current patch adds a 'standard' feature. As such, it doesn't
really apply to Gemalto modules. For this, I need to submit afterwards
another patch for the vendor-specific code. Au passage, it would help
answering my question about where to put shared vendor code in the
atmodem driver. Now that I know the process, I might as well submit my
proposal as --rfc. I am therefore in a very frustrating situation that
I cannot test exactly this code. Also, I am some 150-200 commits away
from being able to run properly our modules, with the plugin quite
different from how it is today. Bottom line: I test my code, but when
I need to abstract some parts like the one under discussion, it gets
harder until the whole sequence gets more concrete. I understand that
these steps must be followed to have clean commits, but I need some
latitude here.
- what would an ofono trace show? practically nothing. In order to see
something significant, I would need to make an STT or a QXDM trace
(that I am not allowed to share), or a network-side trace, that I
cannot do.
- the second best thing is however a plain AT trace, and this is
below, with some comments. I took it with "microcom port |
timestamp_script". The pipe might produce the time difference on the
next line because of this, but it is informative nevertheless. I have
configured first a normal apn (ber2-ericsson), then the one that
requires authentication (ber-auth.ericsson), but without supplying the
needed parameters, which is the current situation of the ofono
project: as expected, it tries a few times, the timer T3346 kicks in
and it attaches to 3G. Then I give the authentication information, and
gets LTE coverage.
Regards,
Giacinto
[2018-10-12 16:16:27+0200] at+cgdcont?
[2018-10-12 16:16:27+0200] +CGDCONT:
1,"IP","ber2.ericsson","0.0.0.0",0,0,0,0,0,0
[2018-10-12 16:16:27+0200] +CGDCONT:
2,"IPV4V6","ims","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0,1,1
[2018-10-12 16:16:27+0200] +CGDCONT:
3,"IPV4V6","sos","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,1,1,1
[2018-10-12 16:16:27+0200]
[2018-10-12 16:16:27+0200] OK
[2018-10-12 16:16:32+0200] at+cfun=1
[2018-10-12 16:16:32+0200] OK
[2018-10-12 16:16:32+0200]
[2018-10-12 16:16:32+0200] ^SYSSTART
[2018-10-12 16:16:32+0200]
[2018-10-12 16:16:32+0200] +CREG: 4
[2018-10-12 16:16:32+0200]
[2018-10-12 16:16:32+0200] +CREG: 2
[2018-10-12 16:16:32+0200]
// 0 seconds
[2018-10-12 16:16:32+0200] +CREG: 1,"009B","0009B03",7
[2018-10-12 16:16:37+0200] at+cops?
[2018-10-12 16:16:37+0200] +COPS: 0,0,"EDAV",7
[2018-10-12 16:16:37+0200]
[2018-10-12 16:16:37+0200] OK
[2018-10-12 16:16:43+0200] at+cfun=4
[2018-10-12 16:16:43+0200] OK
[2018-10-12 16:16:43+0200]
[2018-10-12 16:16:43+0200] ^SYSSTART AIRPLANE MODE
[2018-10-12 16:16:43+0200]
[2018-10-12 16:16:43+0200] +CREG: 0
[2018-10-12 16:17:33+0200] at+cgdcont=1,"IP","ber-auth.ericsson"
[2018-10-12 16:17:33+0200] OK
[2018-10-12 16:17:39+0200] at+cfun=1
[2018-10-12 16:17:39+0200] OK
[2018-10-12 16:17:39+0200]
[2018-10-12 16:17:39+0200] ^SYSSTART
[2018-10-12 16:17:39+0200]
[2018-10-12 16:17:39+0200] +CREG: 4
[2018-10-12 16:17:40+0200]
[2018-10-12 16:17:40+0200] +CREG: 2
[2018-10-12 16:18:02+0200]
// 22 seconds
[2018-10-12 16:18:02+0200] +CREG: 1,"012F","12F3C3D",6
[2018-10-12 16:18:25+0200] at+cops?
[2018-10-12 16:18:25+0200] +COPS: 0,0,"EDAV",6
[2018-10-12 16:18:25+0200]
[2018-10-12 16:18:25+0200] OK
[2018-10-12 16:18:30+0200] at+cfun=4
[2018-10-12 16:18:30+0200] OK
[2018-10-12 16:18:31+0200]
[2018-10-12 16:18:31+0200] ^SYSSTART AIRPLANE MODE
[2018-10-12 16:18:31+0200]
[2018-10-12 16:18:31+0200] +CREG: 0
[2018-10-12 16:19:04+0200] at^sgauth=1,2,"gemalto","gemalto"
[2018-10-12 16:19:04+0200] OK
[2018-10-12 16:19:24+0200] at+cgdcont?
[2018-10-12 16:19:24+0200] +CGDCONT:
1,"IP","ber-auth.ericsson","0.0.0.0",0,0,0,0,0,0
[2018-10-12 16:19:24+0200] +CGDCONT:
2,"IPV4V6","ims","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0,1,1
[2018-10-12 16:19:24+0200] +CGDCONT:
3,"IPV4V6","sos","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,1,1,1
[2018-10-12 16:19:24+0200]
[2018-10-12 16:19:24+0200] OK
[2018-10-12 16:19:32+0200] at+cfun=1
[2018-10-12 16:19:32+0200] OK
[2018-10-12 16:19:32+0200]
[2018-10-12 16:19:32+0200] ^SYSSTART
[2018-10-12 16:19:32+0200]
[2018-10-12 16:19:32+0200] +CREG: 4
[2018-10-12 16:19:32+0200]
[2018-10-12 16:19:32+0200] +CREG: 2
[2018-10-12 16:19:32+0200]
0 seconds, last network
[2018-10-12 16:19:32+0200] +CREG: 1,"012F","12F3C3D",6
[2018-10-12 16:19:38+0200]
6 seconds, reselection on idle
[2018-10-12 16:19:38+0200] +CREG: 1,"009B","0009B03",7
[2018-10-12 16:19:49+0200] at+cfun=4
[2018-10-12 16:19:49+0200] OK
[2018-10-12 16:19:49+0200]
[2018-10-12 16:19:49+0200] ^SYSSTART AIRPLANE MODE
[2018-10-12 16:19:49+0200]
[2018-10-12 16:19:49+0200] +CREG: 0
[2018-10-12 16:19:52+0200] at+cfun=1
[2018-10-12 16:19:52+0200] OK
[2018-10-12 16:19:52+0200]
[2018-10-12 16:19:52+0200] ^SYSSTART
[2018-10-12 16:19:52+0200]
[2018-10-12 16:19:52+0200] +CREG: 4
[2018-10-12 16:19:53+0200]
[2018-10-12 16:19:53+0200] +CREG: 2
[2018-10-12 16:19:53+0200]
// 0 seconds
[2018-10-12 16:19:53+0200] +CREG: 1,"009B","0009B03",7
[2018-10-12 16:19:57+0200] at+cgdcont?
[2018-10-12 16:19:57+0200] +CGDCONT:
1,"IP","ber-auth.ericsson","0.0.0.0",0,0,0,0,0,0
[2018-10-12 16:19:57+0200] +CGDCONT:
2,"IPV4V6","ims","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,0,1,1
[2018-10-12 16:19:57+0200] +CGDCONT:
3,"IPV4V6","sos","0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",0,0,0,1,1,1
[2018-10-12 16:19:57+0200]
[2018-10-12 16:19:57+0200] OK
[2018-10-12 16:20:00+0200] at+cops?
[2018-10-12 16:20:00+0200] +COPS: 0,0,"EDAV",7
[2018-10-12 16:20:00+0200]
[2018-10-12 16:20:00+0200] OK
On Fri, Oct 12, 2018 at 10:33 AM Giacinto Cifelli <gciofono(a)gmail.com> wrote:
Hi,
On Fri, Oct 12, 2018 at 10:17 AM Jonas Bonn <jonas(a)southpole.se> wrote:
>
> Hi Giacinto,
>
> Could you provide an ofono log showing the network registration
> behaviour for both the case where you pass incorrect authentication
> parameters via the default context and the case where you pass valid
> parameters?
>
ok, I can do it with a network simulator. I will try to do it next week.
By the way, now that I remember, authentication on the default context
is a requirement for the Softbank certification.
> /Jonas
>
>
Giacinto
1437
days inactive
1437
days old
11 comments
2 participants
participants (2)
-
Giacinto Cifelli -
Jonas Bonn