[PATCH 2/4] gprs: Add new external APIs to create, activate and remove a PDP context

[Philippe Nunes <philippe.nunes@linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 9493 bytes --]

---
 include/gprs.h |   16 ++++
 src/gprs.c     |  234 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 246 insertions(+), 4 deletions(-)

diff --git a/include/gprs.h b/include/gprs.h
index 157a6f9..0bb37f7 100644
--- a/include/gprs.h
+++ b/include/gprs.h
@@ -36,6 +36,10 @@ typedef void (*ofono_gprs_status_cb_t)(const struct ofono_error *error,
 
 typedef void (*ofono_gprs_cb_t)(const struct ofono_error *error, void *data);
 
+typedef void (*ofono_gprs_add_pdp_context_cb_t)(int error, char *interface,
+						char *ipv4, char *ipv6,
+						void *data);
+
 struct ofono_gprs_driver {
 	const char *name;
 	int (*probe)(struct ofono_gprs *gprs, unsigned int vendor,
@@ -77,7 +81,19 @@ void ofono_gprs_set_cid_range(struct ofono_gprs *gprs,
 				unsigned int min, unsigned int max);
 void ofono_gprs_add_context(struct ofono_gprs *gprs,
 				struct ofono_gprs_context *gc);
+unsigned int ofono_gprs_add_pdp_context(struct ofono_gprs *gprs,
+					const char *type,
+					const char *protocol,
+					const char *apn,
+					const char *username,
+					const char *password,
+					const char *host);
+
+int ofono_gprs_remove_pdp_context(struct ofono_gprs *gprs, unsigned int id);
 
+int ofono_gprs_activate_pdp_context(struct ofono_gprs *gprs, unsigned int id,
+					ofono_gprs_add_pdp_context_cb_t cb,
+					void *data);
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gprs.c b/src/gprs.c
index 9657a3e..2b88324 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -147,6 +147,8 @@ struct pri_context {
 	struct ofono_gprs_primary_context context;
 	struct ofono_gprs_context *context_driver;
 	struct ofono_gprs *gprs;
+	void *notify;
+	void *notify_data;
 };
 
 static void gprs_netreg_update(struct ofono_gprs *gprs);
@@ -356,6 +358,35 @@ static struct pri_context *gprs_context_by_path(struct ofono_gprs *gprs,
 	return NULL;
 }
 
+static struct pri_context *gprs_context_by_id(struct ofono_gprs *gprs,
+						unsigned int id)
+{
+	GSList *l;
+
+	for (l = gprs->contexts; l; l = l->next) {
+		struct pri_context *ctx = l->data;
+
+		if (ctx->id == id)
+			return ctx;
+	}
+
+	return NULL;
+}
+
+static struct pri_context *gprs_get_default_context(struct ofono_gprs *gprs)
+{
+	GSList *l;
+
+	for (l = gprs->contexts; l; l = l->next) {
+		struct pri_context *ctx = l->data;
+
+		if (ctx->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET)
+			return ctx;
+	}
+
+	return NULL;
+}
+
 static void context_settings_free(struct context_settings *settings)
 {
 	if (settings->ipv4) {
@@ -870,15 +901,21 @@ static void pri_activate_callback(const struct ofono_error *error, void *data)
 	if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
 		DBG("Activating context failed with error: %s",
 				telephony_error_to_str(error));
-		__ofono_dbus_pending_reply(&ctx->pending,
+		if (ctx->pending)
+			__ofono_dbus_pending_reply(&ctx->pending,
 					__ofono_error_failed(ctx->pending));
 		context_settings_free(ctx->context_driver->settings);
 		release_context(ctx);
+
+		if (ctx->notify)
+			((ofono_gprs_add_pdp_context_cb_t) ctx->notify)
+				(-ENOSYS, NULL, NULL, NULL, ctx->notify_data);
 		return;
 	}
 
 	ctx->active = TRUE;
-	__ofono_dbus_pending_reply(&ctx->pending,
+	if (ctx->pending)
+		__ofono_dbus_pending_reply(&ctx->pending,
 				dbus_message_new_method_return(ctx->pending));
 
 	if (gc->settings->interface != NULL) {
@@ -896,6 +933,20 @@ static void pri_activate_callback(const struct ofono_error *error, void *data)
 	ofono_dbus_signal_property_changed(conn, ctx->path,
 					OFONO_CONNECTION_CONTEXT_INTERFACE,
 					"Active", DBUS_TYPE_BOOLEAN, &value);
+
+	if (ctx->notify) {
+		char *ipv4 = NULL;
+		char *ipv6 = NULL;
+
+		if (gc->settings->ipv4)
+			ipv4 = gc->settings->ipv4->ip;
+		else if (gc->settings->ipv6)
+			ipv6 = gc->settings->ipv6->ip;
+
+		((ofono_gprs_add_pdp_context_cb_t) ctx->notify)
+					(0, gc->settings->interface, ipv4, ipv6,
+							ctx->notify_data);
+	}
 }
 
 static void pri_deactivate_callback(const struct ofono_error *error, void *data)
@@ -1844,7 +1895,8 @@ static void gprs_deactivate_for_remove(const struct ofono_error *error,
 		DBG("Removing context failed with error: %s",
 				telephony_error_to_str(error));
 
-		__ofono_dbus_pending_reply(&gprs->pending,
+		if (gprs->pending)
+			__ofono_dbus_pending_reply(&gprs->pending,
 					__ofono_error_failed(gprs->pending));
 		return;
 	}
@@ -1863,7 +1915,8 @@ static void gprs_deactivate_for_remove(const struct ofono_error *error,
 	context_dbus_unregister(ctx);
 	gprs->contexts = g_slist_remove(gprs->contexts, ctx);
 
-	__ofono_dbus_pending_reply(&gprs->pending,
+	if (gprs->pending)
+		__ofono_dbus_pending_reply(&gprs->pending,
 				dbus_message_new_method_return(gprs->pending));
 
 	atompath = __ofono_atom_get_path(gprs->atom);
@@ -2968,3 +3021,176 @@ void *ofono_gprs_get_data(struct ofono_gprs *gprs)
 {
 	return gprs->driver_data;
 }
+
+unsigned int ofono_gprs_add_pdp_context(struct ofono_gprs *gprs,
+					const char *type,
+					const char *protocol,
+					const char *apn,
+					const char *username,
+					const char *password,
+					const char *host)
+{
+	unsigned int id;
+	struct pri_context *context;
+	struct pri_context *default_ctx = NULL;
+	const char *name;
+	enum ofono_gprs_proto proto;
+	enum ofono_gprs_context_type context_type;
+
+	/* Sanity check */
+	if (apn && strlen(apn) > OFONO_GPRS_MAX_APN_LENGTH)
+		return 0;
+
+	if (username && strlen(username) > OFONO_GPRS_MAX_USERNAME_LENGTH)
+		return 0;
+
+	if (password && strlen(password) > OFONO_GPRS_MAX_PASSWORD_LENGTH)
+		return 0;
+
+	if (apn == NULL || (username == NULL && password == NULL)) {
+		/* take the default primary internet context */
+		default_ctx = gprs_get_default_context(gprs);
+
+		if (default_ctx == NULL && apn == NULL)
+			return 0;
+	}
+
+	if (apn && is_valid_apn(apn) == FALSE)
+		return 0;
+
+	if (gprs_proto_from_string(protocol, &proto) == FALSE)
+		return 0;
+
+	if (gprs_context_string_to_type(type, &context_type) == FALSE)
+		return 0;
+
+	name = gprs_context_default_name(context_type);
+	if (name == NULL)
+		return 0;
+
+	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 0;
+
+	context = pri_context_create(gprs, name, context_type);
+	if (context == NULL) {
+		idmap_put(gprs->pid_map, id);
+		return 0;
+	}
+
+	context->id = id;
+
+	if (username != NULL)
+		strcpy(context->context.username, username);
+
+	if (password != NULL)
+		strcpy(context->context.password, password);
+
+	if (username == NULL && password == NULL && default_ctx) {
+		if (default_ctx->context.username)
+			strcpy(context->context.username,
+					default_ctx->context.username);
+		if (default_ctx->context.password)
+			strcpy(context->context.password,
+					default_ctx->context.password);
+	}
+
+	if (apn)
+		strcpy(context->context.apn, apn);
+	else if (default_ctx) {
+		strcpy(context->context.apn, default_ctx->context.apn);
+		if (default_ctx->context.username)
+			strcpy(context->context.username,
+					default_ctx->context.username);
+		if (default_ctx->context.password)
+			strcpy(context->context.password,
+					default_ctx->context.password);
+	}
+
+	context->context.proto = proto;
+
+	if (context_dbus_register(context) == FALSE)
+		return 0;
+
+	gprs->last_context_id = id;
+
+	if (gprs->settings) {
+		write_context_settings(gprs, context);
+		storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings);
+	}
+
+	gprs->contexts = g_slist_append(gprs->contexts, context);
+
+	return id;
+}
+
+int ofono_gprs_activate_pdp_context(struct ofono_gprs *gprs, unsigned int id,
+					ofono_gprs_add_pdp_context_cb_t cb,
+					void *data)
+{
+	struct pri_context *ctx;
+	struct ofono_gprs_context *gc;
+
+	ctx = gprs_context_by_id(gprs, id);
+	if (ctx == NULL)
+		return -EINVAL;
+
+	if (ctx->active == TRUE)
+		return 0;
+
+	if (assign_context(ctx) == FALSE)
+		return -ENOSYS;
+
+	gc = ctx->context_driver;
+
+	ctx->notify = cb;
+	ctx->notify_data = data;
+
+	gc->driver->activate_primary(gc, &ctx->context, pri_activate_callback,
+					ctx);
+	return 0;
+}
+
+int ofono_gprs_remove_pdp_context(struct ofono_gprs *gprs, unsigned int id)
+{
+	struct pri_context *ctx;
+	DBusConnection *conn;
+	char *path;
+	const char *atompath;
+
+	ctx = gprs_context_by_id(gprs, id);
+	if (ctx == NULL)
+		return -EINVAL;
+
+	if (ctx->active) {
+		struct ofono_gprs_context *gc = ctx->context_driver;
+
+		gc->driver->deactivate_primary(gc, ctx->context.cid,
+					gprs_deactivate_for_remove, ctx);
+		return 0;
+	}
+
+	if (gprs->settings) {
+		g_key_file_remove_group(gprs->settings, ctx->key, NULL);
+		storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings);
+	}
+
+	path = g_strdup(ctx->path);
+
+	DBG("Unregistering context: %s", ctx->path);
+	context_dbus_unregister(ctx);
+	gprs->contexts = g_slist_remove(gprs->contexts, ctx);
+
+	atompath = __ofono_atom_get_path(gprs->atom);
+	conn = ofono_dbus_get_connection();
+	g_dbus_emit_signal(conn, atompath, OFONO_CONNECTION_MANAGER_INTERFACE,
+				"ContextRemoved", DBUS_TYPE_OBJECT_PATH, &path,
+				DBUS_TYPE_INVALID);
+	g_free(path);
+
+	return 0;
+}
-- 
1.7.1