SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli,3gpp-ussd: move actions to a separate source file

Browse Source 
All the USSD operations together in a separate file, as they're
managed in a separate 3GPP USSD interface.
This commit is contained in:
Aleksander Morgado
2021-03-24 15:31:13 +01:00
parent 08ed7b75db
commit 342b7119c3
5 changed files with 404 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/mmcli-modem-3gpp.c
+20 -244
View File
@@ -15,8 +15,8 @@
* 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) 2011 - 2012 Aleksander Morgado <aleksander@gnu.org>
* Copyright (C) 2012 Google, Inc.
* Copyright (C) 2011 - 2021 Aleksander Morgado <aleksander@aleksander.es>
* Copyright (C) 2012 - 2021 Google, Inc.
*/
#include "config.h"
@@ -38,24 +38,19 @@
/* Context */
typedef struct {
MMManager *manager;
MMManager *manager;
GCancellable *cancellable;
MMObject *object;
MMModem3gpp *modem_3gpp;
MMModem3gppUssd *modem_3gpp_ussd;
MMObject *object;
MMModem3gpp *modem_3gpp;
} Context;
static Context *ctx;
/* Options */
static gboolean scan_flag;
static gboolean register_home_flag;
static gchar *register_in_operator_str;
static gchar *set_eps_ue_mode_operation_str;
static gchar *set_initial_eps_bearer_settings_str;
static gboolean ussd_status_flag;
static gchar *ussd_initiate_str;
static gchar *ussd_respond_str;
static gboolean ussd_cancel_flag;
static gboolean scan_flag;
static gboolean register_home_flag;
static gchar *register_in_operator_str;
static gchar *set_eps_ue_mode_operation_str;
static gchar *set_initial_eps_bearer_settings_str;
static GOptionEntry entries[] = {
{ "3gpp-scan", 0, 0, G_OPTION_ARG_NONE, &scan_flag,
@@ -78,22 +73,6 @@ static GOptionEntry entries[] = {
"Set the initial EPS bearer settings",
"[\"key=value,...\"]"
},
{ "3gpp-ussd-status", 0, 0, G_OPTION_ARG_NONE, &ussd_status_flag,
"Show status of any ongoing USSD session",
NULL
},
{ "3gpp-ussd-initiate", 0, 0, G_OPTION_ARG_STRING, &ussd_initiate_str,
"Request a given modem to initiate a USSD session",
"[command]"
},
{ "3gpp-ussd-respond", 0, 0, G_OPTION_ARG_STRING, &ussd_respond_str,
"Request a given modem to respond to a USSD request",
"[response]"
},
{ "3gpp-ussd-cancel", 0, 0, G_OPTION_ARG_NONE, &ussd_cancel_flag,
"Request to cancel any ongoing USSD session",
NULL
},
{ NULL }
};
@@ -115,7 +94,7 @@ mmcli_modem_3gpp_get_option_group (void)
gboolean
mmcli_modem_3gpp_options_enabled (void)
{
static guint n_actions = 0;
static guint n_actions = 0;
static gboolean checked = FALSE;
if (checked)
@@ -125,11 +104,7 @@ mmcli_modem_3gpp_options_enabled (void)
register_home_flag +
!!register_in_operator_str +
!!set_eps_ue_mode_operation_str +
!!set_initial_eps_bearer_settings_str +
ussd_status_flag +
!!ussd_initiate_str +
!!ussd_respond_str +
ussd_cancel_flag);
!!set_initial_eps_bearer_settings_str);
if (n_actions > 1) {
g_printerr ("error: too many 3GPP actions requested\n");
@@ -141,14 +116,6 @@ mmcli_modem_3gpp_options_enabled (void)
if (scan_flag)
mmcli_force_async_operation ();
/* USSD initiate and respond will wait for URCs to get finished, so
* these are truly async. */
if (ussd_initiate_str || ussd_respond_str)
mmcli_force_async_operation ();
if (ussd_status_flag)
mmcli_force_sync_operation ();
checked = TRUE;
return !!n_actions;
}
@@ -163,8 +130,6 @@ context_free (void)
g_object_unref (ctx->cancellable);
if (ctx->modem_3gpp)
g_object_unref (ctx->modem_3gpp);
if (ctx->modem_3gpp_ussd)
g_object_unref (ctx->modem_3gpp_ussd);
if (ctx->object)
g_object_unref (ctx->object);
if (ctx->manager)
@@ -188,22 +153,6 @@ ensure_modem_3gpp (void)
/* Success */
}
static void
ensure_modem_3gpp_ussd (void)
{
if (mm_modem_get_state (mm_object_peek_modem (ctx->object)) < MM_MODEM_STATE_ENABLED) {
g_printerr ("error: modem not enabled yet\n");
exit (EXIT_FAILURE);
}
if (!ctx->modem_3gpp_ussd) {
g_printerr ("error: modem has no USSD capabilities\n");
exit (EXIT_FAILURE);
}
/* Success */
}
void
mmcli_modem_3gpp_shutdown (void)
{
@@ -211,7 +160,7 @@ mmcli_modem_3gpp_shutdown (void)
}
static void
scan_process_reply (GList *result,
scan_process_reply (GList *result,
const GError *error)
{
if (!result) {
@@ -228,10 +177,9 @@ scan_process_reply (GList *result,
static void
scan_ready (MMModem3gpp *modem_3gpp,
GAsyncResult *result,
gpointer nothing)
GAsyncResult *result)
{
GList *operation_result;
GList *operation_result;
GError *error = NULL;
operation_result = mm_modem_3gpp_scan_finish (modem_3gpp, result, &error);
@@ -241,7 +189,7 @@ scan_ready (MMModem3gpp *modem_3gpp,
}
static void
register_process_reply (gboolean result,
register_process_reply (gboolean result,
const GError *error)
{
if (!result) {
@@ -255,11 +203,10 @@ register_process_reply (gboolean result,
static void
register_ready (MMModem3gpp *modem_3gpp,
GAsyncResult *result,
gpointer nothing)
GAsyncResult *result)
{
gboolean operation_result;
GError *error = NULL;
gboolean operation_result;
GError *error = NULL;
operation_result = mm_modem_3gpp_register_finish (modem_3gpp, result, &error);
register_process_reply (operation_result, error);
@@ -332,122 +279,19 @@ parse_eps_ue_mode_operation (MMModem3gppEpsUeModeOperation *uemode)
}
}
static void
print_ussd_status (void)
{
mmcli_output_string (MMC_F_GENERAL_DBUS_PATH, mm_modem_3gpp_ussd_get_path (ctx->modem_3gpp_ussd));
mmcli_output_string (MMC_F_3GPP_USSD_STATUS, mm_modem_3gpp_ussd_session_state_get_string (
mm_modem_3gpp_ussd_get_state (ctx->modem_3gpp_ussd)));
mmcli_output_string (MMC_F_3GPP_USSD_NETWORK_REQUEST, mm_modem_3gpp_ussd_get_network_request (ctx->modem_3gpp_ussd));
mmcli_output_string (MMC_F_3GPP_USSD_NETWORK_NOTIFICATION, mm_modem_3gpp_ussd_get_network_notification (ctx->modem_3gpp_ussd));
mmcli_output_dump ();
}
static void
ussd_initiate_process_reply (gchar *result,
const GError *error)
{
if (!result) {
g_printerr ("error: couldn't initiate USSD session: '%s'\n",
error ? error->message : "unknown error");
exit (EXIT_FAILURE);
}
g_print ("USSD session initiated; "
"new reply from network: '%s'\n", result);
g_free (result);
}
static void
ussd_initiate_ready (MMModem3gppUssd *modem_3gpp_ussd,
GAsyncResult *result,
gpointer nothing)
{
gchar *operation_result;
GError *error = NULL;
operation_result = mm_modem_3gpp_ussd_initiate_finish (modem_3gpp_ussd, result, &error);
ussd_initiate_process_reply (operation_result, error);
mmcli_async_operation_done ();
}
static void
ussd_respond_process_reply (gchar *result,
const GError *error)
{
if (!result) {
g_printerr ("error: couldn't send response in USSD session: '%s'\n",
error ? error->message : "unknown error");
exit (EXIT_FAILURE);
}
g_print ("response successfully sent in USSD session; "
"new reply from network: '%s'\n", result);
g_free (result);
}
static void
ussd_respond_ready (MMModem3gppUssd *modem_3gpp_ussd,
GAsyncResult *result,
gpointer nothing)
{
gchar *operation_result;
GError *error = NULL;
operation_result = mm_modem_3gpp_ussd_respond_finish (modem_3gpp_ussd, result, &error);
ussd_respond_process_reply (operation_result, error);
mmcli_async_operation_done ();
}
static void
ussd_cancel_process_reply (gboolean result,
const GError *error)
{
if (!result) {
g_printerr ("error: couldn't cancel USSD session: '%s'\n",
error ? error->message : "unknown error");
exit (EXIT_FAILURE);
}
g_print ("successfully cancelled USSD session\n");
}
static void
ussd_cancel_ready (MMModem3gppUssd *modem_3gpp_ussd,
GAsyncResult *result,
gpointer nothing)
{
gboolean operation_result;
GError *error = NULL;
operation_result = mm_modem_3gpp_ussd_cancel_finish (modem_3gpp_ussd, result, &error);
ussd_cancel_process_reply (operation_result, error);
mmcli_async_operation_done ();
}
static void
get_modem_ready (GObject *source,
GAsyncResult *result,
gpointer none)
GAsyncResult *result)
{
ctx->object = mmcli_get_modem_finish (result, &ctx->manager);
ctx->modem_3gpp = mm_object_get_modem_3gpp (ctx->object);
ctx->modem_3gpp_ussd = mm_object_get_modem_3gpp_ussd (ctx->object);
/* Setup operation timeout */
if (ctx->modem_3gpp)
mmcli_force_operation_timeout (G_DBUS_PROXY (ctx->modem_3gpp));
if (ctx->modem_3gpp_ussd)
mmcli_force_operation_timeout (G_DBUS_PROXY (ctx->modem_3gpp_ussd));
ensure_modem_3gpp ();
if (ussd_status_flag)
g_assert_not_reached ();
/* Request to scan networks? */
if (scan_flag) {
g_debug ("Asynchronously scanning for networks...");
@@ -506,44 +350,6 @@ get_modem_ready (GObject *source,
}
/* Request to initiate USSD session? */
if (ussd_initiate_str) {
ensure_modem_3gpp_ussd ();
g_debug ("Asynchronously initiating USSD session...");
mm_modem_3gpp_ussd_initiate (ctx->modem_3gpp_ussd,
ussd_initiate_str,
ctx->cancellable,
(GAsyncReadyCallback)ussd_initiate_ready,
NULL);
return;
}
/* Request to respond in USSD session? */
if (ussd_respond_str) {
ensure_modem_3gpp_ussd ();
g_debug ("Asynchronously sending response in USSD session...");
mm_modem_3gpp_ussd_respond (ctx->modem_3gpp_ussd,
ussd_respond_str,
ctx->cancellable,
(GAsyncReadyCallback)ussd_respond_ready,
NULL);
return;
}
/* Request to cancel USSD session? */
if (ussd_cancel_flag) {
ensure_modem_3gpp_ussd ();
g_debug ("Asynchronously cancelling USSD session...");
mm_modem_3gpp_ussd_cancel (ctx->modem_3gpp_ussd,
ctx->cancellable,
(GAsyncReadyCallback)ussd_cancel_ready,
NULL);
return;
}
g_warn_if_reached ();
}
@@ -575,22 +381,15 @@ mmcli_modem_3gpp_run_synchronous (GDBusConnection *connection)
mmcli_get_common_modem_string (),
&ctx->manager);
ctx->modem_3gpp = mm_object_get_modem_3gpp (ctx->object);
ctx->modem_3gpp_ussd = mm_object_get_modem_3gpp_ussd (ctx->object);
/* Setup operation timeout */
if (ctx->modem_3gpp)
mmcli_force_operation_timeout (G_DBUS_PROXY (ctx->modem_3gpp));
if (ctx->modem_3gpp_ussd)
mmcli_force_operation_timeout (G_DBUS_PROXY (ctx->modem_3gpp_ussd));
ensure_modem_3gpp ();
if (scan_flag)
g_assert_not_reached ();
if (ussd_initiate_str)
g_assert_not_reached ();
if (ussd_respond_str)
g_assert_not_reached ();
/* Request to register the modem? */
if (register_in_operator_str || register_home_flag) {
@@ -643,28 +442,5 @@ mmcli_modem_3gpp_run_synchronous (GDBusConnection *connection)
return;
}
/* Request to show USSD status? */
if (ussd_status_flag) {
ensure_modem_3gpp_ussd ();
g_debug ("Printing USSD status...");
print_ussd_status ();
return;
}
/* Request to cancel USSD session? */
if (ussd_cancel_flag) {
gboolean result;
ensure_modem_3gpp_ussd ();
g_debug ("Asynchronously cancelling USSD session...");
result = mm_modem_3gpp_ussd_cancel_sync (ctx->modem_3gpp_ussd,
NULL,
&error);
ussd_cancel_process_reply (result, error);
return;
}
g_warn_if_reached ();
}