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

iface-modem: improve logging of user request to enable/disable modem

Browse Source
This commit is contained in:
Aleksander Morgado
2022-09-12 12:20:40 +00:00
parent 9fe16af157
commit a86fb711b3
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mm-iface-modem.c
View File

@@ -2134,10 +2134,10 @@ mm_iface_modem_update_subsystem_state (MMIfaceModem *self,
/*****************************************************************************/ /*****************************************************************************/
typedef struct { typedef struct {
MmGdbusModem *skeleton; MmGdbusModem *skeleton;
GDBusMethodInvocation *invocation; GDBusMethodInvocation *invocation;
MMIfaceModem *self; MMIfaceModem *self;
gboolean enable; gboolean enable;
} HandleEnableContext; } HandleEnableContext;
static void static void
@@ -2146,26 +2146,32 @@ handle_enable_context_free (HandleEnableContext *ctx)
g_object_unref (ctx->skeleton); g_object_unref (ctx->skeleton);
g_object_unref (ctx->invocation); g_object_unref (ctx->invocation);
g_object_unref (ctx->self); g_object_unref (ctx->self);
g_free (ctx); g_slice_free (HandleEnableContext, ctx);
} }
static void static void
enable_ready (MMBaseModem *self, enable_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
HandleEnableContext *ctx) HandleEnableContext *ctx)
{ {
GError *error = NULL; GError *error = NULL;
if (ctx->enable) { if (ctx->enable) {
if (!mm_base_modem_enable_finish (self, res, &error)) if (!mm_base_modem_enable_finish (self, res, &error)) {
mm_obj_warn (self, "failed enabling modem: %s", error->message);
g_dbus_method_invocation_take_error (ctx->invocation, error); g_dbus_method_invocation_take_error (ctx->invocation, error);
else } else {
mm_obj_info (self, "enabled modem");
mm_gdbus_modem_complete_enable (ctx->skeleton, ctx->invocation); mm_gdbus_modem_complete_enable (ctx->skeleton, ctx->invocation);
}
} else { } else {
if (!mm_base_modem_disable_finish (self, res, &error)) if (!mm_base_modem_disable_finish (self, res, &error)) {
mm_obj_warn (self, "failed disabling modem: %s", error->message);
g_dbus_method_invocation_take_error (ctx->invocation, error); g_dbus_method_invocation_take_error (ctx->invocation, error);
else } else {
mm_obj_info (self, "disabled modem");
mm_gdbus_modem_complete_enable (ctx->skeleton, ctx->invocation); mm_gdbus_modem_complete_enable (ctx->skeleton, ctx->invocation);
}
} }
handle_enable_context_free (ctx); handle_enable_context_free (ctx);
@@ -2189,25 +2195,28 @@ handle_enable_auth_ready (MMBaseModem *self,
return; return;
} }
if (ctx->enable) if (ctx->enable) {
mm_obj_info (self, "processing user request to enable modem...");
mm_base_modem_enable (self, mm_base_modem_enable (self,
(GAsyncReadyCallback)enable_ready, (GAsyncReadyCallback)enable_ready,
ctx); ctx);
else } else {
mm_obj_info (self, "processing user request to disable modem...");
mm_base_modem_disable (self, mm_base_modem_disable (self,
(GAsyncReadyCallback)enable_ready, (GAsyncReadyCallback)enable_ready,
ctx); ctx);
}
} }
static gboolean static gboolean
handle_enable (MmGdbusModem *skeleton, handle_enable (MmGdbusModem *skeleton,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
gboolean enable, gboolean enable,
MMIfaceModem *self) MMIfaceModem *self)
{ {
HandleEnableContext *ctx; HandleEnableContext *ctx;
ctx = g_new (HandleEnableContext, 1); ctx = g_slice_new0 (HandleEnableContext);
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);