Hi Dragos,

On 03/17/2016 12:02 PM, Dragos Tatulea wrote:
When the event comes, trigger CGCONT? to read the APN for the
activated cid and then call ogono_gprs_cid_activated to handle
the event.
---
  drivers/atmodem/gprs.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 53 insertions(+)

diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c
index 4505477..e85bbfb 100644
--- a/drivers/atmodem/gprs.c
+++ b/drivers/atmodem/gprs.c
@@ -49,6 +49,7 @@ static const char *none_prefix[] = { NULL };
  struct gprs_data {
        GAtChat *chat;
        unsigned int vendor;
+       unsigned int last_auto_context_id;
  };

  static void at_cgatt_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -141,6 +142,49 @@ static void at_gprs_registration_status(struct ofono_gprs 
*gprs,
        CALLBACK_WITH_FAILURE(cb, -1, data);
  }

+static void at_cgdcont_read_cb(gboolean ok, GAtResult *result,
+                               gpointer user_data)
+{
+       struct ofono_gprs *gprs = user_data;
+       struct gprs_data *gd = ofono_gprs_get_data(gprs);
+       int activated_cid = gd->last_auto_context_id;
+       const char *apn = NULL;
+       GAtResultIter iter;
+
+       DBG("ok %d", ok);
+
+       if (!ok) {
+               ofono_warn("Can't read CGDCONT contexts.");
+               return;
+       }
+
+       g_at_result_iter_init(&iter, result);
+
+       while (g_at_result_iter_next(&iter, "+CGDCONT:")) {
+               int read_cid;
+
+               if (!g_at_result_iter_next_number(&iter, &read_cid))
+                       break;
+
+               if (read_cid != activated_cid)
+                       continue;
+
+               /* ignore protocol */
+               g_at_result_iter_skip_next(&iter);
+
+               g_at_result_iter_next_string(&iter, &apn);
+
+               break;
+       }
+
+       if (apn)
+               ofono_gprs_cid_activated(gprs, activated_cid, apn);
+       else
+               ofono_warn("cid %u: Received activated but no apn present",
+                               activated_cid);
+}
+
+
  static void cgreg_notify(GAtResult *result, gpointer user_data)
  {
        struct ofono_gprs *gprs = user_data;
@@ -157,6 +201,7 @@ static void cgreg_notify(GAtResult *result, gpointer 
user_data)
  static void cgev_notify(GAtResult *result, gpointer user_data)
  {
        struct ofono_gprs *gprs = user_data;
+       struct gprs_data *gd = ofono_gprs_get_data(gprs);
        GAtResultIter iter;
        const char *event;

@@ -172,6 +217,14 @@ static void cgev_notify(GAtResult *result, gpointer 
user_data)
                        g_str_equal(event, "ME DETACH")) {
                ofono_gprs_detached_notify(gprs);
                return;
+       } else if (g_str_has_prefix(event, "ME PDN ACT")) {
+               char tmp[16] = {0};

This is not our initialization style.

+
+               sscanf(event, "%s %s %s %u",

man sscanf.  You can use %*s to skip assignment to tmp completely.

+                               tmp, tmp, tmp, &gd->last_auto_context_id);
+
+               g_at_chat_send(gd->chat, "AT+CGDCONT?", cgdcont_prefix,
+                               at_cgdcont_read_cb, gprs, NULL);
        }
  }



Regards,
-Denis
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono

Reply via email to