[PATCH 12/19] gprs: allow APN updates from gprs-context driver

[Dragos Tatulea <dragos@endocode.com>]

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

In the context activation callback, check for a changed APN. The default
PDP in a 4G network is usually automatically activated. We might not know
the APN. So allow the driver to read the APN and push it back into the
core context.
---
 src/gprs.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/gprs.c b/src/gprs.c
index 9192e68..d31e91b 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -103,6 +103,7 @@ struct ipv6_settings {
 };
 
 struct context_settings {
+	char *apn;
 	char *interface;
 	struct ipv4_settings *ipv4;
 	struct ipv6_settings *ipv6;
@@ -383,6 +384,9 @@ static void context_settings_free(struct context_settings *settings)
 		settings->ipv6 = NULL;
 	}
 
+	g_free(settings->apn);
+	settings->apn = NULL;
+
 	g_free(settings->interface);
 	settings->interface = NULL;
 }
@@ -867,6 +871,9 @@ static DBusMessage *pri_get_properties(DBusConnection *conn,
 	return reply;
 }
 
+static DBusMessage *pri_set_apn(struct pri_context *ctx, DBusConnection *conn,
+				DBusMessage *msg, const char *apn);
+
 static void pri_activate_callback(const struct ofono_error *error, void *data)
 {
 	struct pri_context *ctx = data;
@@ -886,6 +893,11 @@ static void pri_activate_callback(const struct ofono_error *error, void *data)
 		return;
 	}
 
+
+	if (gc->settings->apn && strcmp(gc->settings->apn, ctx->context.apn))
+		/* APN changed  during context activation. */
+		pri_set_apn(ctx, conn, NULL, gc->settings->apn);
+
 	ctx->active = TRUE;
 	__ofono_dbus_pending_reply(&ctx->pending,
 				dbus_message_new_method_return(ctx->pending));
@@ -955,13 +967,13 @@ static DBusMessage *pri_set_apn(struct pri_context *ctx, DBusConnection *conn,
 		storage_sync(ctx->gprs->imsi, SETTINGS_STORE, settings);
 	}
 
-	g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID);
+	if (msg)
+		g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID);
 
 	ofono_dbus_signal_property_changed(conn, ctx->path,
 					OFONO_CONNECTION_CONTEXT_INTERFACE,
 					"AccessPointName",
 					DBUS_TYPE_STRING, &apn);
-
 	return NULL;
 }
 
@@ -2688,6 +2700,15 @@ void ofono_gprs_context_set_interface(struct ofono_gprs_context *gc,
 	settings->interface = g_strdup(interface);
 }
 
+void ofono_gprs_context_set_apn(struct ofono_gprs_context *gc,
+					const char *apn)
+{
+	struct context_settings *settings = gc->settings;
+
+	g_free(settings->apn);
+	settings->apn = g_strdup(apn);
+}
+
 void ofono_gprs_context_set_ipv4_address(struct ofono_gprs_context *gc,
 						const char *address,
 						ofono_bool_t static_ip)
-- 
2.5.0