New upstream version 1.27.90 upstream/1.27.90

1 files changed, 145 insertions, 141 deletions

diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c
index 9883dc4e..ccd56366 100644
--- a/src/devices/nm-device-generic.c
+++ b/src/devices/nm-device-generic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Red Hat, Inc.
  */
@@ -13,222 +13,226 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_TYPE_DESCRIPTION,
-);
+NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_TYPE_DESCRIPTION, );
 
 typedef struct {
-	char *type_description;
+    char *type_description;
 } NMDeviceGenericPrivate;
 
 struct _NMDeviceGeneric {
-	NMDevice parent;
-	NMDeviceGenericPrivate _priv;
+    NMDevice               parent;
+    NMDeviceGenericPrivate _priv;
 };
 
 struct _NMDeviceGenericClass {
-	NMDeviceClass parent;
+    NMDeviceClass parent;
 };
 
-G_DEFINE_TYPE (NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE)
+G_DEFINE_TYPE(NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE)
 
-#define NM_DEVICE_GENERIC_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMDeviceGeneric, NM_IS_DEVICE_GENERIC, NMDevice)
+#define NM_DEVICE_GENERIC_GET_PRIVATE(self) \
+    _NM_GET_PRIVATE(self, NMDeviceGeneric, NM_IS_DEVICE_GENERIC, NMDevice)
 
 /*****************************************************************************/
 
 static NMDeviceCapabilities
-get_generic_capabilities (NMDevice *device)
+get_generic_capabilities(NMDevice *device)
 {
-	int ifindex = nm_device_get_ifindex (device);
+    int ifindex = nm_device_get_ifindex(device);
 
-	if (ifindex > 0 && nm_platform_link_supports_carrier_detect (nm_device_get_platform (device), ifindex))
-		return NM_DEVICE_CAP_CARRIER_DETECT;
-	else
-		return NM_DEVICE_CAP_NONE;
+    if (ifindex > 0
+        && nm_platform_link_supports_carrier_detect(nm_device_get_platform(device), ifindex))
+        return NM_DEVICE_CAP_CARRIER_DETECT;
+    else
+        return NM_DEVICE_CAP_NONE;
 }
 
 static const char *
-get_type_description (NMDevice *device)
+get_type_description(NMDevice *device)
 {
-	if (NM_DEVICE_GENERIC_GET_PRIVATE (device)->type_description)
-		return NM_DEVICE_GENERIC_GET_PRIVATE (device)->type_description;
-	return NM_DEVICE_CLASS (nm_device_generic_parent_class)->get_type_description (device);
+    if (NM_DEVICE_GENERIC_GET_PRIVATE(device)->type_description)
+        return NM_DEVICE_GENERIC_GET_PRIVATE(device)->type_description;
+    return NM_DEVICE_CLASS(nm_device_generic_parent_class)->get_type_description(device);
 }
 
 static void
-realize_start_notify (NMDevice *device, const NMPlatformLink *plink)
+realize_start_notify(NMDevice *device, const NMPlatformLink *plink)
 {
-	NMDeviceGeneric *self = NM_DEVICE_GENERIC (device);
-	NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE (self);
-	int ifindex;
+    NMDeviceGeneric *       self = NM_DEVICE_GENERIC(device);
+    NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE(self);
+    int                     ifindex;
 
-	NM_DEVICE_CLASS (nm_device_generic_parent_class)->realize_start_notify (device, plink);
+    NM_DEVICE_CLASS(nm_device_generic_parent_class)->realize_start_notify(device, plink);
 
-	nm_clear_g_free (&priv->type_description);
-	ifindex = nm_device_get_ip_ifindex (NM_DEVICE (self));
-	if (ifindex > 0)
-		priv->type_description = g_strdup (nm_platform_link_get_type_name (nm_device_get_platform (device), ifindex));
+    nm_clear_g_free(&priv->type_description);
+    ifindex = nm_device_get_ip_ifindex(NM_DEVICE(self));
+    if (ifindex > 0)
+        priv->type_description =
+            g_strdup(nm_platform_link_get_type_name(nm_device_get_platform(device), ifindex));
 }
 
 static gboolean
-check_connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
+check_connection_compatible(NMDevice *device, NMConnection *connection, GError **error)
 {
-	NMSettingConnection *s_con;
+    NMSettingConnection *s_con;
 
-	if (!NM_DEVICE_CLASS (nm_device_generic_parent_class)->check_connection_compatible (device, connection, error))
-		return FALSE;
+    if (!NM_DEVICE_CLASS(nm_device_generic_parent_class)
+             ->check_connection_compatible(device, connection, error))
+        return FALSE;
 
-	s_con = nm_connection_get_setting_connection (connection);
-	if (!nm_setting_connection_get_interface_name (s_con)) {
-		nm_utils_error_set_literal (error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
-		                            "generic profiles need an interface name");
-		return FALSE;
-	}
+    s_con = nm_connection_get_setting_connection(connection);
+    if (!nm_setting_connection_get_interface_name(s_con)) {
+        nm_utils_error_set_literal(error,
+                                   NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
+                                   "generic profiles need an interface name");
+        return FALSE;
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 static void
-update_connection (NMDevice *device, NMConnection *connection)
+update_connection(NMDevice *device, NMConnection *connection)
 {
-	NMSettingConnection *s_con;
+    NMSettingConnection *s_con;
 
-	if (!nm_connection_get_setting_generic (connection))
-		nm_connection_add_setting (connection, nm_setting_generic_new ());
+    if (!nm_connection_get_setting_generic(connection))
+        nm_connection_add_setting(connection, nm_setting_generic_new());
 
-	s_con = nm_connection_get_setting_connection (connection);
-	g_assert (s_con);
-	g_object_set (G_OBJECT (s_con),
-	              NM_SETTING_CONNECTION_INTERFACE_NAME, nm_device_get_iface (device),
-	              NULL);
+    s_con = nm_connection_get_setting_connection(connection);
+    g_assert(s_con);
+    g_object_set(G_OBJECT(s_con),
+                 NM_SETTING_CONNECTION_INTERFACE_NAME,
+                 nm_device_get_iface(device),
+                 NULL);
 }
 
 /*****************************************************************************/
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	NMDeviceGeneric *self = NM_DEVICE_GENERIC (object);
-	NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE (self);
-
-	switch (prop_id) {
-	case PROP_TYPE_DESCRIPTION:
-		g_value_set_string (value, priv->type_description);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMDeviceGeneric *       self = NM_DEVICE_GENERIC(object);
+    NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE(self);
+
+    switch (prop_id) {
+    case PROP_TYPE_DESCRIPTION:
+        g_value_set_string(value, priv->type_description);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 
 static void
-set_property (GObject *object, guint prop_id,
-              const GValue *value, GParamSpec *pspec)
+set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-	NMDeviceGeneric *self = NM_DEVICE_GENERIC (object);
-	NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE (self);
-
-	switch (prop_id) {
-	case PROP_TYPE_DESCRIPTION:
-		priv->type_description = g_value_dup_string (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMDeviceGeneric *       self = NM_DEVICE_GENERIC(object);
+    NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE(self);
+
+    switch (prop_id) {
+    case PROP_TYPE_DESCRIPTION:
+        priv->type_description = g_value_dup_string(value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 
 /*****************************************************************************/
 
 static void
-nm_device_generic_init (NMDeviceGeneric *self)
-{
-}
+nm_device_generic_init(NMDeviceGeneric *self)
+{}
 
 static GObject *
-constructor (GType type,
-             guint n_construct_params,
-             GObjectConstructParam *construct_params)
+constructor(GType type, guint n_construct_params, GObjectConstructParam *construct_params)
 {
-	GObject *object;
+    GObject *object;
 
-	object = G_OBJECT_CLASS (nm_device_generic_parent_class)->constructor (type,
-	                                                                       n_construct_params,
-	                                                                       construct_params);
+    object = G_OBJECT_CLASS(nm_device_generic_parent_class)
+                 ->constructor(type, n_construct_params, construct_params);
 
-	nm_device_set_unmanaged_flags ((NMDevice *) object, NM_UNMANAGED_BY_DEFAULT, TRUE);
+    nm_device_set_unmanaged_flags((NMDevice *) object, NM_UNMANAGED_BY_DEFAULT, TRUE);
 
-	return object;
+    return object;
 }
 
 NMDevice *
-nm_device_generic_new (const NMPlatformLink *plink, gboolean nm_plugin_missing)
+nm_device_generic_new(const NMPlatformLink *plink, gboolean nm_plugin_missing)
 {
-	g_return_val_if_fail (plink != NULL, NULL);
-
-	return (NMDevice *) g_object_new (NM_TYPE_DEVICE_GENERIC,
-	                                  NM_DEVICE_IFACE, plink->name,
-	                                  NM_DEVICE_TYPE_DESC, "Generic",
-	                                  NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_GENERIC,
-	                                  NM_DEVICE_NM_PLUGIN_MISSING, nm_plugin_missing,
-	                                  NULL);
+    g_return_val_if_fail(plink != NULL, NULL);
+
+    return (NMDevice *) g_object_new(NM_TYPE_DEVICE_GENERIC,
+                                     NM_DEVICE_IFACE,
+                                     plink->name,
+                                     NM_DEVICE_TYPE_DESC,
+                                     "Generic",
+                                     NM_DEVICE_DEVICE_TYPE,
+                                     NM_DEVICE_TYPE_GENERIC,
+                                     NM_DEVICE_NM_PLUGIN_MISSING,
+                                     nm_plugin_missing,
+                                     NULL);
 }
 
 static void
-dispose (GObject *object)
+dispose(GObject *object)
 {
-	NMDeviceGeneric *self = NM_DEVICE_GENERIC (object);
-	NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE (self);
+    NMDeviceGeneric *       self = NM_DEVICE_GENERIC(object);
+    NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE(self);
 
-	nm_clear_g_free (&priv->type_description);
+    nm_clear_g_free(&priv->type_description);
 
-	G_OBJECT_CLASS (nm_device_generic_parent_class)->dispose (object);
+    G_OBJECT_CLASS(nm_device_generic_parent_class)->dispose(object);
 }
 
 static const NMDBusInterfaceInfoExtended interface_info_device_generic = {
-	.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT (
-		NM_DBUS_INTERFACE_DEVICE_GENERIC,
-		.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS (
-			&nm_signal_info_property_changed_legacy,
-		),
-		.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS (
-			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("HwAddress",       "s", NM_DEVICE_HW_ADDRESS),
-			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("TypeDescription", "s", NM_DEVICE_GENERIC_TYPE_DESCRIPTION),
-		),
-	),
-	.legacy_property_changed = TRUE,
+    .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
+        NM_DBUS_INTERFACE_DEVICE_GENERIC,
+        .signals    = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_property_changed_legacy, ),
+        .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("HwAddress",
+                                                             "s",
+                                                             NM_DEVICE_HW_ADDRESS),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L(
+                "TypeDescription",
+                "s",
+                NM_DEVICE_GENERIC_TYPE_DESCRIPTION), ), ),
+    .legacy_property_changed = TRUE,
 };
 
 static void
-nm_device_generic_class_init (NMDeviceGenericClass *klass)
+nm_device_generic_class_init(NMDeviceGenericClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass);
-	NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
-
-	object_class->constructor = constructor;
-	object_class->dispose = dispose;
-	object_class->get_property = get_property;
-	object_class->set_property = set_property;
-
-	dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_generic);
-
-	device_class->connection_type_supported = NM_SETTING_GENERIC_SETTING_NAME;
-	device_class->connection_type_check_compatible = NM_SETTING_GENERIC_SETTING_NAME;
-	device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_ANY);
-
-	device_class->realize_start_notify = realize_start_notify;
-	device_class->get_generic_capabilities = get_generic_capabilities;
-	device_class->get_type_description = get_type_description;
-	device_class->check_connection_compatible = check_connection_compatible;
-	device_class->update_connection = update_connection;
-
-	obj_properties[PROP_TYPE_DESCRIPTION] =
-	     g_param_spec_string (NM_DEVICE_GENERIC_TYPE_DESCRIPTION, "", "",
-	                          NULL,
-	                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-	                          G_PARAM_STATIC_STRINGS);
-
-	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+    GObjectClass *     object_class      = G_OBJECT_CLASS(klass);
+    NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS(klass);
+    NMDeviceClass *    device_class      = NM_DEVICE_CLASS(klass);
+
+    object_class->constructor  = constructor;
+    object_class->dispose      = dispose;
+    object_class->get_property = get_property;
+    object_class->set_property = set_property;
+
+    dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS(&interface_info_device_generic);
+
+    device_class->connection_type_supported        = NM_SETTING_GENERIC_SETTING_NAME;
+    device_class->connection_type_check_compatible = NM_SETTING_GENERIC_SETTING_NAME;
+    device_class->link_types                       = NM_DEVICE_DEFINE_LINK_TYPES(NM_LINK_TYPE_ANY);
+
+    device_class->realize_start_notify        = realize_start_notify;
+    device_class->get_generic_capabilities    = get_generic_capabilities;
+    device_class->get_type_description        = get_type_description;
+    device_class->check_connection_compatible = check_connection_compatible;
+    device_class->update_connection           = update_connection;
+
+    obj_properties[PROP_TYPE_DESCRIPTION] =
+        g_param_spec_string(NM_DEVICE_GENERIC_TYPE_DESCRIPTION,
+                            "",
+                            "",
+                            NULL,
+                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+
+    g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 }