The purpose of the patch is to handle Network Initiated Context Activation and PDN connection request as part of EPS Attach procedure (LTE) in oFono core. In order to avoid issue regarding CID allocation : - driver should call the core using ofono_gprs_set_cid_range function to specify CID range for UE initiated PDN connection - driver could use a new function to check if the CID is already used or not : ofono_gprs_is_cid_used, usefull in case the modem is not using a specific range for UE initiated PDN connection. - driver will use a new function to notify the gprs atom of a new PDN connection with all the ip parameters from AT+CGCONTRDP (I can provide an update later to handle PCSCF and IMS Signaling Flag as well) commmand : ofono_gprs_context_activated ofono_gprs_context_activated is similar to ofono_gprs_context_deactivated. This function must be call by any gprs driver when : - a context has been activated without explicit request as part of attach procedure in LTE (PDN ACT X and X is a unused CID) - a context has been activated by the Network (NW PDN ACT X, NW ACT X,Y) Behavior of the function : List all the context and try to find correct APN with empty username and empty password. If such context is not found then create a new one with "Internet" type only if we are in LTE with no Active context. Otherwise deactivate the connection. For the context (found or created): Update the settings Set to active The function will also assign the context to a context driver. --- include/gprs-context.h | 7 +++ include/gprs.h | 3 + src/gprs.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++ src/idmap.c | 12 ++++ src/idmap.h | 1 + 5 files changed, 162 insertions(+), 0 deletions(-) diff --git a/include/gprs-context.h b/include/gprs-context.h index c29c0dc..e208b66 100644 --- a/include/gprs-context.h +++ b/include/gprs-context.h @@ -76,6 +76,13 @@ struct ofono_gprs_context_driver { ofono_gprs_context_cb_t cb, void *data); }; + +void ofono_gprs_context_activated(struct ofono_gprs_context *gc, + const int cid, const char *apn, + const char *interface, ofono_bool_t static_ip, + const char *address, const char *netmask, + const char *gw, const char **dns); + void ofono_gprs_context_deactivated(struct ofono_gprs_context *gc, unsigned int id); diff --git a/include/gprs.h b/include/gprs.h index 157a6f9..5a96c1c 100644 --- a/include/gprs.h +++ b/include/gprs.h @@ -75,6 +75,9 @@ void *ofono_gprs_get_data(struct ofono_gprs *gprs); void ofono_gprs_set_cid_range(struct ofono_gprs *gprs, unsigned int min, unsigned int max); +ofono_bool_t ofono_gprs_is_cid_used(struct ofono_gprs *gprs, + int cid); + void ofono_gprs_add_context(struct ofono_gprs *gprs, struct ofono_gprs_context *gc); diff --git a/src/gprs.c b/src/gprs.c index 5ea864c..9ab853c 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -730,6 +730,13 @@ static void pri_activate_callback(const struct ofono_error *error, "Active", DBUS_TYPE_BOOLEAN, &value); } +static void ofono_gprs_context_activated_deactivate_callback(const struct ofono_error *error, void *data) +{ + struct ofono_gprs_context *gc_driver = data; + if (gc_driver != NULL) + gc_driver->inuse = FALSE; +} + static void pri_deactivate_callback(const struct ofono_error *error, void *data) { struct pri_context *ctx = data; @@ -2026,6 +2033,15 @@ void ofono_gprs_set_cid_range(struct ofono_gprs *gprs, gprs->cid_map = idmap_new_from_range(min, max); } +ofono_bool_t ofono_gprs_is_cid_used(struct ofono_gprs *gprs, + int cid) +{ + if (gprs == NULL || gprs->cid_map == NULL) + return 0; + + return idmap_is_free(gprs->cid_map, cid); +} + static void gprs_context_unregister(struct ofono_atom *atom) { struct ofono_gprs_context *gc = __ofono_atom_get_data(atom); @@ -2067,6 +2083,129 @@ void ofono_gprs_bearer_notify(struct ofono_gprs *gprs, int bearer) "Bearer", DBUS_TYPE_STRING, &value); } +void ofono_gprs_context_activated(struct ofono_gprs_context *gc, + const int cid, const char *apn, + const char *interface, ofono_bool_t static_ip, + const char *address, const char *netmask, + const char *gw, const char **dns) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + GSList *l; + dbus_bool_t value; + const char *path; + DBusMessage *signal; + GKeyFile *settings; + int active_context = 0; + int technology = 0; + struct pri_context *context = 0; + + + if (gc->gprs == NULL) + return; + + for (l = gc->gprs->contexts; l; l = l->next) { + context = l->data; + + if (strcmp(context->context.apn, apn) == 0 + && strcmp(context->context.username, "") == 0 + && strcmp(context->context.password, "") == 0) + break; + + if (context->active) + active_context = 1; + } + + if (gc->gprs->netreg) + technology = ofono_netreg_get_technology(gc->gprs->netreg); + + if (!l && !(active_context == 0 && technology == 7)) { + + for (l = gc->gprs->context_drivers; l; l = l->next) { + struct ofono_gprs_context *gc_driver = l->data; + + if (gc_driver->inuse != TRUE) { + gc_driver->inuse = TRUE; + gc_driver->driver->deactivate_primary(gc_driver, cid, + ofono_gprs_context_activated_deactivate_callback, gc_driver); + return ; + } + } + return ; + } + + if (!l) { + context = add_context(gc->gprs, "Internet", OFONO_GPRS_CONTEXT_TYPE_INTERNET); + path = __ofono_atom_get_path(gc->gprs->atom); + signal = dbus_message_new_signal(path, + OFONO_CONNECTION_MANAGER_INTERFACE, + "ContextAdded"); + + if (signal) { + DBusMessageIter iter; + DBusMessageIter dict; + + dbus_message_iter_init_append(signal, &iter); + + path = context->path; + dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, + &path); + + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + OFONO_PROPERTIES_ARRAY_SIGNATURE, + &dict); + append_context_properties(context, &dict); + dbus_message_iter_close_container(&iter, &dict); + + g_dbus_send_message(conn, signal); + } + + strcpy(context->context.apn, apn); + settings = context->gprs->settings; + + if (settings) { + g_key_file_set_string(settings, context->key, + "AccessPointName", apn); + storage_sync(context->gprs->imsi, + SETTINGS_STORE, settings); + } + + ofono_dbus_signal_property_changed(conn, context->path, + OFONO_CONNECTION_CONTEXT_INTERFACE, + "AccessPointName", + DBUS_TYPE_STRING, &apn); + } + + if (context == NULL) + return; + + context->context.cid = cid; + value = context->active = TRUE; + + if (interface != NULL) + pri_update_context_settings(context, interface, static_ip, + address, netmask, gw, dns); + + for (l = context->gprs->context_drivers; l; l = l->next) { + struct ofono_gprs_context *gc = l->data; + + if (gc->inuse == TRUE) + continue; + + if (gc->type == OFONO_GPRS_CONTEXT_TYPE_ANY || + gc->type == context->type) { + context->context_driver = gc; + context->context_driver->inuse = TRUE; + + break; + } + } + + ofono_dbus_signal_property_changed(conn, context->path, + OFONO_CONNECTION_CONTEXT_INTERFACE, + "Active", DBUS_TYPE_BOOLEAN, &value); + +} + void ofono_gprs_context_deactivated(struct ofono_gprs_context *gc, unsigned int cid) { diff --git a/src/idmap.c b/src/idmap.c index 6d46e8a..90dcd41 100644 --- a/src/idmap.c +++ b/src/idmap.c @@ -166,6 +166,18 @@ void idmap_take(struct idmap *idmap, unsigned int id) idmap->bits[offset] |= 1 << (bit % BITS_PER_LONG); } +int idmap_is_free(struct idmap *idmap, unsigned int id) +{ + unsigned int bit = id - idmap->min; + unsigned int offset; + + if (bit >= idmap->size) + return 0; + + offset = bit / BITS_PER_LONG; + return (idmap->bits[offset] & (1 << (bit % BITS_PER_LONG))) == 0; +} + /* * Allocate the next bit skipping the ids up to and including last. If there * is no free ids until the max id is encountered, the counter is wrapped back diff --git a/src/idmap.h b/src/idmap.h index d6141c2..3333581 100644 --- a/src/idmap.h +++ b/src/idmap.h @@ -25,6 +25,7 @@ struct idmap *idmap_new(unsigned int size); void idmap_free(struct idmap *idmap); void idmap_put(struct idmap *idmap, unsigned int id); void idmap_take(struct idmap *idmap, unsigned int id); +int idmap_is_free(struct idmap *idmap, unsigned int id); unsigned int idmap_alloc(struct idmap *idmap); unsigned int idmap_alloc_next(struct idmap *idmap, unsigned int last); struct idmap *idmap_new_from_range(unsigned int min, unsigned int max); -- 1.7.0.4 --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.