cli: added Messaging-specific actions
This commit is contained in:
Aleksander Morgado
@@ -20,6 +20,7 @@ mmcli_SOURCES = \
|
||||
mmcli-modem-cdma.c \
|
||||
mmcli-modem-simple.c \
|
||||
mmcli-modem-location.c \
|
||||
mmcli-modem-messaging.c \
|
||||
mmcli-bearer.c \
|
||||
mmcli-sim.c \
|
||||
mmcli-sms.c
|
||||
|
||||
375
cli/mmcli-modem-messaging.c
Normal file
375
cli/mmcli-modem-messaging.c
Normal file
@@ -0,0 +1,375 @@
|
||||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
* mmcli -- Control modem status & access information from the command line
|
||||
*
|
||||
* 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 3 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) 2012 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 <libmm-glib.h>
|
||||
|
||||
#include "mmcli.h"
|
||||
#include "mmcli-common.h"
|
||||
|
||||
/* Context */
|
||||
typedef struct {
|
||||
MMManager *manager;
|
||||
GCancellable *cancellable;
|
||||
MMObject *object;
|
||||
MMModemMessaging *modem_messaging;
|
||||
} Context;
|
||||
static Context *ctx;
|
||||
|
||||
/* Options */
|
||||
static gboolean list_flag;
|
||||
static gchar *create_str;
|
||||
static gchar *delete_str;
|
||||
|
||||
static GOptionEntry entries[] = {
|
||||
{ "list-sms", 0, 0, G_OPTION_ARG_NONE, &list_flag,
|
||||
"List SMS messages available in a given modem",
|
||||
NULL
|
||||
},
|
||||
{ "create-sms", 0, 0, G_OPTION_ARG_STRING, &create_str,
|
||||
"Create a new SMS in a given modem",
|
||||
"[\"key=value,...\"]"
|
||||
},
|
||||
{ "delete-sms", 0, 0, G_OPTION_ARG_STRING, &delete_str,
|
||||
"Delete a SMS from a given modem",
|
||||
"[PATH]"
|
||||
},
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
GOptionGroup *
|
||||
mmcli_modem_messaging_get_option_group (void)
|
||||
{
|
||||
GOptionGroup *group;
|
||||
|
||||
group = g_option_group_new ("messaging",
|
||||
"Messaging options",
|
||||
"Show Messaging options",
|
||||
NULL,
|
||||
NULL);
|
||||
g_option_group_add_entries (group, entries);
|
||||
|
||||
return group;
|
||||
}
|
||||
|
||||
gboolean
|
||||
mmcli_modem_messaging_options_enabled (void)
|
||||
{
|
||||
static guint n_actions = 0;
|
||||
static gboolean checked = FALSE;
|
||||
|
||||
if (checked)
|
||||
return !!n_actions;
|
||||
|
||||
n_actions = (list_flag +
|
||||
!!create_str +
|
||||
!!delete_str);
|
||||
|
||||
if (n_actions > 1) {
|
||||
g_printerr ("error: too many Messaging actions requested\n");
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
checked = TRUE;
|
||||
return !!n_actions;
|
||||
}
|
||||
|
||||
static void
|
||||
context_free (Context *ctx)
|
||||
{
|
||||
if (!ctx)
|
||||
return;
|
||||
|
||||
if (ctx->cancellable)
|
||||
g_object_unref (ctx->cancellable);
|
||||
if (ctx->modem_messaging)
|
||||
g_object_unref (ctx->modem_messaging);
|
||||
if (ctx->object)
|
||||
g_object_unref (ctx->object);
|
||||
if (ctx->manager)
|
||||
g_object_unref (ctx->manager);
|
||||
g_free (ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
ensure_modem_messaging (void)
|
||||
{
|
||||
if (ctx->modem_messaging)
|
||||
return;
|
||||
|
||||
g_printerr ("error: modem has no messaging capabilities");
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
void
|
||||
mmcli_modem_messaging_shutdown (void)
|
||||
{
|
||||
context_free (ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
print_sms_short_info (MMSms *sms)
|
||||
{
|
||||
g_print ("\t%s (%s)\n",
|
||||
mm_sms_get_path (sms),
|
||||
mm_sms_state_get_string (mm_sms_get_state (sms)));
|
||||
}
|
||||
|
||||
static void
|
||||
list_process_reply (GList *result,
|
||||
const GError *error)
|
||||
{
|
||||
if (error) {
|
||||
g_printerr ("error: couldn't list SMS: '%s'\n",
|
||||
error->message);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
g_print ("\n");
|
||||
if (!result) {
|
||||
g_print ("No SMS messages were found\n");
|
||||
} else {
|
||||
GList *l;
|
||||
|
||||
g_print ("Found %u SMS messages:\n", g_list_length (result));
|
||||
for (l = result; l; l = g_list_next (l)) {
|
||||
MMSms *sms = MM_SMS (l->data);
|
||||
|
||||
print_sms_short_info (sms);
|
||||
g_object_unref (sms);
|
||||
}
|
||||
g_list_free (result);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
list_ready (MMModemMessaging *modem,
|
||||
GAsyncResult *result,
|
||||
gpointer nothing)
|
||||
{
|
||||
GList *operation_result;
|
||||
GError *error = NULL;
|
||||
|
||||
operation_result = mm_modem_messaging_list_finish (modem, result, &error);
|
||||
list_process_reply (operation_result, error);
|
||||
|
||||
mmcli_async_operation_done ();
|
||||
}
|
||||
|
||||
static void
|
||||
create_process_reply (MMSms *sms,
|
||||
const GError *error)
|
||||
{
|
||||
if (!sms) {
|
||||
g_printerr ("error: couldn't create new SMS: '%s'\n",
|
||||
error ? error->message : "unknown error");
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
g_print ("Successfully created new SMS:\n");
|
||||
print_sms_short_info (sms);
|
||||
g_object_unref (sms);
|
||||
}
|
||||
|
||||
static void
|
||||
create_ready (MMModemMessaging *modem,
|
||||
GAsyncResult *result,
|
||||
gpointer nothing)
|
||||
{
|
||||
MMSms *sms;
|
||||
GError *error = NULL;
|
||||
|
||||
sms = mm_modem_messaging_create_finish (modem, result, &error);
|
||||
create_process_reply (sms, error);
|
||||
|
||||
mmcli_async_operation_done ();
|
||||
}
|
||||
|
||||
static void
|
||||
delete_process_reply (gboolean result,
|
||||
const GError *error)
|
||||
{
|
||||
if (!result) {
|
||||
g_printerr ("error: couldn't delete SMS: '%s'\n",
|
||||
error ? error->message : "unknown error");
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
g_print ("successfully deleted SMS from modem\n");
|
||||
}
|
||||
|
||||
static void
|
||||
delete_ready (MMModemMessaging *modem,
|
||||
GAsyncResult *result,
|
||||
gpointer nothing)
|
||||
{
|
||||
gboolean operation_result;
|
||||
GError *error = NULL;
|
||||
|
||||
operation_result = mm_modem_messaging_delete_finish (modem, result, &error);
|
||||
delete_process_reply (operation_result, error);
|
||||
|
||||
mmcli_async_operation_done ();
|
||||
}
|
||||
|
||||
static void
|
||||
get_modem_ready (GObject *source,
|
||||
GAsyncResult *result,
|
||||
gpointer none)
|
||||
{
|
||||
ctx->object = mmcli_get_modem_finish (result, &ctx->manager);
|
||||
ctx->modem_messaging = mm_object_get_modem_messaging (ctx->object);
|
||||
|
||||
ensure_modem_messaging ();
|
||||
|
||||
/* Request to list SMS? */
|
||||
if (list_flag) {
|
||||
g_debug ("Asynchronously listing SMS in modem...");
|
||||
mm_modem_messaging_list (ctx->modem_messaging,
|
||||
ctx->cancellable,
|
||||
(GAsyncReadyCallback)list_ready,
|
||||
NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Request to create a new SMS? */
|
||||
if (create_str) {
|
||||
GError *error = NULL;
|
||||
MMSmsProperties *properties;
|
||||
|
||||
properties = mm_sms_properties_new_from_string (create_str, &error);
|
||||
if (!properties) {
|
||||
g_printerr ("Error parsing properties string: '%s'", error->message);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
g_debug ("Asynchronously creating new SMS in modem...");
|
||||
mm_modem_messaging_create (ctx->modem_messaging,
|
||||
properties,
|
||||
FALSE, /* never send it here */
|
||||
ctx->cancellable,
|
||||
(GAsyncReadyCallback)create_ready,
|
||||
NULL);
|
||||
g_object_unref (properties);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Request to delete a given SMS? */
|
||||
if (delete_str) {
|
||||
mm_modem_messaging_delete (ctx->modem_messaging,
|
||||
delete_str,
|
||||
ctx->cancellable,
|
||||
(GAsyncReadyCallback)delete_ready,
|
||||
NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
g_warn_if_reached ();
|
||||
}
|
||||
|
||||
void
|
||||
mmcli_modem_messaging_run_asynchronous (GDBusConnection *connection,
|
||||
GCancellable *cancellable)
|
||||
{
|
||||
/* Initialize context */
|
||||
ctx = g_new0 (Context, 1);
|
||||
if (cancellable)
|
||||
ctx->cancellable = g_object_ref (cancellable);
|
||||
|
||||
/* Get proper modem */
|
||||
mmcli_get_modem (connection,
|
||||
mmcli_get_common_modem_string (),
|
||||
cancellable,
|
||||
(GAsyncReadyCallback)get_modem_ready,
|
||||
NULL);
|
||||
}
|
||||
|
||||
void
|
||||
mmcli_modem_messaging_run_synchronous (GDBusConnection *connection)
|
||||
{
|
||||
GError *error = NULL;
|
||||
|
||||
/* Initialize context */
|
||||
ctx = g_new0 (Context, 1);
|
||||
ctx->object = mmcli_get_modem_sync (connection,
|
||||
mmcli_get_common_modem_string (),
|
||||
&ctx->manager);
|
||||
ctx->modem_messaging = mm_object_get_modem_messaging (ctx->object);
|
||||
|
||||
ensure_modem_messaging ();
|
||||
|
||||
/* Request to list the SMS? */
|
||||
if (list_flag) {
|
||||
GList *result;
|
||||
|
||||
g_debug ("Synchronously listing SMS messages...");
|
||||
result = mm_modem_messaging_list_sync (ctx->modem_messaging, NULL, &error);
|
||||
list_process_reply (result, error);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Request to create a new SMS? */
|
||||
if (create_str) {
|
||||
MMSms *sms;
|
||||
GError *error = NULL;
|
||||
MMSmsProperties *properties;
|
||||
|
||||
properties = mm_sms_properties_new_from_string (create_str, &error);
|
||||
if (!properties) {
|
||||
g_printerr ("Error parsing properties string: '%s'", error->message);
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
g_debug ("Synchronously creating new SMS in modem...");
|
||||
sms = mm_modem_messaging_create_sync (ctx->modem_messaging,
|
||||
properties,
|
||||
FALSE, /* never send it here */
|
||||
NULL,
|
||||
&error);
|
||||
g_object_unref (properties);
|
||||
|
||||
create_process_reply (sms, error);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Request to delete a given SMS? */
|
||||
if (delete_str) {
|
||||
gboolean result;
|
||||
|
||||
result = mm_modem_messaging_delete_sync (ctx->modem_messaging,
|
||||
delete_str,
|
||||
NULL,
|
||||
&error);
|
||||
|
||||
delete_process_reply (result, error);
|
||||
return;
|
||||
}
|
||||
|
||||
g_warn_if_reached ();
|
||||
}
|
||||
11
cli/mmcli.c
11
cli/mmcli.c
@@ -190,6 +190,8 @@ main (gint argc, gchar **argv)
|
||||
mmcli_modem_simple_get_option_group ());
|
||||
g_option_context_add_group (context,
|
||||
mmcli_modem_location_get_option_group ());
|
||||
g_option_context_add_group (context,
|
||||
mmcli_modem_messaging_get_option_group ());
|
||||
g_option_context_add_group (context,
|
||||
mmcli_sim_get_option_group ());
|
||||
g_option_context_add_group (context,
|
||||
@@ -286,6 +288,13 @@ main (gint argc, gchar **argv)
|
||||
else
|
||||
mmcli_modem_location_run_synchronous (connection);
|
||||
}
|
||||
/* Modem Messaging options? */
|
||||
else if (mmcli_modem_messaging_options_enabled ()) {
|
||||
if (async_flag)
|
||||
mmcli_modem_messaging_run_asynchronous (connection, cancellable);
|
||||
else
|
||||
mmcli_modem_messaging_run_synchronous (connection);
|
||||
}
|
||||
/* Modem options?
|
||||
* NOTE: let this check be always the last one, as other groups also need
|
||||
* having a modem specified, and therefore if -m is set, modem options
|
||||
@@ -316,6 +325,8 @@ main (gint argc, gchar **argv)
|
||||
mmcli_modem_simple_shutdown ();
|
||||
} else if (mmcli_modem_location_options_enabled ()) {
|
||||
mmcli_modem_location_shutdown ();
|
||||
} else if (mmcli_modem_messaging_options_enabled ()) {
|
||||
mmcli_modem_messaging_shutdown ();
|
||||
} else if (mmcli_sim_options_enabled ()) {
|
||||
mmcli_sim_shutdown ();
|
||||
} else if (mmcli_bearer_options_enabled ()) {
|
||||
|
||||
@@ -76,6 +76,14 @@ void mmcli_modem_location_run_asynchronous (GDBusConnection *connecti
|
||||
void mmcli_modem_location_run_synchronous (GDBusConnection *connection);
|
||||
void mmcli_modem_location_shutdown (void);
|
||||
|
||||
/* Messaging group */
|
||||
GOptionGroup *mmcli_modem_messaging_get_option_group (void);
|
||||
gboolean mmcli_modem_messaging_options_enabled (void);
|
||||
void mmcli_modem_messaging_run_asynchronous (GDBusConnection *connection,
|
||||
GCancellable *cancellable);
|
||||
void mmcli_modem_messaging_run_synchronous (GDBusConnection *connection);
|
||||
void mmcli_modem_messaging_shutdown (void);
|
||||
|
||||
/* Bearer group */
|
||||
GOptionGroup *mmcli_bearer_get_option_group (void);
|
||||
gboolean mmcli_bearer_options_enabled (void);
|
||||
|
||||
Reference in New Issue
Block a user