Merge branch 'debian/master' into ubuntu/master

1 files changed, 250 insertions, 249 deletions

diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c
index ba9e64ad..bfe3f9be 100644
--- a/libnm-core/nm-setting-tun.c
+++ b/libnm-core/nm-setting-tun.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  */
@@ -24,27 +24,26 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_MODE,
-	PROP_OWNER,
-	PROP_GROUP,
-	PROP_PI,
-	PROP_VNET_HDR,
-	PROP_MULTI_QUEUE,
-);
+NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_MODE,
+                                  PROP_OWNER,
+                                  PROP_GROUP,
+                                  PROP_PI,
+                                  PROP_VNET_HDR,
+                                  PROP_MULTI_QUEUE, );
 
 typedef struct {
-	char *owner;
-	char *group;
-	NMSettingTunMode mode;
-	bool pi:1;
-	bool vnet_hdr:1;
-	bool multi_queue:1;
+    char *           owner;
+    char *           group;
+    NMSettingTunMode mode;
+    bool             pi : 1;
+    bool             vnet_hdr : 1;
+    bool             multi_queue : 1;
 } NMSettingTunPrivate;
 
-G_DEFINE_TYPE (NMSettingTun, nm_setting_tun, NM_TYPE_SETTING)
+G_DEFINE_TYPE(NMSettingTun, nm_setting_tun, NM_TYPE_SETTING)
 
-#define NM_SETTING_TUN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TUN, NMSettingTunPrivate))
+#define NM_SETTING_TUN_GET_PRIVATE(o) \
+    (G_TYPE_INSTANCE_GET_PRIVATE((o), NM_TYPE_SETTING_TUN, NMSettingTunPrivate))
 
 /*****************************************************************************/
 
@@ -57,10 +56,10 @@ G_DEFINE_TYPE (NMSettingTun, nm_setting_tun, NM_TYPE_SETTING)
  * Since: 1.2
  **/
 NMSettingTunMode
-nm_setting_tun_get_mode (NMSettingTun *setting)
+nm_setting_tun_get_mode(NMSettingTun *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_TUN (setting), NM_SETTING_TUN_MODE_TUN);
-	return NM_SETTING_TUN_GET_PRIVATE (setting)->mode;
+    g_return_val_if_fail(NM_IS_SETTING_TUN(setting), NM_SETTING_TUN_MODE_TUN);
+    return NM_SETTING_TUN_GET_PRIVATE(setting)->mode;
 }
 
 /**
@@ -72,10 +71,10 @@ nm_setting_tun_get_mode (NMSettingTun *setting)
  * Since: 1.2
  **/
 const char *
-nm_setting_tun_get_owner (NMSettingTun *setting)
+nm_setting_tun_get_owner(NMSettingTun *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_TUN (setting), NULL);
-	return NM_SETTING_TUN_GET_PRIVATE (setting)->owner;
+    g_return_val_if_fail(NM_IS_SETTING_TUN(setting), NULL);
+    return NM_SETTING_TUN_GET_PRIVATE(setting)->owner;
 }
 
 /**
@@ -87,10 +86,10 @@ nm_setting_tun_get_owner (NMSettingTun *setting)
  * Since: 1.2
  **/
 const char *
-nm_setting_tun_get_group (NMSettingTun *setting)
+nm_setting_tun_get_group(NMSettingTun *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_TUN (setting), NULL);
-	return NM_SETTING_TUN_GET_PRIVATE (setting)->group;
+    g_return_val_if_fail(NM_IS_SETTING_TUN(setting), NULL);
+    return NM_SETTING_TUN_GET_PRIVATE(setting)->group;
 }
 
 /**
@@ -102,10 +101,10 @@ nm_setting_tun_get_group (NMSettingTun *setting)
  * Since: 1.2
  **/
 gboolean
-nm_setting_tun_get_pi (NMSettingTun *setting)
+nm_setting_tun_get_pi(NMSettingTun *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_TUN (setting), FALSE);
-	return NM_SETTING_TUN_GET_PRIVATE (setting)->pi;
+    g_return_val_if_fail(NM_IS_SETTING_TUN(setting), FALSE);
+    return NM_SETTING_TUN_GET_PRIVATE(setting)->pi;
 }
 
 /**
@@ -117,10 +116,10 @@ nm_setting_tun_get_pi (NMSettingTun *setting)
  * Since: 1.2
  **/
 gboolean
-nm_setting_tun_get_vnet_hdr (NMSettingTun *setting)
+nm_setting_tun_get_vnet_hdr(NMSettingTun *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_TUN (setting), FALSE);
-	return NM_SETTING_TUN_GET_PRIVATE (setting)->vnet_hdr;
+    g_return_val_if_fail(NM_IS_SETTING_TUN(setting), FALSE);
+    return NM_SETTING_TUN_GET_PRIVATE(setting)->vnet_hdr;
 }
 
 /**
@@ -132,127 +131,127 @@ nm_setting_tun_get_vnet_hdr (NMSettingTun *setting)
  * Since: 1.2
  **/
 gboolean
-nm_setting_tun_get_multi_queue (NMSettingTun *setting)
+nm_setting_tun_get_multi_queue(NMSettingTun *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_TUN (setting), FALSE);
-	return NM_SETTING_TUN_GET_PRIVATE (setting)->multi_queue;
+    g_return_val_if_fail(NM_IS_SETTING_TUN(setting), FALSE);
+    return NM_SETTING_TUN_GET_PRIVATE(setting)->multi_queue;
 }
 
 static gboolean
-verify (NMSetting *setting, NMConnection *connection, GError **error)
+verify(NMSetting *setting, NMConnection *connection, GError **error)
 {
-	NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
-
-	if (!NM_IN_SET (priv->mode, NM_SETTING_TUN_MODE_TUN,
-	                            NM_SETTING_TUN_MODE_TAP)) {
-		g_set_error (error,
-		             NM_CONNECTION_ERROR,
-		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		             _("'%u': invalid mode"), (unsigned) priv->mode);
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_MODE);
-		return FALSE;
-	}
-
-	if (priv->owner) {
-		if (_nm_utils_ascii_str_to_int64 (priv->owner, 10, 0, G_MAXINT32, -1) == -1) {
-			g_set_error (error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			             _("'%s': invalid user ID"), priv->owner);
-			g_prefix_error (error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_OWNER);
-			return FALSE;
-		}
-	}
-
-	if (priv->group) {
-		if (_nm_utils_ascii_str_to_int64 (priv->group, 10, 0, G_MAXINT32, -1) == -1) {
-			g_set_error (error,
-			             NM_CONNECTION_ERROR,
-			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-			             _("'%s': invalid group ID"), priv->group);
-			g_prefix_error (error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_GROUP);
-			return FALSE;
-		}
-	}
-
-	return TRUE;
+    NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE(setting);
+
+    if (!NM_IN_SET(priv->mode, NM_SETTING_TUN_MODE_TUN, NM_SETTING_TUN_MODE_TAP)) {
+        g_set_error(error,
+                    NM_CONNECTION_ERROR,
+                    NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                    _("'%u': invalid mode"),
+                    (unsigned) priv->mode);
+        g_prefix_error(error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_MODE);
+        return FALSE;
+    }
+
+    if (priv->owner) {
+        if (_nm_utils_ascii_str_to_int64(priv->owner, 10, 0, G_MAXINT32, -1) == -1) {
+            g_set_error(error,
+                        NM_CONNECTION_ERROR,
+                        NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                        _("'%s': invalid user ID"),
+                        priv->owner);
+            g_prefix_error(error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_OWNER);
+            return FALSE;
+        }
+    }
+
+    if (priv->group) {
+        if (_nm_utils_ascii_str_to_int64(priv->group, 10, 0, G_MAXINT32, -1) == -1) {
+            g_set_error(error,
+                        NM_CONNECTION_ERROR,
+                        NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                        _("'%s': invalid group ID"),
+                        priv->group);
+            g_prefix_error(error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_GROUP);
+            return FALSE;
+        }
+    }
+
+    return TRUE;
 }
 
 /*****************************************************************************/
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	NMSettingTun *setting = NM_SETTING_TUN (object);
-	NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
-
-	switch (prop_id) {
-	case PROP_MODE:
-		g_value_set_uint (value, priv->mode);
-		break;
-	case PROP_OWNER:
-		g_value_set_string (value, priv->owner);
-		break;
-	case PROP_GROUP:
-		g_value_set_string (value, priv->group);
-		break;
-	case PROP_PI:
-		g_value_set_boolean (value, priv->pi);
-		break;
-	case PROP_VNET_HDR:
-		g_value_set_boolean (value, priv->vnet_hdr);
-		break;
-	case PROP_MULTI_QUEUE:
-		g_value_set_boolean (value, priv->multi_queue);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMSettingTun *       setting = NM_SETTING_TUN(object);
+    NMSettingTunPrivate *priv    = NM_SETTING_TUN_GET_PRIVATE(setting);
+
+    switch (prop_id) {
+    case PROP_MODE:
+        g_value_set_uint(value, priv->mode);
+        break;
+    case PROP_OWNER:
+        g_value_set_string(value, priv->owner);
+        break;
+    case PROP_GROUP:
+        g_value_set_string(value, priv->group);
+        break;
+    case PROP_PI:
+        g_value_set_boolean(value, priv->pi);
+        break;
+    case PROP_VNET_HDR:
+        g_value_set_boolean(value, priv->vnet_hdr);
+        break;
+    case PROP_MULTI_QUEUE:
+        g_value_set_boolean(value, priv->multi_queue);
+        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)
 {
-	NMSettingTun *setting = NM_SETTING_TUN (object);
-	NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
-
-	switch (prop_id) {
-	case PROP_MODE:
-		priv->mode = g_value_get_uint (value);
-		break;
-	case PROP_OWNER:
-		g_free (priv->owner);
-		priv->owner = g_value_dup_string (value);
-		break;
-	case PROP_GROUP:
-		g_free (priv->group);
-		priv->group = g_value_dup_string (value);
-		break;
-	case PROP_PI:
-		priv->pi = g_value_get_boolean (value);
-		break;
-	case PROP_VNET_HDR:
-		priv->vnet_hdr = g_value_get_boolean (value);
-		break;
-	case PROP_MULTI_QUEUE:
-		priv->multi_queue = g_value_get_boolean (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMSettingTun *       setting = NM_SETTING_TUN(object);
+    NMSettingTunPrivate *priv    = NM_SETTING_TUN_GET_PRIVATE(setting);
+
+    switch (prop_id) {
+    case PROP_MODE:
+        priv->mode = g_value_get_uint(value);
+        break;
+    case PROP_OWNER:
+        g_free(priv->owner);
+        priv->owner = g_value_dup_string(value);
+        break;
+    case PROP_GROUP:
+        g_free(priv->group);
+        priv->group = g_value_dup_string(value);
+        break;
+    case PROP_PI:
+        priv->pi = g_value_get_boolean(value);
+        break;
+    case PROP_VNET_HDR:
+        priv->vnet_hdr = g_value_get_boolean(value);
+        break;
+    case PROP_MULTI_QUEUE:
+        priv->multi_queue = g_value_get_boolean(value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 /*****************************************************************************/
 
 static void
-nm_setting_tun_init (NMSettingTun *self)
+nm_setting_tun_init(NMSettingTun *self)
 {
-	NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (self);
+    NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE(self);
 
-	priv->mode = NM_SETTING_TUN_MODE_TUN;
+    priv->mode = NM_SETTING_TUN_MODE_TUN;
 }
 
 /**
@@ -265,132 +264,134 @@ nm_setting_tun_init (NMSettingTun *self)
  * Since: 1.2
  **/
 NMSetting *
-nm_setting_tun_new (void)
+nm_setting_tun_new(void)
 {
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_TUN, NULL);
+    return (NMSetting *) g_object_new(NM_TYPE_SETTING_TUN, NULL);
 }
 
 static void
-finalize (GObject *object)
+finalize(GObject *object)
 {
-	NMSettingTun *setting = NM_SETTING_TUN (object);
-	NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
+    NMSettingTun *       setting = NM_SETTING_TUN(object);
+    NMSettingTunPrivate *priv    = NM_SETTING_TUN_GET_PRIVATE(setting);
 
-	g_free (priv->owner);
-	g_free (priv->group);
+    g_free(priv->owner);
+    g_free(priv->group);
 
-	G_OBJECT_CLASS (nm_setting_tun_parent_class)->finalize (object);
+    G_OBJECT_CLASS(nm_setting_tun_parent_class)->finalize(object);
 }
 
 static void
-nm_setting_tun_class_init (NMSettingTunClass *klass)
+nm_setting_tun_class_init(NMSettingTunClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (NMSettingTunPrivate));
-
-	object_class->get_property = get_property;
-	object_class->set_property = set_property;
-	object_class->finalize     = finalize;
-
-	setting_class->verify = verify;
-
-	/**
-	 * NMSettingTun:mode:
-	 *
-	 * The operating mode of the virtual device. Allowed values are
-	 * %NM_SETTING_TUN_MODE_TUN to create a layer 3 device and
-	 * %NM_SETTING_TUN_MODE_TAP to create an Ethernet-like layer 2
-	 * one.
-	 *
-	 * Since: 1.2
-	 */
-	obj_properties[PROP_MODE] =
-	    g_param_spec_uint (NM_SETTING_TUN_MODE, "", "",
-	                       0, G_MAXUINT, NM_SETTING_TUN_MODE_TUN,
-	                       G_PARAM_READWRITE |
-	                       NM_SETTING_PARAM_INFERRABLE |
-	                       G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingTun:owner:
-	 *
-	 * The user ID which will own the device. If set to %NULL everyone
-	 * will be able to use the device.
-	 *
-	 * Since: 1.2
-	 */
-	obj_properties[PROP_OWNER] =
-	    g_param_spec_string (NM_SETTING_TUN_OWNER, "", "",
-	                         NULL,
-	                         G_PARAM_READWRITE |
-	                         NM_SETTING_PARAM_INFERRABLE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingTun:group:
-	 *
-	 * The group ID which will own the device. If set to %NULL everyone
-	 * will be able to use the device.
-	 *
-	 * Since: 1.2
-	 */
-	obj_properties[PROP_GROUP] =
-	    g_param_spec_string (NM_SETTING_TUN_GROUP, "", "",
-	                         NULL,
-	                         G_PARAM_READWRITE |
-	                         NM_SETTING_PARAM_INFERRABLE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingTun:pi:
-	 *
-	 * If %TRUE the interface will prepend a 4 byte header describing the
-	 * physical interface to the packets.
-	 *
-	 * Since: 1.2
-	 */
-	obj_properties[PROP_PI] =
-	    g_param_spec_boolean (NM_SETTING_TUN_PI, "", "",
-	                          FALSE,
-	                          G_PARAM_READWRITE |
-	                          NM_SETTING_PARAM_INFERRABLE |
-	                          G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingTun:vnet-hdr:
-	 *
-	 * If %TRUE the IFF_VNET_HDR the tunnel packets will include a virtio
-	 * network header.
-	 *
-	 * Since: 1.2
-	 */
-	obj_properties[PROP_VNET_HDR] =
-	    g_param_spec_boolean (NM_SETTING_TUN_VNET_HDR, "", "",
-	                          FALSE,
-	                          G_PARAM_READWRITE |
-	                          NM_SETTING_PARAM_INFERRABLE |
-	                          G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingTun:multi-queue:
-	 *
-	 * If the property is set to %TRUE, the interface will support
-	 * multiple file descriptors (queues) to parallelize packet
-	 * sending or receiving. Otherwise, the interface will only
-	 * support a single queue.
-	 *
-	 * Since: 1.2
-	 */
-	obj_properties[PROP_MULTI_QUEUE] =
-	    g_param_spec_boolean (NM_SETTING_TUN_MULTI_QUEUE, "", "",
-	                          FALSE,
-	                          G_PARAM_READWRITE |
-	                          NM_SETTING_PARAM_INFERRABLE |
-	                          G_PARAM_STATIC_STRINGS);
-
-	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
-
-	_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_TUN);
+    GObjectClass *  object_class  = G_OBJECT_CLASS(klass);
+    NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+
+    g_type_class_add_private(klass, sizeof(NMSettingTunPrivate));
+
+    object_class->get_property = get_property;
+    object_class->set_property = set_property;
+    object_class->finalize     = finalize;
+
+    setting_class->verify = verify;
+
+    /**
+     * NMSettingTun:mode:
+     *
+     * The operating mode of the virtual device. Allowed values are
+     * %NM_SETTING_TUN_MODE_TUN to create a layer 3 device and
+     * %NM_SETTING_TUN_MODE_TAP to create an Ethernet-like layer 2
+     * one.
+     *
+     * Since: 1.2
+     */
+    obj_properties[PROP_MODE] =
+        g_param_spec_uint(NM_SETTING_TUN_MODE,
+                          "",
+                          "",
+                          0,
+                          G_MAXUINT,
+                          NM_SETTING_TUN_MODE_TUN,
+                          G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingTun:owner:
+     *
+     * The user ID which will own the device. If set to %NULL everyone
+     * will be able to use the device.
+     *
+     * Since: 1.2
+     */
+    obj_properties[PROP_OWNER] = g_param_spec_string(NM_SETTING_TUN_OWNER,
+                                                     "",
+                                                     "",
+                                                     NULL,
+                                                     G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
+                                                         | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingTun:group:
+     *
+     * The group ID which will own the device. If set to %NULL everyone
+     * will be able to use the device.
+     *
+     * Since: 1.2
+     */
+    obj_properties[PROP_GROUP] = g_param_spec_string(NM_SETTING_TUN_GROUP,
+                                                     "",
+                                                     "",
+                                                     NULL,
+                                                     G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
+                                                         | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingTun:pi:
+     *
+     * If %TRUE the interface will prepend a 4 byte header describing the
+     * physical interface to the packets.
+     *
+     * Since: 1.2
+     */
+    obj_properties[PROP_PI] = g_param_spec_boolean(NM_SETTING_TUN_PI,
+                                                   "",
+                                                   "",
+                                                   FALSE,
+                                                   G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE
+                                                       | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingTun:vnet-hdr:
+     *
+     * If %TRUE the IFF_VNET_HDR the tunnel packets will include a virtio
+     * network header.
+     *
+     * Since: 1.2
+     */
+    obj_properties[PROP_VNET_HDR] = g_param_spec_boolean(
+        NM_SETTING_TUN_VNET_HDR,
+        "",
+        "",
+        FALSE,
+        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingTun:multi-queue:
+     *
+     * If the property is set to %TRUE, the interface will support
+     * multiple file descriptors (queues) to parallelize packet
+     * sending or receiving. Otherwise, the interface will only
+     * support a single queue.
+     *
+     * Since: 1.2
+     */
+    obj_properties[PROP_MULTI_QUEUE] = g_param_spec_boolean(
+        NM_SETTING_TUN_MULTI_QUEUE,
+        "",
+        "",
+        FALSE,
+        G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS);
+
+    g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
+    _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_TUN);
 }