base-bearer: integrate connection status dispatcher scripts

This commit is contained in:
Aleksander Morgado
2022-03-23 16:03:03 +01:00
parent e8612671ef
commit 2dafb32d63

View File

@@ -39,6 +39,7 @@
#include "mm-modem-helpers.h"
#include "mm-error-helpers.h"
#include "mm-bearer-stats.h"
#include "mm-dispatcher-connection.h"
/* We require up to 20s to get a proper IP when using PPP */
#define BEARER_IP_TIMEOUT_DEFAULT 20
@@ -475,6 +476,43 @@ mm_base_bearer_report_speeds (MMBaseBearer *self,
/*****************************************************************************/
static void
dispatcher_connection_run_ready (MMDispatcherConnection *dispatcher,
GAsyncResult *res,
MMBaseBearer *self)
{
g_autoptr(GError) error = NULL;
if (!mm_dispatcher_connection_run_finish (dispatcher, res, &error))
mm_obj_warn (self, "errors detected in dispatcher: %s", error->message);
g_object_unref (self);
}
static void
bearer_run_dispatcher_scripts (MMBaseBearer *self,
gboolean connected)
{
MMDispatcherConnection *dispatcher;
const gchar *interface;
interface = mm_gdbus_bearer_get_interface (MM_GDBUS_BEARER (self));
if (!self->priv->modem || !self->priv->path || !interface)
return;
dispatcher = mm_dispatcher_connection_get ();
mm_dispatcher_connection_run (dispatcher,
g_dbus_object_get_object_path (G_DBUS_OBJECT (self->priv->modem)),
self->priv->path,
interface,
connected,
NULL, /* cancellable */
(GAsyncReadyCallback)dispatcher_connection_run_ready,
g_object_ref (self));
}
/*****************************************************************************/
static void
bearer_reset_interface_status (MMBaseBearer *self)
{
@@ -511,6 +549,9 @@ bearer_update_status (MMBaseBearer *self,
if (self->priv->status == MM_BEARER_STATUS_DISCONNECTED) {
g_autoptr(GString) report = NULL;
/* Report disconnection via dispatcher scripts, before reseting the interface */
bearer_run_dispatcher_scripts (self, FALSE);
bearer_reset_interface_status (self);
/* Cleanup flag to ignore disconnection reports */
self->priv->ignore_disconnection_reports = FALSE;
@@ -575,6 +616,9 @@ bearer_update_status_connected (MMBaseBearer *self,
/* Start connection monitor, if supported */
connection_monitor_start (self);
/* Run dispatcher scripts */
bearer_run_dispatcher_scripts (self, TRUE);
}
/*****************************************************************************/