11:34 p.m.
---
src/gprs.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 4 deletions(-)
diff --git a/src/gprs.c b/src/gprs.c
index 92d0b1a..7fad23b 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -43,6 +43,8 @@
#include "common.h"
#include "storage.h"
#include "idmap.h"
+#include "simutil.h"
+#include "util.h"
#define GPRS_FLAG_ATTACHING 0x1
#define GPRS_FLAG_RECHECK 0x2
@@ -2531,6 +2533,75 @@ remove:
storage_sync(imsi, SETTINGS_STORE, gprs->settings);
}
+static void provision_context(const struct ofono_gprs_provision_data *ap,
+ struct ofono_gprs *gprs)
+{
+ unsigned int id;
+ struct pri_context *context = NULL;
+
+ /* Sanity check */
+ if (ap == NULL || ap->name == NULL)
+ return;
+
+ if (gprs->last_context_id)
+ id = idmap_alloc_next(gprs->pid_map, gprs->last_context_id);
+ else
+ id = idmap_alloc(gprs->pid_map);
+
+ if (id > idmap_get_max(gprs->pid_map))
+ return;
+
+ context = pri_context_create(gprs, ap->name, ap->type);
+ DBG("%s context%d '%s' %s", gprs_context_default_name(ap->type),
+ id, ap->name, context ? "created" : "creation failed");
+
+ if (context == NULL)
+ return;
+
+ context->id = id;
+
+ if (ap->username != NULL)
+ strncpy(context->context.username, ap->username,
+ OFONO_GPRS_MAX_USERNAME_LENGTH);
+
+ if (ap->password != NULL)
+ strncpy(context->context.password, ap->password,
+ OFONO_GPRS_MAX_PASSWORD_LENGTH);
+
+ if (ap->apn != NULL)
+ strncpy(context->context.apn, ap->apn,
+ OFONO_GPRS_MAX_APN_LENGTH);
+
+ context->context.proto = ap->proto;
+
+ if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS &&
+ ap->message_proxy != NULL)
+ strncpy(context->message_proxy, ap->message_proxy,
+ MAX_MESSAGE_PROXY_LENGTH);
+
+ if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS &&
+ ap->message_center != NULL)
+ strncpy(context->message_center, ap->message_center,
+ MAX_MESSAGE_CENTER_LENGTH);
+
+ if (context_dbus_register(context) == TRUE) {
+ gprs->last_context_id = id;
+ gprs->contexts = g_slist_append(gprs->contexts, context);
+ write_context_settings(gprs, context);
+
+ if (context->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
+ g_key_file_set_string(gprs->settings, context->key,
+ "MessageProxy",
+ context->message_proxy);
+ g_key_file_set_string(gprs->settings, context->key,
+ "MessageCenter",
+ context->message_center);
+ }
+
+ storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings);
+ }
+}
+
void ofono_gprs_register(struct ofono_gprs *gprs)
{
DBusConnection *conn = ofono_dbus_get_connection();
@@ -2538,6 +2609,7 @@ void ofono_gprs_register(struct ofono_gprs *gprs)
const char *path = __ofono_atom_get_path(gprs->atom);
struct ofono_atom *netreg_atom;
struct ofono_atom *sim_atom;
+ struct ofono_sim *sim = NULL;
if (!g_dbus_register_interface(conn, path,
OFONO_CONNECTION_MANAGER_INTERFACE,
@@ -2555,14 +2627,33 @@ void ofono_gprs_register(struct ofono_gprs *gprs)
sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM);
if (sim_atom) {
- struct ofono_sim *sim = __ofono_atom_get_data(sim_atom);
- const char *imsi = ofono_sim_get_imsi(sim);
+ const char *imsi;
+ sim = __ofono_atom_get_data(sim_atom);
+ imsi = ofono_sim_get_imsi(sim);
gprs_load_settings(gprs, imsi);
}
- if (gprs->contexts == NULL)
- add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);
+ if (gprs->contexts == NULL) {
+ struct ofono_gprs_provision_data *settings = NULL;
+ int count = 0;
+ int i;
+
+ __ofono_gprs_provision_get_settings(ofono_sim_get_mcc(sim),
+ ofono_sim_get_mnc(sim),
+ &settings, &count);
+
+ if (count > 0) {
+ for (i = 0; i < count; i++)
+ provision_context(&settings[i], gprs);
+
+ __ofono_gprs_provision_free_settings(settings, count);
+ } else {
+ ofono_warn("Context settings provisioning failed");
+ add_context(gprs, NULL,
+ OFONO_GPRS_CONTEXT_TYPE_INTERNET);
+ }
+ }
gprs->netreg_watch = __ofono_modem_add_atom_watch(modem,
OFONO_ATOM_TYPE_NETREG,
--
1.7.1