10:38 p.m.
The initial attach APN is used in LTE for signalling and to be able to
register to the network (default EPS bearer). Some operators request
users to configure this APN, so we need to add this APN type to ofono.
---
include/gprs-context.h | 1 +
include/gprs.h | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/include/gprs-context.h b/include/gprs-context.h
index ed27e66..9dae5f4 100644
--- a/include/gprs-context.h
+++ b/include/gprs-context.h
@@ -46,6 +46,7 @@ enum ofono_gprs_context_type {
OFONO_GPRS_CONTEXT_TYPE_MMS,
OFONO_GPRS_CONTEXT_TYPE_WAP,
OFONO_GPRS_CONTEXT_TYPE_IMS,
+ OFONO_GPRS_CONTEXT_TYPE_IA,
};
enum ofono_gprs_auth_method {
diff --git a/include/gprs.h b/include/gprs.h
index 6c46d18..03849aa 100644
--- a/include/gprs.h
+++ b/include/gprs.h
@@ -27,6 +27,7 @@ extern "C" {
#endif
#include <ofono/types.h>
+#include <ofono/gprs-context.h>
struct ofono_gprs;
struct ofono_gprs_context;
@@ -45,6 +46,10 @@ struct ofono_gprs_driver {
ofono_gprs_cb_t cb, void *data);
void (*attached_status)(struct ofono_gprs *gprs,
ofono_gprs_status_cb_t cb, void *data);
+ void (*set_ia_apn)(struct ofono_gprs *gprs, const char *apn,
+ enum ofono_gprs_proto proto, const char *user,
+ const char *passwd, const char *mccmnc,
+ ofono_gprs_cb_t cb, void *data);
};
enum gprs_suspend_cause {
--
2.5.0
10:38 p.m.
New subject: [PATCH 2/3] src: Set IA APN when gprs atom is created
---
src/gprs.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/src/gprs.c b/src/gprs.c
index 344915c..116074a 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -177,6 +177,8 @@ static const char *gprs_context_default_name(enum
ofono_gprs_context_type type)
return "WAP";
case OFONO_GPRS_CONTEXT_TYPE_IMS:
return "IMS";
+ case OFONO_GPRS_CONTEXT_TYPE_IA:
+ return "IA";
}
return NULL;
@@ -196,6 +198,8 @@ static const char *gprs_context_type_to_string(
return "wap";
case OFONO_GPRS_CONTEXT_TYPE_IMS:
return "ims";
+ case OFONO_GPRS_CONTEXT_TYPE_IA:
+ return "ia";
}
return NULL;
@@ -216,6 +220,9 @@ static gboolean gprs_context_string_to_type(const char *str,
} else if (g_str_equal(str, "ims")) {
*out = OFONO_GPRS_CONTEXT_TYPE_IMS;
return TRUE;
+ } else if (g_str_equal(str, "ia")) {
+ *out = OFONO_GPRS_CONTEXT_TYPE_IA;
+ return TRUE;
}
return FALSE;
@@ -3159,6 +3166,60 @@ remove:
storage_sync(imsi, SETTINGS_STORE, gprs->settings);
}
+static struct pri_context *gprs_context_for_ia(struct ofono_gprs *gprs)
+{
+ GSList *l;
+ struct pri_context *ctx_inet = NULL;
+
+ for (l = gprs->contexts; l; l = l->next) {
+ struct pri_context *ctx = l->data;
+
+ if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_IA)
+ return ctx;
+ else if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET
+ && ctx_inet == NULL)
+ ctx_inet = ctx;
+ }
+
+ if (ctx_inet != NULL)
+ return ctx_inet;
+
+ if (gprs->contexts == NULL)
+ return NULL;
+
+ return gprs->contexts->data;
+}
+
+static void set_ia_apn_cb(const struct ofono_error *error, void *data)
+{
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
+ ofono_error("Could not set IA APN");
+}
+
+static void set_ia_apn(struct ofono_gprs *gprs)
+{
+ struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
+ struct ofono_sim *sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);
+ struct pri_context *ctx = gprs_context_for_ia(gprs);
+ struct ofono_gprs_primary_context *ofono_ctx;
+ char mccmnc[OFONO_MAX_MCC_LENGTH + OFONO_MAX_MNC_LENGTH + 1];
+ const char *mcc = ofono_sim_get_mcc(sim);
+ const char *mnc = ofono_sim_get_mnc(sim);
+
+ if (ctx == NULL)
+ return;
+
+ ofono_ctx = &ctx->context;
+
+ strcpy(mccmnc, mcc);
+ strcpy(mccmnc + strlen(mcc), mnc);
+
+ gprs->driver->set_ia_apn(gprs, ofono_ctx->apn, ofono_ctx->proto,
+ ofono_ctx->username,
+ ofono_ctx->password, mccmnc,
+ set_ia_apn_cb, gprs);
+}
+
static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
{
DBusConnection *conn = ofono_dbus_get_connection();
@@ -3168,6 +3229,9 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
if (gprs->contexts == NULL) /* Automatic provisioning failed */
add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);
+ if (gprs->driver->set_ia_apn)
+ set_ia_apn(gprs);
+
if (!g_dbus_register_interface(conn, path,
OFONO_CONNECTION_MANAGER_INTERFACE,
manager_methods, manager_signals, NULL,
--
2.5.0
10:38 p.m.
New subject: [PATCH 3/3] mbpi: Add support for IA APN type
---
plugins/mbpi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/plugins/mbpi.c b/plugins/mbpi.c
index ae92c76..ac50e3c 100644
--- a/plugins/mbpi.c
+++ b/plugins/mbpi.c
@@ -72,6 +72,7 @@ const char *mbpi_ap_type(enum ofono_gprs_context_type type)
_(OFONO_GPRS_CONTEXT_TYPE_MMS);
_(OFONO_GPRS_CONTEXT_TYPE_WAP);
_(OFONO_GPRS_CONTEXT_TYPE_IMS);
+ _(OFONO_GPRS_CONTEXT_TYPE_IA);
}
return "OFONO_GPRS_CONTEXT_TYPE_<UNKNOWN>";
--
2.5.0
1705
days inactive
1705
days old
2 comments
1 participants
participants (1)
-
Alfonso Sanchez-Beato