[PATCH v8 0/5] lte atom auth and IP protocol

[Denis Kenzior]

Hi Giacinto,

I would like to submit this patch for the lte atom
- the protocol for the default LTE APN, ip, ipv6 and both
method, username, password
The behavior of the patch is described in the api document (part 1),
and in the core atom header (part 2).
- changes the name of the function at_auth_type_from_method in
atmodem/atutils, as suggested by Jonas, and calls it without passing
from an intermediate local variable.

I've pushed out the first three patches of this series with a few
trivial tweaks added. Thanks!

Regards,
-Denis

[Denis Kenzior]

Hi Giacinto,

at_auth_type_from_method: converts the ofono enum ofono_gprs_auth_method
into the value of the 3GPP 27.007 to pass to the AT command
at_get_cgdcont_command: computes the AT+CGDCONT string, standard version

That just screams for 2 separate commits.

Also, everything in atutil.[ch] is prefixed by at_util_, so please
follow that convention.

---
drivers/atmodem/atutil.c | 49 ++++++++++++++++++++++++++++++++++++++++
drivers/atmodem/atutil.h | 6 +++++
2 files changed, 55 insertions(+)
diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c
index 6f4e8a20..ed19e91b 100644
--- a/drivers/atmodem/atutil.c
+++ b/drivers/atmodem/atutil.c
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2008-2011 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
@@ -27,6 +28,7 @@
#include <gatchat.h>
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
#include <errno.h>
#define OFONO_API_SUBJECT_TO_CHANGE
@@ -654,3 +656,50 @@ int at_util_get_ipv4_address_and_netmask(const char *addrnetmask,
return ret;
}
+
+int at_auth_type_from_method(enum ofono_gprs_auth_method auth_method)
+{
+ switch (auth_method) {
+ return 1;
+ return 2;
+ return 0;
+ }
+
+ return 0;
+}
+
+char *at_get_cgdcont_command(guint cid, enum ofono_gprs_proto proto,
+ const char *apn)
+{
+ size_t buflen = 32 + OFONO_GPRS_MAX_APN_LENGTH + 1;
+ char *buf = g_new(char, buflen);
+ int len;
+
+ len = snprintf(buf, buflen, "AT+CGDCONT=%u", cid);
+ buflen -= len;
+
+ /*
+ * if apn is null, it will remove the context.
+ * but if apn is empty, it will create a context with empty apn
+ */
+ if (!apn)
+ goto finished;
+
+ switch (proto) {
+ snprintf(buf+len, buflen, ",\"IPV6\",\"%s\"", apn);
+ break;
+ snprintf(buf+len, buflen, ",\"IPV4V6\",\"%s\"", apn);
+ break;
+ snprintf(buf+len, buflen, ",\"IP\",\"%s\"", apn);
+ break;
+ }

Ugh. Since you're allocating a new string anyway, why not something like:

const char *pdp_type = at_util_gprs_proto_to_pdp_type(proto);

if (!apn || apn[0] == '\0')
return g_strdup_printf("AT+CGDCONT=%u", cid);

return g_strdup_printf("AT+CGDCONT=%u,\"%s\",\"%s\"", cid, pdp_type, apn);

+
+ return buf;
+}
diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h
index 7113a4cd..447ce56b 100644
--- a/drivers/atmodem/atutil.h
+++ b/drivers/atmodem/atutil.h
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2008-2011 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
@@ -86,6 +87,11 @@ void at_util_sim_state_query_free(struct at_util_sim_state_query *req);
int at_util_get_ipv4_address_and_netmask(const char *addrnetmask,
char *address, char *netmask);
+int at_auth_type_from_method(enum ofono_gprs_auth_method auth_method);
+
+char *at_get_cgdcont_command(guint cid, enum ofono_gprs_proto proto,
+ const char *apn);
+
struct cb_data {
void *cb;
void *data;

Regards,
-Denis