mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
devices/wifi: Track IWD devices, match to NMDeviceIwd objects
Add the NMIwdManager singleton to be responsible for matching NMDeviceIwd objects created from platform devices, to IWD Device dbus objects when they appear/disappear.
This commit is contained in:
Andrew Zaborowski
Thomas Haller
parent
ec1db966f7
commit
a25d99f54b
|
|
@ -2706,7 +2706,9 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
|
|||
if WITH_IWD
|
||||
src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES += \
|
||||
src/devices/wifi/nm-device-iwd.c \
|
||||
src/devices/wifi/nm-device-iwd.h
|
||||
src/devices/wifi/nm-device-iwd.h \
|
||||
src/devices/wifi/nm-iwd-manager.c \
|
||||
src/devices/wifi/nm-iwd-manager.h
|
||||
endif
|
||||
|
||||
src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
|
||||
|
|
|
|||
|
|
@ -1610,6 +1610,47 @@ properties_changed (GDBusProxy *proxy, GVariant *changed_properties,
|
|||
g_variant_iter_free (iter);
|
||||
}
|
||||
|
||||
void
|
||||
nm_device_iwd_set_dbus_object (NMDeviceIwd *self, GDBusObject *object)
|
||||
{
|
||||
NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self);
|
||||
GDBusInterface *interface;
|
||||
|
||||
if (!nm_g_object_ref_set ((GObject **) &priv->dbus_obj, (GObject *) object))
|
||||
return;
|
||||
|
||||
if (priv->dbus_proxy) {
|
||||
g_signal_handlers_disconnect_by_func (priv->dbus_proxy,
|
||||
properties_changed, self);
|
||||
|
||||
g_clear_object (&priv->dbus_proxy);
|
||||
}
|
||||
|
||||
if (priv->enabled)
|
||||
nm_device_queue_recheck_available (NM_DEVICE (self),
|
||||
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE,
|
||||
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED);
|
||||
|
||||
if (!object) {
|
||||
priv->can_scan = FALSE;
|
||||
|
||||
cleanup_association_attempt (self, FALSE);
|
||||
return;
|
||||
}
|
||||
|
||||
interface = g_dbus_object_get_interface (object, NM_IWD_DEVICE_INTERFACE);
|
||||
priv->dbus_proxy = G_DBUS_PROXY (interface);
|
||||
|
||||
g_signal_connect (priv->dbus_proxy, "g-properties-changed",
|
||||
G_CALLBACK (properties_changed), self);
|
||||
|
||||
/* Call Disconnect to make sure IWD's autoconnect is disabled. We've
|
||||
* most likely just brought the device UP so it would be in
|
||||
* autoconnect by default.
|
||||
*/
|
||||
send_disconnect (self);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -53,4 +53,6 @@ GType nm_device_iwd_get_type (void);
|
|||
|
||||
NMDevice *nm_device_iwd_new (const char *iface, NMDeviceWifiCapabilities capabilities);
|
||||
|
||||
void nm_device_iwd_set_dbus_object (NMDeviceIwd *device, GDBusObject *object);
|
||||
|
||||
#endif /* __NETWORKMANAGER_DEVICE_IWD_H__ */
|
||||
|
|
|
|||
348
src/devices/wifi/nm-iwd-manager.c
Normal file
348
src/devices/wifi/nm-iwd-manager.c
Normal file
|
|
@ -0,0 +1,348 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/* NetworkManager -- Network link manager
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright (C) 2017 Intel Corporation
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include "nm-iwd-manager.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <net/if.h>
|
||||
|
||||
#include "nm-logging.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-device-iwd.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
typedef struct {
|
||||
GCancellable *cancellable;
|
||||
gboolean running;
|
||||
GDBusObjectManager *object_manager;
|
||||
} NMIwdManagerPrivate;
|
||||
|
||||
struct _NMIwdManager {
|
||||
GObject parent;
|
||||
NMIwdManagerPrivate _priv;
|
||||
};
|
||||
|
||||
struct _NMIwdManagerClass {
|
||||
GObjectClass parent;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (NMIwdManager, nm_iwd_manager, G_TYPE_OBJECT)
|
||||
|
||||
#define NM_IWD_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMIwdManager, NM_IS_IWD_MANAGER)
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define _NMLOG_PREFIX_NAME "iwd-manager"
|
||||
#define _NMLOG_DOMAIN LOGD_WIFI
|
||||
|
||||
#define _NMLOG(level, ...) \
|
||||
G_STMT_START { \
|
||||
if (nm_logging_enabled (level, _NMLOG_DOMAIN)) { \
|
||||
char __prefix[32]; \
|
||||
\
|
||||
if (self) \
|
||||
g_snprintf (__prefix, sizeof (__prefix), "%s[%p]", ""_NMLOG_PREFIX_NAME"", (self)); \
|
||||
else \
|
||||
g_strlcpy (__prefix, _NMLOG_PREFIX_NAME, sizeof (__prefix)); \
|
||||
_nm_log ((level), (_NMLOG_DOMAIN), 0, NULL, NULL, \
|
||||
"%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
|
||||
__prefix _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
|
||||
} \
|
||||
} G_STMT_END
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static void
|
||||
set_device_dbus_object (NMIwdManager *self, GDBusInterface *interface,
|
||||
GDBusObject *object)
|
||||
{
|
||||
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
|
||||
GDBusProxy *proxy;
|
||||
GVariant *value;
|
||||
const char *ifname;
|
||||
gint ifindex;
|
||||
NMDevice *device;
|
||||
NMManager *manager;
|
||||
|
||||
if (!priv->running)
|
||||
return;
|
||||
|
||||
g_return_if_fail (G_IS_DBUS_PROXY (interface));
|
||||
|
||||
proxy = G_DBUS_PROXY (interface);
|
||||
|
||||
if (strcmp (g_dbus_proxy_get_interface_name (proxy),
|
||||
NM_IWD_DEVICE_INTERFACE))
|
||||
return;
|
||||
|
||||
value = g_dbus_proxy_get_cached_property (proxy, "Name");
|
||||
if (!value) {
|
||||
_LOGE ("Name not cached for Device at %s",
|
||||
g_dbus_proxy_get_object_path (proxy));
|
||||
return;
|
||||
}
|
||||
|
||||
ifname = g_variant_get_string (value, NULL);
|
||||
ifindex = if_nametoindex (ifname);
|
||||
g_variant_unref (value);
|
||||
|
||||
if (!ifindex) {
|
||||
_LOGE ("if_nametoindex failed for Name %s for Device at %s: %i",
|
||||
ifname, g_dbus_proxy_get_object_path (proxy), errno);
|
||||
return;
|
||||
}
|
||||
|
||||
manager = nm_manager_get ();
|
||||
|
||||
device = nm_manager_get_device_by_ifindex (manager, ifindex);
|
||||
if (!NM_IS_DEVICE_IWD (device)) {
|
||||
_LOGE ("IWD device named %s is not a Wifi device", ifname);
|
||||
return;
|
||||
}
|
||||
|
||||
nm_device_iwd_set_dbus_object (NM_DEVICE_IWD (device), object);
|
||||
}
|
||||
|
||||
static void
|
||||
interface_added (GDBusObjectManager *object_manager, GDBusObject *object,
|
||||
GDBusInterface *interface, gpointer user_data)
|
||||
{
|
||||
NMIwdManager *self = user_data;
|
||||
|
||||
set_device_dbus_object (self, interface, object);
|
||||
}
|
||||
|
||||
static void
|
||||
interface_removed (GDBusObjectManager *object_manager, GDBusObject *object,
|
||||
GDBusInterface *interface, gpointer user_data)
|
||||
{
|
||||
NMIwdManager *self = user_data;
|
||||
|
||||
/*
|
||||
* TODO: we may need to save the GDBusInterface or GDBusObject
|
||||
* pointer in the hash table because we may be no longer able to
|
||||
* access the Name property or map the name to ifindex with
|
||||
* if_nametoindex at this point.
|
||||
*/
|
||||
|
||||
set_device_dbus_object (self, interface, NULL);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
_om_has_name_owner (GDBusObjectManager *object_manager)
|
||||
{
|
||||
gs_free char *name_owner = NULL;
|
||||
|
||||
nm_assert (G_IS_DBUS_OBJECT_MANAGER_CLIENT (object_manager));
|
||||
|
||||
name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (object_manager));
|
||||
return !!name_owner;
|
||||
}
|
||||
|
||||
static void
|
||||
object_added (NMIwdManager *self, GDBusObject *object)
|
||||
{
|
||||
GList *interfaces, *iter;
|
||||
|
||||
interfaces = g_dbus_object_get_interfaces (object);
|
||||
for (iter = interfaces; iter; iter = iter->next) {
|
||||
GDBusInterface *interface = G_DBUS_INTERFACE (iter->data);
|
||||
|
||||
set_device_dbus_object (self, interface, object);
|
||||
}
|
||||
|
||||
g_list_free_full (interfaces, g_object_unref);
|
||||
}
|
||||
|
||||
static void
|
||||
name_owner_changed (GObject *object, GParamSpec *pspec, gpointer user_data)
|
||||
{
|
||||
NMIwdManager *self = user_data;
|
||||
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
|
||||
GDBusObjectManager *object_manager = G_DBUS_OBJECT_MANAGER (object);
|
||||
|
||||
nm_assert (object_manager == priv->object_manager);
|
||||
|
||||
if (_om_has_name_owner (object_manager)) {
|
||||
GList *objects, *iter;
|
||||
|
||||
priv->running = true;
|
||||
|
||||
objects = g_dbus_object_manager_get_objects (object_manager);
|
||||
for (iter = objects; iter; iter = iter->next)
|
||||
object_added (self, G_DBUS_OBJECT (iter->data));
|
||||
|
||||
g_list_free_full (objects, g_object_unref);
|
||||
} else {
|
||||
NMManager *manager = nm_manager_get ();
|
||||
const GSList *devices, *iter;
|
||||
|
||||
priv->running = false;
|
||||
|
||||
devices = nm_manager_get_devices (manager);
|
||||
for (iter = devices; iter; iter = iter->next) {
|
||||
NMDevice *device = NM_DEVICE (iter->data);
|
||||
|
||||
if (!NM_IS_DEVICE_IWD (device))
|
||||
continue;
|
||||
|
||||
nm_device_iwd_set_dbus_object (NM_DEVICE_IWD (device),
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
device_added (NMDevice *device, gpointer user_data)
|
||||
{
|
||||
NMIwdManager *self = user_data;
|
||||
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
|
||||
GList *objects, *iter;
|
||||
|
||||
if (!NM_IS_DEVICE_IWD (device))
|
||||
return;
|
||||
|
||||
if (!priv->running)
|
||||
return;
|
||||
|
||||
objects = g_dbus_object_manager_get_objects (priv->object_manager);
|
||||
for (iter = objects; iter; iter = iter->next) {
|
||||
GDBusObject *object = G_DBUS_OBJECT (iter->data);
|
||||
GDBusInterface *interface;
|
||||
GDBusProxy *proxy;
|
||||
GVariant *value;
|
||||
const char *obj_ifname;
|
||||
|
||||
interface = g_dbus_object_get_interface (object,
|
||||
NM_IWD_DEVICE_INTERFACE);
|
||||
if (!interface)
|
||||
continue;
|
||||
|
||||
proxy = G_DBUS_PROXY (interface);
|
||||
value = g_dbus_proxy_get_cached_property (proxy, "Name");
|
||||
if (!value) {
|
||||
g_object_unref (interface);
|
||||
continue;
|
||||
}
|
||||
|
||||
obj_ifname = g_variant_get_string (value, NULL);
|
||||
g_variant_unref (value);
|
||||
g_object_unref (interface);
|
||||
|
||||
if (strcmp (nm_device_get_iface (device), obj_ifname))
|
||||
continue;
|
||||
|
||||
nm_device_iwd_set_dbus_object (NM_DEVICE_IWD (device), object);
|
||||
break;
|
||||
}
|
||||
|
||||
g_list_free_full (objects, g_object_unref);
|
||||
}
|
||||
|
||||
static void
|
||||
got_object_manager (GObject *object, GAsyncResult *result, gpointer user_data)
|
||||
{
|
||||
NMIwdManager *self = user_data;
|
||||
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
|
||||
GError *error = NULL;
|
||||
GDBusObjectManager *object_manager;
|
||||
GDBusConnection *connection;
|
||||
NMManager *manager = nm_manager_get ();
|
||||
|
||||
g_clear_object (&priv->cancellable);
|
||||
|
||||
object_manager = g_dbus_object_manager_client_new_for_bus_finish (result, &error);
|
||||
if (object_manager == NULL) {
|
||||
_LOGE ("failed to acquire IWD Object Manager: Wi-Fi will not be available (%s)",
|
||||
NM_G_ERROR_MSG (error));
|
||||
g_clear_error (&error);
|
||||
return;
|
||||
}
|
||||
|
||||
priv->object_manager = object_manager;
|
||||
|
||||
g_signal_connect (priv->object_manager, "interface-added",
|
||||
G_CALLBACK (interface_added), self);
|
||||
g_signal_connect (priv->object_manager, "interface-removed",
|
||||
G_CALLBACK (interface_removed), self);
|
||||
g_signal_connect (priv->object_manager, "notify::name-owner",
|
||||
G_CALLBACK (name_owner_changed), self);
|
||||
|
||||
nm_assert (G_IS_DBUS_OBJECT_MANAGER_CLIENT (object_manager));
|
||||
|
||||
connection = g_dbus_object_manager_client_get_connection (G_DBUS_OBJECT_MANAGER_CLIENT (object_manager));
|
||||
|
||||
name_owner_changed (G_OBJECT (object_manager), NULL, self);
|
||||
|
||||
g_signal_connect (manager, "device-added",
|
||||
G_CALLBACK (device_added), self);
|
||||
}
|
||||
|
||||
static void
|
||||
prepare_object_manager (NMIwdManager *self)
|
||||
{
|
||||
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
|
||||
|
||||
g_dbus_object_manager_client_new_for_bus (NM_IWD_BUS_TYPE,
|
||||
G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START,
|
||||
NM_IWD_SERVICE, "/",
|
||||
NULL, NULL, NULL,
|
||||
priv->cancellable,
|
||||
got_object_manager, self);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
NM_DEFINE_SINGLETON_GETTER (NMIwdManager, nm_iwd_manager_get,
|
||||
NM_TYPE_IWD_MANAGER);
|
||||
|
||||
static void
|
||||
nm_iwd_manager_init (NMIwdManager *self)
|
||||
{
|
||||
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
|
||||
|
||||
priv->cancellable = g_cancellable_new ();
|
||||
prepare_object_manager (self);
|
||||
}
|
||||
|
||||
static void
|
||||
dispose (GObject *object)
|
||||
{
|
||||
NMIwdManager *self = (NMIwdManager *) object;
|
||||
NMIwdManagerPrivate *priv = NM_IWD_MANAGER_GET_PRIVATE (self);
|
||||
|
||||
if (priv->object_manager)
|
||||
g_clear_object (&priv->object_manager);
|
||||
|
||||
nm_clear_g_cancellable (&priv->cancellable);
|
||||
|
||||
G_OBJECT_CLASS (nm_iwd_manager_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
static void
|
||||
nm_iwd_manager_class_init (NMIwdManagerClass *klass)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
|
||||
object_class->dispose = dispose;
|
||||
}
|
||||
53
src/devices/wifi/nm-iwd-manager.h
Normal file
53
src/devices/wifi/nm-iwd-manager.h
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/* NetworkManager -- Network link manager
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright (C) 2017 Intel Corporation
|
||||
*/
|
||||
|
||||
#ifndef __NETWORKMANAGER_IWD_MANAGER_H__
|
||||
#define __NETWORKMANAGER_IWD_MANAGER_H__
|
||||
|
||||
#include "devices/nm-device.h"
|
||||
|
||||
#define NM_IWD_BUS_TYPE G_BUS_TYPE_SYSTEM
|
||||
#define NM_IWD_SERVICE "net.connman.iwd"
|
||||
|
||||
#define NM_IWD_AGENT_MANAGER_INTERFACE "net.connman.iwd.AgentManager"
|
||||
#define NM_IWD_WIPHY_INTERFACE "net.connman.iwd.Adapter"
|
||||
#define NM_IWD_DEVICE_INTERFACE "net.connman.iwd.Device"
|
||||
#define NM_IWD_NETWORK_INTERFACE "net.connman.iwd.Network"
|
||||
#define NM_IWD_AGENT_INTERFACE "net.connman.iwd.Agent"
|
||||
#define NM_IWD_WSC_INTERFACE \
|
||||
"net.connman.iwd.WiFiSimpleConfiguration"
|
||||
#define NM_IWD_KNOWN_NETWORKS_INTERFACE "net.connman.iwd.KnownNetworks"
|
||||
#define NM_IWD_SIGNAL_AGENT_INTERFACE "net.connman.iwd.SignalLevelAgent"
|
||||
|
||||
#define NM_TYPE_IWD_MANAGER (nm_iwd_manager_get_type ())
|
||||
#define NM_IWD_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IWD_MANAGER, NMIwdManager))
|
||||
#define NM_IWD_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IWD_MANAGER, NMIwdManagerClass))
|
||||
#define NM_IS_IWD_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IWD_MANAGER))
|
||||
#define NM_IS_IWD_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IWD_MANAGER))
|
||||
#define NM_IWD_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IWD_MANAGER, NMIwdManagerClass))
|
||||
|
||||
typedef struct _NMIwdManager NMIwdManager;
|
||||
typedef struct _NMIwdManagerClass NMIwdManagerClass;
|
||||
|
||||
GType nm_iwd_manager_get_type (void);
|
||||
|
||||
NMIwdManager *nm_iwd_manager_get (void);
|
||||
|
||||
#endif /* __NETWORKMANAGER_IWD_MANAGER_H__ */
|
||||
Loading…
Reference in a new issue