From 3ab765f11c074846cdd7fc81db3f1056ae18f388 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 21 Oct 2021 11:05:51 +0200 Subject: api,3gpp: new 'SetPacketServiceState()' method --- cli/mmcli-modem-3gpp.c | 86 ++++++++++++++++++++- docs/reference/libmm-glib/libmm-glib-sections.txt | 7 ++ ...g.freedesktop.ModemManager1.Modem.Modem3gpp.xml | 12 +++ libmm-glib/mm-common-helpers.c | 10 +++ libmm-glib/mm-common-helpers.h | 2 + libmm-glib/mm-modem-3gpp.c | 87 ++++++++++++++++++++++ libmm-glib/mm-modem-3gpp.h | 13 ++++ 7 files changed, 216 insertions(+), 1 deletion(-) diff --git a/cli/mmcli-modem-3gpp.c b/cli/mmcli-modem-3gpp.c index f35f1f19..58bdcc83 100644 --- a/cli/mmcli-modem-3gpp.c +++ b/cli/mmcli-modem-3gpp.c @@ -52,6 +52,7 @@ static gchar *register_in_operator_str; static gchar *set_eps_ue_mode_operation_str; static gchar *set_initial_eps_bearer_settings_str; static gchar *disable_facility_lock_str; +static gchar *set_packet_service_state_str; static GOptionEntry entries[] = { { "3gpp-scan", 0, 0, G_OPTION_ARG_NONE, &scan_flag, @@ -78,6 +79,10 @@ static GOptionEntry entries[] = { "Disable facility personalization", "[facility,key]" }, + { "3gpp-set-packet-service-state", 0, 0, G_OPTION_ARG_STRING, &set_packet_service_state_str, + "Set packet service state", + "[attached|detached]" + }, { NULL } }; @@ -110,7 +115,8 @@ mmcli_modem_3gpp_options_enabled (void) !!register_in_operator_str + !!set_eps_ue_mode_operation_str + !!set_initial_eps_bearer_settings_str + - !!disable_facility_lock_str); + !!disable_facility_lock_str + + !!set_packet_service_state_str); if (n_actions > 1) { g_printerr ("error: too many 3GPP actions requested\n"); @@ -340,6 +346,47 @@ disable_facility_lock_ready (MMModem3gpp *modem_3gpp, mmcli_async_operation_done (); } +static void +set_packet_service_state_process_reply (gboolean result, + const GError *error) +{ + if (!result) { + g_printerr ("error: couldn't set packet service state: '%s'\n", + error ? error->message : "unknown error"); + exit (EXIT_FAILURE); + } + + g_print ("successfully set packet service state\n"); +} + +static void +set_packet_service_state_ready (MMModem3gpp *modem_3gpp, + GAsyncResult *result, + gpointer nothing) +{ + gboolean operation_result; + GError *error = NULL; + + operation_result = mm_modem_3gpp_set_packet_service_state_finish (modem_3gpp, result, &error); + set_packet_service_state_process_reply (operation_result, error); + + mmcli_async_operation_done (); +} + +static gboolean +set_packet_service_state_parse_input (const gchar *str, + MMModem3gppPacketServiceState *out_state) +{ + MMModem3gppPacketServiceState state; + + state = mm_common_get_3gpp_packet_service_state_from_string (str, NULL); + if (state == MM_MODEM_3GPP_PACKET_SERVICE_STATE_UNKNOWN) + return FALSE; + + *out_state = state; + return TRUE; +} + static void get_modem_ready (GObject *source, GAsyncResult *result) @@ -435,6 +482,24 @@ get_modem_ready (GObject *source, } + /* Request to set packet service state */ + if (set_packet_service_state_str) { + MMModem3gppPacketServiceState state; + + if (!set_packet_service_state_parse_input (set_packet_service_state_str, &state)) { + g_printerr ("Error parsing packet service state string.\n"); + exit (EXIT_FAILURE); + } + + g_debug ("Asynchronously setting packet service state..."); + mm_modem_3gpp_set_packet_service_state (ctx->modem_3gpp, + state, + ctx->cancellable, + (GAsyncReadyCallback)set_packet_service_state_ready, + NULL); + return; + } + g_warn_if_reached (); } @@ -552,5 +617,24 @@ mmcli_modem_3gpp_run_synchronous (GDBusConnection *connection) return; } + /* Request to set packet service state */ + if (set_packet_service_state_str) { + gboolean result; + MMModem3gppPacketServiceState state; + + if (!set_packet_service_state_parse_input (set_packet_service_state_str, &state)) { + g_printerr ("Error parsing packet service state string.\n"); + exit (EXIT_FAILURE); + } + + g_debug ("Asynchronously setting packet service state..."); + result = mm_modem_3gpp_set_packet_service_state_sync (ctx->modem_3gpp, + state, + NULL, + &error); + set_packet_service_state_process_reply (result, error); + return; + } + g_warn_if_reached (); } diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt index aaef50b4..f3450893 100644 --- a/docs/reference/libmm-glib/libmm-glib-sections.txt +++ b/docs/reference/libmm-glib/libmm-glib-sections.txt @@ -324,6 +324,9 @@ mm_modem_3gpp_set_initial_eps_bearer_settings_sync mm_modem_3gpp_disable_facility_lock mm_modem_3gpp_disable_facility_lock_finish mm_modem_3gpp_disable_facility_lock_sync +mm_modem_3gpp_set_packet_service_state +mm_modem_3gpp_set_packet_service_state_finish +mm_modem_3gpp_set_packet_service_state_sync MMModem3gppClass MMModem3gppPrivate @@ -2134,12 +2137,16 @@ mm_gdbus_modem3gpp_call_set_initial_eps_bearer_settings_sync mm_gdbus_modem3gpp_call_disable_facility_lock mm_gdbus_modem3gpp_call_disable_facility_lock_finish mm_gdbus_modem3gpp_call_disable_facility_lock_sync +mm_gdbus_modem3gpp_call_set_packet_service_state +mm_gdbus_modem3gpp_call_set_packet_service_state_finish +mm_gdbus_modem3gpp_call_set_packet_service_state_sync mm_gdbus_modem3gpp_complete_register mm_gdbus_modem3gpp_complete_scan mm_gdbus_modem3gpp_complete_set_eps_ue_mode_operation mm_gdbus_modem3gpp_complete_set_initial_eps_bearer_settings mm_gdbus_modem3gpp_complete_disable_facility_lock +mm_gdbus_modem3gpp_complete_set_packet_service_state mm_gdbus_modem3gpp_interface_info mm_gdbus_modem3gpp_override_properties mm_gdbus_modem3gpp_set_enabled_facility_locks diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml index 05e3c655..0b494010 100644 --- a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml +++ b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml @@ -213,6 +213,18 @@ + + + + +