[PATCH 2/2 v3] mbimcli: new '--ms-notify-host-shutdown' action
Ben Chan
benchan at chromium.org
Tue Mar 4 11:56:27 PST 2014
---
src/mbimcli/Makefile.am | 3 +-
src/mbimcli/mbimcli-ms-host-shutdown.c | 160 +++++++++++++++++++++++++++++++++
src/mbimcli/mbimcli.c | 18 ++--
src/mbimcli/mbimcli.h | 40 +++++----
4 files changed, 197 insertions(+), 24 deletions(-)
create mode 100644 src/mbimcli/mbimcli-ms-host-shutdown.c
diff --git a/src/mbimcli/Makefile.am b/src/mbimcli/Makefile.am
index 224feb0..d264205 100644
--- a/src/mbimcli/Makefile.am
+++ b/src/mbimcli/Makefile.am
@@ -14,8 +14,9 @@ mbimcli_SOURCES = \
mbimcli.c \
mbimcli-basic-connect.c \
mbimcli-phonebook.c \
+ mbimcli-dss.c \
mbimcli-ms-firmware-id.c \
- mbimcli-dss.c
+ mbimcli-ms-host-shutdown.c
mbimcli_LDADD = \
$(MBIMCLI_LIBS) \
diff --git a/src/mbimcli/mbimcli-ms-host-shutdown.c b/src/mbimcli/mbimcli-ms-host-shutdown.c
new file mode 100644
index 0000000..459b64d
--- /dev/null
+++ b/src/mbimcli/mbimcli-ms-host-shutdown.c
@@ -0,0 +1,160 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * mbimcli -- Command line interface to control MBIM 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) 2014 Google, Inc.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <string.h>
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include <libmbim-glib.h>
+
+#include "mbimcli.h"
+
+/* Context */
+typedef struct {
+ MbimDevice *device;
+ GCancellable *cancellable;
+} Context;
+static Context *ctx;
+
+/* Options */
+static gboolean notify_host_shutdown_flag;
+
+static GOptionEntry entries[] = {
+ { "ms-notify-host-shutdown", 0, 0, G_OPTION_ARG_NONE, ¬ify_host_shutdown_flag,
+ "Notify that host is shutting down",
+ NULL
+ },
+ { NULL }
+};
+
+GOptionGroup *
+mbimcli_ms_host_shutdown_get_option_group (void)
+{
+ GOptionGroup *group;
+
+ group = g_option_group_new ("ms-host-shutdown",
+ "Microsoft Host Shutdown options",
+ "Show Microsoft Host Shutdown Service options",
+ NULL,
+ NULL);
+ g_option_group_add_entries (group, entries);
+
+ return group;
+}
+
+gboolean
+mbimcli_ms_host_shutdown_options_enabled (void)
+{
+ static guint n_actions = 0;
+ static gboolean checked = FALSE;
+
+ if (checked)
+ return !!n_actions;
+
+ n_actions = notify_host_shutdown_flag;
+
+ if (n_actions > 1) {
+ g_printerr ("error: too many Microsoft Host Shutdown actions requested\n");
+ exit (EXIT_FAILURE);
+ }
+
+ checked = TRUE;
+ return !!n_actions;
+}
+
+static void
+context_free (Context *context)
+{
+ if (!context)
+ return;
+
+ if (context->cancellable)
+ g_object_unref (context->cancellable);
+ if (context->device)
+ 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);
+ mbimcli_async_operation_done (operation_status);
+}
+
+static void
+ms_host_shutdown_ready (MbimDevice *device,
+ GAsyncResult *res)
+{
+ MbimMessage *response;
+ GError *error = NULL;
+
+ response = mbim_device_command_finish (device, res, &error);
+ if (!response || !mbim_message_command_done_get_result (response, &error)) {
+ g_printerr ("error: operation failed: %s\n", error->message);
+ g_error_free (error);
+ if (response)
+ mbim_message_unref (response);
+ shutdown (FALSE);
+ return;
+ }
+
+ g_print ("[%s] Successfully notified that host is shutting down\n\n",
+ mbim_device_get_path_display (device));
+
+ mbim_message_unref (response);
+ shutdown (TRUE);
+}
+
+void
+mbimcli_ms_host_shutdown_run (MbimDevice *device,
+ GCancellable *cancellable)
+{
+ /* Initialize context */
+ ctx = g_slice_new (Context);
+ ctx->device = g_object_ref (device);
+ if (cancellable)
+ ctx->cancellable = g_object_ref (cancellable);
+
+ /* Request to notify that host is shutting down */
+ if (notify_host_shutdown_flag) {
+ MbimMessage *request;
+
+ g_debug ("Asynchronously notifying host is shutting down...");
+ request = (mbim_message_ms_host_shutdown_notify_set_new (NULL));
+ mbim_device_command (ctx->device,
+ request,
+ 10,
+ ctx->cancellable,
+ (GAsyncReadyCallback)ms_host_shutdown_ready,
+ NULL);
+ mbim_message_unref (request);
+ return;
+ }
+
+ g_warn_if_reached ();
+}
diff --git a/src/mbimcli/mbimcli.c b/src/mbimcli/mbimcli.c
index e99f543..a4e48e8 100644
--- a/src/mbimcli/mbimcli.c
+++ b/src/mbimcli/mbimcli.c
@@ -257,11 +257,14 @@ device_open_ready (MbimDevice *dev,
case MBIM_SERVICE_PHONEBOOK:
mbimcli_phonebook_run (dev, cancellable);
return;
+ case MBIM_SERVICE_DSS:
+ mbimcli_dss_run (dev, cancellable);
+ return;
case MBIM_SERVICE_MS_FIRMWARE_ID:
mbimcli_ms_firmware_id_run (dev, cancellable);
return;
- case MBIM_SERVICE_DSS:
- mbimcli_dss_run (dev, cancellable);
+ case MBIM_SERVICE_MS_HOST_SHUTDOWN:
+ mbimcli_ms_host_shutdown_run (dev, cancellable);
return;
default:
g_assert_not_reached ();
@@ -341,11 +344,14 @@ parse_actions (void)
} else if (mbimcli_phonebook_options_enabled ()) {
service = MBIM_SERVICE_PHONEBOOK;
actions_enabled++;
+ } else if (mbimcli_dss_options_enabled ()) {
+ service = MBIM_SERVICE_DSS;
+ actions_enabled++;
} else if (mbimcli_ms_firmware_id_options_enabled ()) {
service = MBIM_SERVICE_MS_FIRMWARE_ID;
actions_enabled++;
- } else if (mbimcli_dss_options_enabled ()) {
- service = MBIM_SERVICE_DSS;
+ } else if (mbimcli_ms_host_shutdown_options_enabled ()) {
+ service = MBIM_SERVICE_MS_HOST_SHUTDOWN;
actions_enabled++;
}
@@ -385,9 +391,11 @@ int main (int argc, char **argv)
g_option_context_add_group (context,
mbimcli_phonebook_get_option_group ());
g_option_context_add_group (context,
+ mbimcli_dss_get_option_group ());
+ g_option_context_add_group (context,
mbimcli_ms_firmware_id_get_option_group ());
g_option_context_add_group (context,
- mbimcli_dss_get_option_group ());
+ mbimcli_ms_host_shutdown_get_option_group ());
g_option_context_add_main_entries (context, main_entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) {
g_printerr ("error: %s\n",
diff --git a/src/mbimcli/mbimcli.h b/src/mbimcli/mbimcli.h
index 06c00e9..4c89432 100644
--- a/src/mbimcli/mbimcli.h
+++ b/src/mbimcli/mbimcli.h
@@ -29,23 +29,27 @@
void mbimcli_async_operation_done (gboolean operation_status);
/* Basic Connect group */
-GOptionGroup *mbimcli_basic_connect_get_option_group (void);
-GOptionGroup *mbimcli_phonebook_get_option_group (void);
-GOptionGroup *mbimcli_ms_firmware_id_get_option_group (void);
-GOptionGroup *mbimcli_dss_get_option_group (void);
-
-gboolean mbimcli_basic_connect_options_enabled (void);
-gboolean mbimcli_phonebook_options_enabled (void);
-gboolean mbimcli_ms_firmware_id_options_enabled (void);
-gboolean mbimcli_dss_options_enabled (void);
-
-void mbimcli_basic_connect_run (MbimDevice *device,
- GCancellable *cancellable);
-void mbimcli_phonebook_run (MbimDevice *device,
- GCancellable *cancellable);
-void mbimcli_ms_firmware_id_run (MbimDevice *device,
- GCancellable *cancellable);
-void mbimcli_dss_run (MbimDevice *device,
- GCancellable *cancellable);
+GOptionGroup *mbimcli_basic_connect_get_option_group (void);
+GOptionGroup *mbimcli_phonebook_get_option_group (void);
+GOptionGroup *mbimcli_dss_get_option_group (void);
+GOptionGroup *mbimcli_ms_firmware_id_get_option_group (void);
+GOptionGroup *mbimcli_ms_host_shutdown_get_option_group (void);
+
+gboolean mbimcli_basic_connect_options_enabled (void);
+gboolean mbimcli_phonebook_options_enabled (void);
+gboolean mbimcli_dss_options_enabled (void);
+gboolean mbimcli_ms_firmware_id_options_enabled (void);
+gboolean mbimcli_ms_host_shutdown_options_enabled (void);
+
+void mbimcli_basic_connect_run (MbimDevice *device,
+ GCancellable *cancellable);
+void mbimcli_phonebook_run (MbimDevice *device,
+ GCancellable *cancellable);
+void mbimcli_dss_run (MbimDevice *device,
+ GCancellable *cancellable);
+void mbimcli_ms_firmware_id_run (MbimDevice *device,
+ GCancellable *cancellable);
+void mbimcli_ms_host_shutdown_run (MbimDevice *device,
+ GCancellable *cancellable);
#endif /* __MBIMCLI_H__ */
--
1.9.0.279.gdc9e3eb
More information about the libmbim-devel
mailing list