luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 10:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'network-monitor-again' into 'master'

Browse Source 
Network monitor again

See merge request GNOME/glib!265
This commit is contained in:
Matthias Clasen
2018-08-27 15:32:51 +00:00
parent d79d1d9dfe d047ca341b
commit 917dee45b2
3 changed files with 424 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/Makefile.am
View File

@@ -993,6 +993,14 @@ gio_LDADD = libgio-2.0.la \
$(top_builddir)/glib/libglib-2.0.la \
$(NULL)
bin_PROGRAMS += gnet
gnet_SOURCES = \
gnet-tool.c
gnet_LDADD = libgio-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/glib/libglib-2.0.la \
$(NULL)
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \
for f in $$files; do \

77
gio/gnet-tool.c Normal file
View File

@@ -0,0 +1,77 @@
/*
* Copyright 2015 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Matthias Clasen <mclasen@redhat.com>
*/
#include "config.h"
#include <gio/gio.h>
#include <gi18n.h>
#include <locale.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
static void
network_changed (GNetworkMonitor *nm,
gboolean available,
gpointer data)
{
g_print ("::network-changed available: %d\n", available);
}
static void
notify (GObject *object,
GParamSpec *pspec,
gpointer data)
{
GNetworkMonitor *nm = G_NETWORK_MONITOR (object);
g_print ("notify::");
if (strcmp (pspec->name, "network-available") == 0)
g_print ("network-available: %d\n", g_network_monitor_get_network_available (nm));
else if (strcmp (pspec->name, "network-metered") == 0)
g_print ("network-metered: %d\n", g_network_monitor_get_network_metered (nm));
else if (strcmp (pspec->name, "connectivity") == 0)
g_print ("connectivity: %d\n", g_network_monitor_get_connectivity (nm));
}
int
main (int argc, char **argv)
{
GNetworkMonitor *nm;
setlocale (LC_ALL, "");
textdomain (GETTEXT_PACKAGE);
bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
nm = g_network_monitor_get_default ();
g_print ("Using %s\n", g_type_name_from_instance (nm));
g_signal_connect (nm, "network-changed", G_CALLBACK (network_changed), NULL);
g_signal_connect (nm, "notify", G_CALLBACK (notify), NULL);
while (TRUE)
g_main_context_iteration (NULL, TRUE);
return 1;
}

320
gio/gnetworkmonitorportal.c
View File

@@ -40,7 +40,6 @@ struct _GNetworkMonitorPortalPrivate
{
GDBusProxy *proxy;
gboolean has_network;
int version;
gboolean available;
gboolean metered;
@@ -93,6 +92,20 @@ g_network_monitor_portal_get_property (GObject *object,
}
}
static gboolean
is_valid_connectivity (guint32 value)
{
GEnumValue *enum_value;
GEnumClass *enum_klass;
enum_klass = g_type_class_ref (G_TYPE_NETWORK_CONNECTIVITY);
enum_value = g_enum_get_value (enum_klass, value);
g_type_class_unref (enum_klass);
return enum_value != NULL;
}
static void
got_available (GObject *source,
GAsyncResult *res,
@@ -106,14 +119,32 @@ got_available (GObject *source,
ret = g_dbus_proxy_call_finish (proxy, res, &error);
if (ret == NULL)
{
if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD))
{
g_warning ("%s", error->message);
g_clear_error (&error);
return;
}
g_clear_error (&error);
/* Fall back to version 1 */
ret = g_dbus_proxy_get_cached_property (nm->priv->proxy, "available");
if (ret == NULL)
{
g_warning ("Failed to get the '%s' property", "available");
return;
}
available = g_variant_get_boolean (ret);
g_variant_unref (ret);
}
else
{
g_variant_get (ret, "(b)", &available);
g_variant_unref (ret);
}
if (nm->priv->available != available)
{
@@ -136,19 +167,38 @@ got_metered (GObject *source,
ret = g_dbus_proxy_call_finish (proxy, res, &error);
if (ret == NULL)
{
if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD))
{
g_warning ("%s", error->message);
g_clear_error (&error);
return;
}
g_clear_error (&error);
/* Fall back to version 1 */
ret = g_dbus_proxy_get_cached_property (nm->priv->proxy, "metered");
if (ret == NULL)
{
g_warning ("Failed to get the '%s' property", "metered");
return;
}
metered = g_variant_get_boolean (ret);
g_variant_unref (ret);
}
else
{
g_variant_get (ret, "(b)", &metered);
g_variant_unref (ret);
}
if (nm->priv->metered != metered)
{
nm->priv->metered = metered;
g_object_notify (G_OBJECT (nm), "network-metered");
g_signal_emit_by_name (nm, "network-changed", nm->priv->available);
}
}
@@ -165,29 +215,118 @@ got_connectivity (GObject *source,
ret = g_dbus_proxy_call_finish (proxy, res, &error);
if (ret == NULL)
{
if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD))
{
g_warning ("%s", error->message);
g_clear_error (&error);
return;
}
g_clear_error (&error);
/* Fall back to version 1 */
ret = g_dbus_proxy_get_cached_property (nm->priv->proxy, "connectivity");
if (ret == NULL)
{
g_warning ("Failed to get the '%s' property", "connectivity");
return;
}
connectivity = g_variant_get_uint32 (ret);
g_variant_unref (ret);
}
else
{
g_variant_get (ret, "(u)", &connectivity);
g_variant_unref (ret);
}
if (nm->priv->connectivity != connectivity)
if (nm->priv->connectivity != connectivity &&
is_valid_connectivity (connectivity))
{
nm->priv->connectivity = connectivity;
g_object_notify (G_OBJECT (nm), "connectivity");
g_signal_emit_by_name (nm, "network-changed", nm->priv->available);
}
}
static void
got_status (GObject *source,
GAsyncResult *res,
gpointer data)
{
GDBusProxy *proxy = G_DBUS_PROXY (source);
GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (data);
GError *error = NULL;
GVariant *ret;
gboolean should_emit_changed = FALSE;
GVariant *status;
gboolean available;
gboolean metered;
GNetworkConnectivity connectivity;
ret = g_dbus_proxy_call_finish (proxy, res, &error);
if (ret == NULL)
{
if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD))
{
/* Fall back to version 2 */
g_dbus_proxy_call (proxy, "GetConnectivity", NULL, 0, -1, NULL, got_connectivity, nm);
g_dbus_proxy_call (proxy, "GetMetered", NULL, 0, -1, NULL, got_metered, nm);
g_dbus_proxy_call (proxy, "GetAvailable", NULL, 0, -1, NULL, got_available, nm);
}
else
g_warning ("%s", error->message);
g_clear_error (&error);
return;
}
g_variant_get (ret, "(@a{sv})", &status);
g_variant_unref (ret);
g_variant_lookup (status, "available", "b", &available);
g_variant_lookup (status, "metered", "b", &metered);
g_variant_lookup (status, "connectivity", "u", &connectivity);
g_variant_unref (status);
g_object_freeze_notify (G_OBJECT (nm));
if (nm->priv->available != available)
{
nm->priv->available = available;
g_object_notify (G_OBJECT (nm), "network-available");
should_emit_changed = TRUE;
}
if (nm->priv->metered != metered)
{
nm->priv->metered = metered;
g_object_notify (G_OBJECT (nm), "network-metered");
should_emit_changed = TRUE;
}
if (nm->priv->connectivity != connectivity &&
is_valid_connectivity (connectivity))
{
nm->priv->connectivity = connectivity;
g_object_notify (G_OBJECT (nm), "connectivity");
should_emit_changed = TRUE;
}
g_object_thaw_notify (G_OBJECT (nm));
if (should_emit_changed)
g_signal_emit_by_name (nm, "network-changed", available);
}
static void
update_properties (GDBusProxy *proxy,
GNetworkMonitorPortal *nm)
{
g_dbus_proxy_call (proxy, "GetConnectivity", NULL, 0, -1, NULL, got_connectivity, nm);
g_dbus_proxy_call (proxy, "GetMetered", NULL, 0, -1, NULL, got_metered, nm);
g_dbus_proxy_call (proxy, "GetAvailable", NULL, 0, -1, NULL, got_available, nm);
/* Try version 3 first */
g_dbus_proxy_call (proxy, "GetStatus", NULL, 0, -1, NULL, got_status, nm);
}
static void
@@ -200,14 +339,23 @@ proxy_signal (GDBusProxy *proxy,
if (!nm->priv->has_network)
return;
if (nm->priv->version == 1)
if (strcmp (signal, "changed") != 0)
return;
/* Version 1 updates "available" with the "changed" signal */
if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(b)")))
{
gboolean available;
g_variant_get (parameters, "(b)", &available);
if (nm->priv->available != available)
{
nm->priv->available = available;
g_object_notify (G_OBJECT (nm), "available");
}
g_signal_emit_by_name (nm, "network-changed", available);
}
else if (nm->priv->version == 2)
else
{
update_properties (proxy, nm);
}
@@ -219,21 +367,22 @@ proxy_properties_changed (GDBusProxy *proxy,
GVariant *invalidated,
GNetworkMonitorPortal *nm)
{
gboolean should_emit_changed = FALSE;
GVariant *ret;
if (!nm->priv->has_network)
return;
if (nm->priv->version == 1)
{
GVariant *ret;
ret = g_dbus_proxy_get_cached_property (proxy, "connectivity");
if (ret)
{
GNetworkConnectivity connectivity = g_variant_get_uint32 (ret);
if (nm->priv->connectivity != connectivity)
if (nm->priv->connectivity != connectivity &&
is_valid_connectivity (connectivity))
{
nm->priv->connectivity = connectivity;
g_object_notify (G_OBJECT (nm), "connectivity");
should_emit_changed = TRUE;
}
g_variant_unref (ret);
}
@@ -246,6 +395,7 @@ proxy_properties_changed (GDBusProxy *proxy,
{
nm->priv->metered = metered;
g_object_notify (G_OBJECT (nm), "network-metered");
should_emit_changed = TRUE;
}
g_variant_unref (ret);
}
@@ -258,11 +408,13 @@ proxy_properties_changed (GDBusProxy *proxy,
{
nm->priv->available = available;
g_object_notify (G_OBJECT (nm), "network-available");
g_signal_emit_by_name (nm, "network-changed", available);
should_emit_changed = TRUE;
}
g_variant_unref (ret);
}
}
if (should_emit_changed)
g_signal_emit_by_name (nm, "network-changed", nm->priv->available);
}
static gboolean
@@ -273,8 +425,6 @@ g_network_monitor_portal_initable_init (GInitable *initable,
GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (initable);
GDBusProxy *proxy;
gchar *name_owner = NULL;
int version;
GVariant *ret;
nm->priv->available = FALSE;
nm->priv->metered = FALSE;
@@ -288,7 +438,7 @@ g_network_monitor_portal_initable_init (GInitable *initable,
proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START
| G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
| G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
"org.freedesktop.portal.Desktop",
"/org/freedesktop/portal/desktop",
@@ -312,31 +462,16 @@ g_network_monitor_portal_initable_init (GInitable *initable,
g_free (name_owner);
ret = g_dbus_proxy_get_cached_property (proxy, "version");
g_variant_get (ret, "u", &version);
g_variant_unref (ret);
if (version != 1 && version != 2)
{
g_object_unref (proxy);
g_set_error (error,
G_DBUS_ERROR,
G_DBUS_ERROR_NAME_HAS_NO_OWNER,
"NetworkMonitor portal unsupported version: %d", version);
return FALSE;
}
g_signal_connect (proxy, "g-signal", G_CALLBACK (proxy_signal), nm);
g_signal_connect (proxy, "g-properties-changed", G_CALLBACK (proxy_properties_changed), nm);
nm->priv->proxy = proxy;
nm->priv->has_network = glib_network_available_in_sandbox ();
nm->priv->version = version;
if (!initable_parent_iface->init (initable, cancellable, error))
return FALSE;
if (nm->priv->has_network && nm->priv->version == 2)
if (nm->priv->has_network)
update_properties (proxy, nm);
return TRUE;
@@ -365,9 +500,128 @@ g_network_monitor_portal_class_init (GNetworkMonitorPortalClass *class)
g_object_class_override_property (gobject_class, PROP_CONNECTIVITY, "connectivity");
}
static gboolean
g_network_monitor_portal_can_reach (GNetworkMonitor *monitor,
GSocketConnectable *connectable,
GCancellable *cancellable,
GError **error)
{
GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (monitor);
GVariant *ret;
GNetworkAddress *address;
gboolean reachable = FALSE;
if (!G_IS_NETWORK_ADDRESS (connectable))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"Can't handle this kind of GSocketConnectable (%s)",
G_OBJECT_TYPE_NAME (connectable));
return FALSE;
}
address = G_NETWORK_ADDRESS (connectable);
ret = g_dbus_proxy_call_sync (nm->priv->proxy,
"CanReach",
g_variant_new ("(su)",
g_network_address_get_hostname (address),
g_network_address_get_port (address)),
G_DBUS_CALL_FLAGS_NONE,
-1,
cancellable,
error);
if (ret)
{
g_variant_get (ret, "(b)", &reachable);
g_variant_unref (ret);
}
return reachable;
}
static void
can_reach_done (GObject *source,
GAsyncResult *result,
gpointer data)
{
GTask *task = data;
GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (g_task_get_source_object (task));
GError *error = NULL;
GVariant *ret;
gboolean reachable;
ret = g_dbus_proxy_call_finish (nm->priv->proxy, result, &error);
if (ret == NULL)
{
g_task_return_error (task, error);
g_object_unref (task);
return;
}
g_variant_get (ret, "(b)", &reachable);
g_variant_unref (ret);
if (reachable)
g_task_return_boolean (task, TRUE);
else
g_task_return_new_error (task,
G_IO_ERROR, G_IO_ERROR_HOST_UNREACHABLE,
"Can't reach host");
g_object_unref (task);
}
static void
g_network_monitor_portal_can_reach_async (GNetworkMonitor *monitor,
GSocketConnectable *connectable,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data)
{
GNetworkMonitorPortal *nm = G_NETWORK_MONITOR_PORTAL (monitor);
GTask *task;
GNetworkAddress *address;
task = g_task_new (monitor, cancellable, callback, data);
if (!G_IS_NETWORK_ADDRESS (connectable))
{
g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"Can't handle this kind of GSocketConnectable (%s)",
G_OBJECT_TYPE_NAME (connectable));
g_object_unref (task);
return;
}
address = G_NETWORK_ADDRESS (connectable);
g_dbus_proxy_call (nm->priv->proxy,
"CanReach",
g_variant_new ("(su)",
g_network_address_get_hostname (address),
g_network_address_get_port (address)),
G_DBUS_CALL_FLAGS_NONE,
-1,
cancellable,
can_reach_done,
task);
}
static gboolean
g_network_monitor_portal_can_reach_finish (GNetworkMonitor *monitor,
GAsyncResult *result,
GError **error)
{
return g_task_propagate_boolean (G_TASK (result), error);
}
static void
g_network_monitor_portal_iface_init (GNetworkMonitorInterface *monitor_iface)
{
monitor_iface->can_reach = g_network_monitor_portal_can_reach;
monitor_iface->can_reach_async = g_network_monitor_portal_can_reach_async;
monitor_iface->can_reach_finish = g_network_monitor_portal_can_reach_finish;
}
static void