qmicli: new WMS action group

Currently just supporting '--wms-reset' and '--wms-noop'.

src/qmicli/Makefile.am

@@ -21,6 +21,7 @@ qmicli_SOURCES = \
 	qmicli-nas.c \
 	qmicli-pbm.c \
 	qmicli-uim.c \
+	qmicli-wms.c \
 	qmicli-wda.c \
 	qmicli-voice.c
 

src/qmicli/qmicli-wms.c

@@ -0,0 +1,183 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * qmicli -- Command line interface to control QMI devices
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright (C) 2015 Aleksander Morgado <aleksander@aleksander.es>
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <string.h>
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include <libqmi-glib.h>
+
+#include "qmicli.h"
+
+/* Context */
+typedef struct {
+    QmiDevice *device;
+    QmiClientWms *client;
+    GCancellable *cancellable;
+} Context;
+static Context *ctx;
+
+/* Options */
+static gboolean reset_flag;
+static gboolean noop_flag;
+
+static GOptionEntry entries[] = {
+    { "wms-reset", 0, 0, G_OPTION_ARG_NONE, &reset_flag,
+      "Reset the service state",
+      NULL
+    },
+    { "wms-noop", 0, 0, G_OPTION_ARG_NONE, &noop_flag,
+      "Just allocate or release a WMS client. Use with `--client-no-release-cid' and/or `--client-cid'",
+      NULL
+    },
+    { NULL }
+};
+
+GOptionGroup *
+qmicli_wms_get_option_group (void)
+{
+	GOptionGroup *group;
+
+	group = g_option_group_new ("wms",
+	                            "WMS options",
+	                            "Show Wireless Messaging Service options",
+	                            NULL,
+	                            NULL);
+	g_option_group_add_entries (group, entries);
+
+	return group;
+}
+
+gboolean
+qmicli_wms_options_enabled (void)
+{
+    static guint n_actions = 0;
+    static gboolean checked = FALSE;
+
+    if (checked)
+        return !!n_actions;
+
+    n_actions = (reset_flag +
+                 noop_flag);
+
+    if (n_actions > 1) {
+        g_printerr ("error: too many WMS actions requested\n");
+        exit (EXIT_FAILURE);
+    }
+
+    checked = TRUE;
+    return !!n_actions;
+}
+
+static void
+context_free (Context *context)
+{
+    if (!context)
+        return;
+
+    if (context->client)
+        g_object_unref (context->client);
+    g_object_unref (context->cancellable);
+    g_object_unref (context->device);
+    g_slice_free (Context, context);
+}
+
+static void
+shutdown (gboolean operation_status)
+{
+    /* Cleanup context and finish async operation */
+    context_free (ctx);
+    qmicli_async_operation_done (operation_status);
+}
+
+static void
+reset_ready (QmiClientWms *client,
+             GAsyncResult *res)
+{
+    QmiMessageWmsResetOutput *output;
+    GError *error = NULL;
+
+    output = qmi_client_wms_reset_finish (client, res, &error);
+    if (!output) {
+        g_printerr ("error: operation failed: %s\n", error->message);
+        g_error_free (error);
+        shutdown (FALSE);
+        return;
+    }
+
+    if (!qmi_message_wms_reset_output_get_result (output, &error)) {
+        g_printerr ("error: couldn't reset the WMS service: %s\n", error->message);
+        g_error_free (error);
+        qmi_message_wms_reset_output_unref (output);
+        shutdown (FALSE);
+        return;
+    }
+
+    g_print ("[%s] Successfully performed WMS service reset\n",
+             qmi_device_get_path_display (ctx->device));
+
+    qmi_message_wms_reset_output_unref (output);
+    shutdown (TRUE);
+}
+
+static gboolean
+noop_cb (gpointer unused)
+{
+    shutdown (TRUE);
+    return FALSE;
+}
+
+void
+qmicli_wms_run (QmiDevice *device,
+                QmiClientWms *client,
+                GCancellable *cancellable)
+{
+    /* Initialize context */
+    ctx = g_slice_new (Context);
+    ctx->device = g_object_ref (device);
+    ctx->client = g_object_ref (client);
+    ctx->cancellable = g_object_ref (cancellable);
+
+    /* Request to reset WMS service? */
+    if (reset_flag) {
+        g_debug ("Asynchronously resetting WMS service...");
+        qmi_client_wms_reset (ctx->client,
+                              NULL,
+                              10,
+                              ctx->cancellable,
+                              (GAsyncReadyCallback)reset_ready,
+                              NULL);
+        return;
+    }
+
+    /* Just client allocate/release? */
+    if (noop_flag) {
+        g_idle_add (noop_cb, NULL);
+        return;
+    }
+
+    g_warn_if_reached ();
+}

src/qmicli/qmicli.c

@@ -312,6 +312,9 @@ allocate_client_ready (QmiDevice *dev,
     case QMI_SERVICE_UIM:
         qmicli_uim_run (dev, QMI_CLIENT_UIM (client), cancellable);
         return;
+    case QMI_SERVICE_WMS:
+        qmicli_wms_run (dev, QMI_CLIENT_WMS (client), cancellable);
+        return;
     case QMI_SERVICE_WDA:
         qmicli_wda_run (dev, QMI_CLIENT_WDA (client), cancellable);
         return;
@@ -582,6 +585,12 @@ parse_actions (void)
         actions_enabled++;
     }
 
+    /* WMS options? */
+    if (qmicli_wms_options_enabled ()) {
+        service = QMI_SERVICE_WMS;
+        actions_enabled++;
+    }
+
     /* WDA options? */
     if (qmicli_wda_options_enabled ()) {
         service = QMI_SERVICE_WDA;
@@ -631,6 +640,8 @@ int main (int argc, char **argv)
 	                            qmicli_pbm_get_option_group ());
 	g_option_context_add_group (context,
 	                            qmicli_uim_get_option_group ());
+	g_option_context_add_group (context,
+	                            qmicli_wms_get_option_group ());
 	g_option_context_add_group (context,
 	                            qmicli_wda_get_option_group ());
 	g_option_context_add_group (context,

src/qmicli/qmicli.h

@@ -61,6 +61,13 @@ void          qmicli_uim_run              (QmiDevice *device,
                                            QmiClientUim *client,
                                            GCancellable *cancellable);
 
+/* WMS group */
+GOptionGroup *qmicli_wms_get_option_group (void);
+gboolean      qmicli_wms_options_enabled  (void);
+void          qmicli_wms_run              (QmiDevice *device,
+                                           QmiClientWms *client,
+                                           GCancellable *cancellable);
+
 /* WDA group */
 GOptionGroup *qmicli_wda_get_option_group (void);
 gboolean      qmicli_wda_options_enabled  (void);