[PATCH 13/19] ubloxmodem: push back APN into gprs context

[Dragos Tatulea <dragos@endocode.com>]

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

It can be that the APN is different than what a user provided. So let
the core know. This happens for example when using the default bearer:
the user doesn't provide any APN, so read the one from CGCONTRDP.
---
 drivers/ubloxmodem/gprs-context.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/ubloxmodem/gprs-context.c b/drivers/ubloxmodem/gprs-context.c
index f80e1d8..b6eaa5e 100644
--- a/drivers/ubloxmodem/gprs-context.c
+++ b/drivers/ubloxmodem/gprs-context.c
@@ -183,6 +183,7 @@ static void cgcontrdp_bridge_cb(gboolean ok, GAtResult *result, gpointer user_da
 	const char *laddrnetmask = NULL;
 	const char *gw = NULL;
 	const char *dns[2+1] = { NULL, NULL, NULL };
+	const char *apn = NULL;
 
 	DBG("ok %d", ok);
 
@@ -197,7 +198,6 @@ static void cgcontrdp_bridge_cb(gboolean ok, GAtResult *result, gpointer user_da
 	while (g_at_result_iter_next(&iter, "+CGCONTRDP:")) {
 		/* tmp vals for ignored fields */
 		int bearer_id;
-		char *apn;
 
 		if (!g_at_result_iter_next_number(&iter, &cid))
 			break;
@@ -234,6 +234,16 @@ static void cgcontrdp_bridge_cb(gboolean ok, GAtResult *result, gpointer user_da
 	if (dns[0])
 		ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
 
+	if (gcd->active_context == ublox_data.default_context_id) {
+		/*
+		 * Only for automatic default context: the APN set by the user
+		 * might not be the correct one because the default context was
+		 * used instead.
+		 */
+		ofono_gprs_context_set_apn(gc, apn);
+		strcpy(gcd->apn, apn);
+	}
+
 	CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
 }
 
-- 
2.5.0