From: Richard Röjfors <rich...@puffinpack.se> There is an issue if an context gets auto activated early, then provisioning might not have run yet for instance, so a "new" context is created, which might be duplicated by a provisioning context later. So ignore the activated contexts until gprs is ready, then it calls the driver to list active contexts. --- src/gprs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/src/gprs.c b/src/gprs.c index 9cb69d14..07b475c0 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -1959,6 +1959,11 @@ void ofono_gprs_cid_activated(struct ofono_gprs *gprs, unsigned int cid, DBG(""); + if (!__ofono_atom_get_registered(gprs->atom)) { + DBG("cid %u activated before atom registered", cid); + return; + } + if (l_uintset_contains(gprs->used_cids, cid)) { DBG("cid %u already activated", cid); return; @@ -3338,11 +3343,20 @@ remove: storage_sync(imsi, SETTINGS_STORE, gprs->settings); } +static void gprs_list_active_contexts_callback(const struct ofono_error *error, + int num, void *data) +{ + (void)data; + + DBG("error = %d, num = %d", error->type, num); +} + static void ofono_gprs_finish_register(struct ofono_gprs *gprs) { DBusConnection *conn = ofono_dbus_get_connection(); struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom); const char *path = __ofono_atom_get_path(gprs->atom); + const struct ofono_gprs_driver *driver = gprs->driver; if (gprs->contexts == NULL) /* Automatic provisioning failed */ add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET); @@ -3366,6 +3380,12 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs) netreg_watch, gprs, NULL); __ofono_atom_register(gprs->atom, gprs_unregister); + + /* Find any context activated during init */ + if (driver->list_active_contexts) + driver->list_active_contexts(gprs, + gprs_list_active_contexts_callback, + gprs); } static void spn_read_cb(const char *spn, const char *dc, void *data) -- 2.20.1 _______________________________________________ ofono mailing list ofono@ofono.org https://lists.ofono.org/mailman/listinfo/ofono