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

iface-modem-3gpp: improve logging of user request to register in network

Browse Source
This commit is contained in:
Aleksander Morgado
2022-09-12 13:39:13 +00:00
parent c0f8d21188
commit 11d881c0a4
1 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/mm-iface-modem-3gpp.c
View File

@@ -705,10 +705,10 @@ mm_iface_modem_3gpp_reregister_in_network (MMIfaceModem3gpp *self,
/*****************************************************************************/ /*****************************************************************************/
typedef struct { typedef struct {
MmGdbusModem3gpp *skeleton; MmGdbusModem3gpp *skeleton;
GDBusMethodInvocation *invocation; GDBusMethodInvocation *invocation;
MMIfaceModem3gpp *self; MMIfaceModem3gpp *self;
gchar *operator_id; gchar *operator_id;
} HandleRegisterContext; } HandleRegisterContext;
static void static void
@@ -718,31 +718,40 @@ handle_register_context_free (HandleRegisterContext *ctx)
g_object_unref (ctx->invocation); g_object_unref (ctx->invocation);
g_object_unref (ctx->self); g_object_unref (ctx->self);
g_free (ctx->operator_id); g_free (ctx->operator_id);
g_free (ctx); g_slice_free (HandleRegisterContext, ctx);
} }
static void static void
handle_register_ready (MMIfaceModem3gpp *self, handle_register_ready (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
HandleRegisterContext *ctx) HandleRegisterContext *ctx)
{ {
GError *error = NULL; GError *error = NULL;
if (!mm_iface_modem_3gpp_register_in_network_finish (self, res, &error)) if (!mm_iface_modem_3gpp_register_in_network_finish (self, res, &error)) {
if (ctx->operator_id && ctx->operator_id[0])
mm_obj_warn (self, "failed registering modem in '%s': %s", ctx->operator_id, error->message);
else
mm_obj_warn (self, "failed registering modem: %s", error->message);
g_dbus_method_invocation_take_error (ctx->invocation, error); g_dbus_method_invocation_take_error (ctx->invocation, error);
else } else {
if (ctx->operator_id && ctx->operator_id[0])
mm_obj_info (self, "modem registered in '%s'", ctx->operator_id);
else
mm_obj_info (self, "modem registered");
mm_gdbus_modem3gpp_complete_register (ctx->skeleton, ctx->invocation); mm_gdbus_modem3gpp_complete_register (ctx->skeleton, ctx->invocation);
}
handle_register_context_free (ctx); handle_register_context_free (ctx);
} }
static void static void
handle_register_auth_ready (MMBaseModem *self, handle_register_auth_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
HandleRegisterContext *ctx) HandleRegisterContext *ctx)
{ {
MMModemState modem_state; MMModemState modem_state = MM_MODEM_STATE_UNKNOWN;
GError *error = NULL; GError *error = NULL;
if (!mm_base_modem_authorize_finish (self, res, &error)) { if (!mm_base_modem_authorize_finish (self, res, &error)) {
g_dbus_method_invocation_take_error (ctx->invocation, error); g_dbus_method_invocation_take_error (ctx->invocation, error);
@@ -753,7 +762,6 @@ handle_register_auth_ready (MMBaseModem *self,
g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->register_in_network != NULL); g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->register_in_network != NULL);
g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->register_in_network_finish != NULL); g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->register_in_network_finish != NULL);
modem_state = MM_MODEM_STATE_UNKNOWN;
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_STATE, &modem_state, MM_IFACE_MODEM_STATE, &modem_state,
NULL); NULL);
@@ -766,17 +774,18 @@ handle_register_auth_ready (MMBaseModem *self,
case MM_MODEM_STATE_DISABLED: case MM_MODEM_STATE_DISABLED:
case MM_MODEM_STATE_DISABLING: case MM_MODEM_STATE_DISABLING:
case MM_MODEM_STATE_ENABLING: case MM_MODEM_STATE_ENABLING:
g_dbus_method_invocation_return_error (ctx->invocation, g_dbus_method_invocation_return_error (ctx->invocation, MM_CORE_ERROR, MM_CORE_ERROR_WRONG_STATE,
MM_CORE_ERROR, "Device not yet enabled");
MM_CORE_ERROR_WRONG_STATE,
"Cannot register modem: "
"not yet enabled");
handle_register_context_free (ctx); handle_register_context_free (ctx);
return; return;
case MM_MODEM_STATE_ENABLED: case MM_MODEM_STATE_ENABLED:
case MM_MODEM_STATE_SEARCHING: case MM_MODEM_STATE_SEARCHING:
case MM_MODEM_STATE_REGISTERED: case MM_MODEM_STATE_REGISTERED:
if (ctx->operator_id && ctx->operator_id[0])
mm_obj_info (self, "processing user request to register modem in '%s'...", ctx->operator_id);
else
mm_obj_info (self, "processing user request to register modem...");
mm_iface_modem_3gpp_register_in_network (MM_IFACE_MODEM_3GPP (self), mm_iface_modem_3gpp_register_in_network (MM_IFACE_MODEM_3GPP (self),
ctx->operator_id, ctx->operator_id,
FALSE, /* if already registered with same settings, do nothing */ FALSE, /* if already registered with same settings, do nothing */
@@ -788,11 +797,8 @@ handle_register_auth_ready (MMBaseModem *self,
case MM_MODEM_STATE_DISCONNECTING: case MM_MODEM_STATE_DISCONNECTING:
case MM_MODEM_STATE_CONNECTING: case MM_MODEM_STATE_CONNECTING:
case MM_MODEM_STATE_CONNECTED: case MM_MODEM_STATE_CONNECTED:
g_dbus_method_invocation_return_error (ctx->invocation, g_dbus_method_invocation_return_error (ctx->invocation, MM_CORE_ERROR, MM_CORE_ERROR_WRONG_STATE,
MM_CORE_ERROR, "Operation not allowed while modem is connected");
MM_CORE_ERROR_WRONG_STATE,
"Cannot register modem: "
"modem is connected");
handle_register_context_free (ctx); handle_register_context_free (ctx);
return; return;
@@ -802,14 +808,14 @@ handle_register_auth_ready (MMBaseModem *self,
} }
static gboolean static gboolean
handle_register (MmGdbusModem3gpp *skeleton, handle_register (MmGdbusModem3gpp *skeleton,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const gchar *operator_id, const gchar *operator_id,
MMIfaceModem3gpp *self) MMIfaceModem3gpp *self)
{ {
HandleRegisterContext *ctx; HandleRegisterContext *ctx;
ctx = g_new (HandleRegisterContext, 1); ctx = g_slice_new0 (HandleRegisterContext);
ctx->skeleton = g_object_ref (skeleton); ctx->skeleton = g_object_ref (skeleton);
ctx->invocation = g_object_ref (invocation); ctx->invocation = g_object_ref (invocation);
ctx->self = g_object_ref (self); ctx->self = g_object_ref (self);