2019-09-10 11:19:01 +02:00
|
|
|
// SPDX-License-Identifier: LGPL-2.1+
|
2015-09-14 22:56:51 +02:00
|
|
|
/*
|
|
|
|
|
* Copyright 2015 Red Hat, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
2016-02-19 14:57:48 +01:00
|
|
|
#include "nm-default.h"
|
2015-09-14 22:56:51 +02:00
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
#include "nm-setting-tun.h"
|
|
|
|
|
|
2015-09-14 22:56:51 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
#include "nm-utils.h"
|
|
|
|
|
#include "nm-setting-connection.h"
|
|
|
|
|
#include "nm-setting-private.h"
|
|
|
|
|
#include "nm-connection-private.h"
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* SECTION:nm-setting-tun
|
|
|
|
|
* @short_description: Describes connection properties for TUN/TAP interfaces
|
|
|
|
|
*
|
|
|
|
|
* The #NMSettingTun object is a #NMSetting subclass that describes properties
|
|
|
|
|
* necessary for connection to TUN/TAP interfaces.
|
|
|
|
|
**/
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
/*****************************************************************************/
|
2015-09-14 22:56:51 +02:00
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
NM_GOBJECT_PROPERTIES_DEFINE_BASE (
|
|
|
|
|
PROP_MODE,
|
|
|
|
|
PROP_OWNER,
|
|
|
|
|
PROP_GROUP,
|
|
|
|
|
PROP_PI,
|
|
|
|
|
PROP_VNET_HDR,
|
|
|
|
|
PROP_MULTI_QUEUE,
|
|
|
|
|
);
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
NMSettingTunMode mode;
|
|
|
|
|
char *owner;
|
|
|
|
|
char *group;
|
|
|
|
|
gboolean pi;
|
|
|
|
|
gboolean vnet_hdr;
|
|
|
|
|
gboolean multi_queue;
|
|
|
|
|
} NMSettingTunPrivate;
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
G_DEFINE_TYPE (NMSettingTun, nm_setting_tun, NM_TYPE_SETTING)
|
2015-09-14 22:56:51 +02:00
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
#define NM_SETTING_TUN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TUN, NMSettingTunPrivate))
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_tun_get_mode:
|
|
|
|
|
* @setting: the #NMSettingTun
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTun:mode property of the setting
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
**/
|
|
|
|
|
NMSettingTunMode
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_tun_get_owner:
|
|
|
|
|
* @setting: the #NMSettingTun
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTun:owner property of the setting
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
**/
|
|
|
|
|
const char *
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_tun_get_group:
|
|
|
|
|
* @setting: the #NMSettingTun
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTun:group property of the setting
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
**/
|
|
|
|
|
const char *
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_tun_get_pi:
|
|
|
|
|
* @setting: the #NMSettingTun
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTun:pi property of the setting
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
**/
|
|
|
|
|
gboolean
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_tun_get_vnet_hdr:
|
|
|
|
|
* @setting: the #NMSettingTun
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTun:vnet_hdr property of the setting
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
**/
|
|
|
|
|
gboolean
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_tun_get_multi_queue:
|
|
|
|
|
* @setting: the #NMSettingTun
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTun:multi-queue property of the setting
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
**/
|
|
|
|
|
gboolean
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
|
|
|
|
|
|
core/platform: add support for TUN/TAP netlink support and various cleanup
Kernel recently got support for exposing TUN/TAP information on netlink
[1], [2], [3]. Add support for it to the platform cache.
The advantage of using netlink is that querying sysctl bypasses the
order of events of the netlink socket. It is out of sync and racy. For
example, platform cache might still think that a tun device exists, but
a subsequent lookup at sysfs might fail because the device was deleted
in the meantime. Another point is, that we don't get change
notifications via sysctl and that it requires various extra syscalls
to read the device information. If the tun information is present on
netlink, put it into the cache. This bypasses checking sysctl while
we keep looking at sysctl for backward compatibility until we require
support from kernel.
Notes:
- we had two link types NM_LINK_TYPE_TAP and NM_LINK_TYPE_TUN. This
deviates from the model of how kernel treats TUN/TAP devices, which
makes it more complicated. The link type of a NMPlatformLink instance
should match what kernel thinks about the device. Point in case,
when parsing RTM_NETLINK messages, we very early need to determine
the link type (_linktype_get_type()). However, to determine the
type of a TUN/TAP at that point, we need to look into nested
netlink attributes which in turn depend on the type (IFLA_INFO_KIND
and IFLA_INFO_DATA), or even worse, we would need to look into
sysctl for older kernel vesions. Now, the TUN/TAP type is a property
of the link type NM_LINK_TYPE_TUN, instead of determining two
different link types.
- various parts of the API (both kernel's sysctl vs. netlink) and
NMDeviceTun vs. NMSettingTun disagree whether the PI is positive
(NM_SETTING_TUN_PI, IFLA_TUN_PI, NMPlatformLnkTun.pi) or inverted
(NM_DEVICE_TUN_NO_PI, IFF_NO_PI). There is no consistent way,
but prefer the positive form for internal API at NMPlatformLnkTun.pi.
- previously NMDeviceTun.mode could not change after initializing
the object. Allow for that to happen, because forcing some properties
that are reported by kernel to not change is wrong, in case they
might change. Of course, in practice kernel doesn't allow the device
to ever change its type, but the type property of the NMDeviceTun
should not make that assumption, because, if it actually changes, what
would it mean?
- note that as of now, new netlink API is not yet merged to mainline Linus
tree. Shortcut _parse_lnk_tun() to not accidentally use unstable API
for now.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1277457
[2] https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/commit/?id=1ec010e705934c8acbe7dbf31afc81e60e3d828b
[3] https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=118eda77d6602616bc523a17ee45171e879d1818
https://bugzilla.redhat.com/show_bug.cgi?id=1547213
https://github.com/NetworkManager/NetworkManager/pull/77
2018-03-13 15:29:03 +01:00
|
|
|
if (!NM_IN_SET (priv->mode, NM_SETTING_TUN_MODE_TUN,
|
|
|
|
|
NM_SETTING_TUN_MODE_TAP)) {
|
2015-09-14 22:56:51 +02:00
|
|
|
g_set_error (error,
|
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
2017-03-14 11:15:05 +01:00
|
|
|
_("'%u': invalid mode"), (unsigned) priv->mode);
|
2015-09-14 22:56:51 +02:00
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2015-09-14 22:56:51 +02:00
|
|
|
static void
|
2019-01-11 08:32:54 +01:00
|
|
|
get_property (GObject *object, guint prop_id,
|
|
|
|
|
GValue *value, GParamSpec *pspec)
|
2015-09-14 22:56:51 +02:00
|
|
|
{
|
|
|
|
|
NMSettingTun *setting = NM_SETTING_TUN (object);
|
|
|
|
|
NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_MODE:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_value_set_uint (value, priv->mode);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_OWNER:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_value_set_string (value, priv->owner);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_GROUP:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_value_set_string (value, priv->group);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_PI:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_value_set_boolean (value, priv->pi);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_VNET_HDR:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_value_set_boolean (value, priv->vnet_hdr);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_MULTI_QUEUE:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_value_set_boolean (value, priv->multi_queue);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-01-11 08:32:54 +01:00
|
|
|
|
2015-09-14 22:56:51 +02:00
|
|
|
static void
|
2019-01-11 08:32:54 +01:00
|
|
|
set_property (GObject *object, guint prop_id,
|
|
|
|
|
const GValue *value, GParamSpec *pspec)
|
2015-09-14 22:56:51 +02:00
|
|
|
{
|
|
|
|
|
NMSettingTun *setting = NM_SETTING_TUN (object);
|
|
|
|
|
NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_MODE:
|
2019-01-11 08:32:54 +01:00
|
|
|
priv->mode = g_value_get_uint (value);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_OWNER:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_free (priv->owner);
|
|
|
|
|
priv->owner = g_value_dup_string (value);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_GROUP:
|
2019-01-11 08:32:54 +01:00
|
|
|
g_free (priv->group);
|
|
|
|
|
priv->group = g_value_dup_string (value);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_PI:
|
2019-01-11 08:32:54 +01:00
|
|
|
priv->pi = g_value_get_boolean (value);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_VNET_HDR:
|
2019-01-11 08:32:54 +01:00
|
|
|
priv->vnet_hdr = g_value_get_boolean (value);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
case PROP_MULTI_QUEUE:
|
2019-01-11 08:32:54 +01:00
|
|
|
priv->multi_queue = g_value_get_boolean (value);
|
2015-09-14 22:56:51 +02:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-01-11 08:32:54 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_setting_tun_init (NMSettingTun *setting)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_tun_new:
|
|
|
|
|
*
|
|
|
|
|
* Creates a new #NMSettingTun object with default values.
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): the new empty #NMSettingTun object
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
**/
|
|
|
|
|
NMSetting *
|
|
|
|
|
nm_setting_tun_new (void)
|
|
|
|
|
{
|
|
|
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_TUN, NULL);
|
|
|
|
|
}
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
finalize (GObject *object)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTun *setting = NM_SETTING_TUN (object);
|
|
|
|
|
NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
|
|
g_free (priv->owner);
|
|
|
|
|
g_free (priv->group);
|
|
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (nm_setting_tun_parent_class)->finalize (object);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
nm_setting_tun_class_init (NMSettingTunClass *klass)
|
2015-09-14 22:56:51 +02:00
|
|
|
{
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
|
NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
|
2015-09-14 22:56:51 +02:00
|
|
|
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
g_type_class_add_private (klass, sizeof (NMSettingTunPrivate));
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
object_class->get_property = get_property;
|
2019-01-11 08:32:54 +01:00
|
|
|
object_class->set_property = set_property;
|
2015-09-14 22:56:51 +02:00
|
|
|
object_class->finalize = finalize;
|
|
|
|
|
|
libnm: rework setting metadata for property handling
NMSetting internally already tracked a list of all proper GObject properties
and D-Bus-only properties.
Rework the tracking of the list, so that:
- instead of attaching the data to the GType of the setting via
g_type_set_qdata(), it is tracked in a static array indexed by
NMMetaSettingType. This allows to find the setting-data by simple
pointer arithmetic, instead of taking a look and iterating (like
g_type_set_qdata() does).
Note, that this is still thread safe, because the static table entry is
initialized in the class-init function with _nm_setting_class_commit().
And it only accessed by following a NMSettingClass instance, thus
the class constructor already ran (maybe not for all setting classes,
but for the particular one that we look up).
I think this makes initialization of the metadata simpler to
understand.
Previously, in a first phase each class would attach the metadata
to the GType as setting_property_overrides_quark(). Then during
nm_setting_class_ensure_properties() it would merge them and
set as setting_properties_quark(). Now, during the first phase,
we only incrementally build a properties_override GArray, which
we finally hand over during nm_setting_class_commit().
- sort the property infos by name and do binary search.
Also expose this meta data types as internal API in nm-setting-private.h.
While not accessed yet, it can prove beneficial, to have direct (internal)
access to these structures.
Also, rename NMSettingProperty to NMSettInfoProperty to use a distinct
naming scheme. We already have 40+ subclasses of NMSetting that are called
NMSetting*. Likewise, NMMetaSetting* is heavily used already. So, choose a
new, distinct name.
2018-07-28 15:26:03 +02:00
|
|
|
setting_class->verify = verify;
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
|
2015-09-14 22:56:51 +02:00
|
|
|
/**
|
|
|
|
|
* 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
|
|
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_MODE] =
|
|
|
|
|
g_param_spec_uint (NM_SETTING_TUN_MODE, "", "",
|
|
|
|
|
0, G_MAXUINT, NM_SETTING_TUN_MODE_TUN,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 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
|
|
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_OWNER] =
|
|
|
|
|
g_param_spec_string (NM_SETTING_TUN_OWNER, "", "",
|
|
|
|
|
NULL,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 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
|
|
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_GROUP] =
|
|
|
|
|
g_param_spec_string (NM_SETTING_TUN_GROUP, "", "",
|
|
|
|
|
NULL,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingTun:pi:
|
|
|
|
|
*
|
|
|
|
|
* If %TRUE the interface will prepend a 4 byte header describing the
|
|
|
|
|
* physical interface to the packets.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_PI] =
|
|
|
|
|
g_param_spec_boolean (NM_SETTING_TUN_PI, "", "",
|
|
|
|
|
FALSE,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingTun:vnet-hdr:
|
|
|
|
|
*
|
|
|
|
|
* If %TRUE the IFF_VNET_HDR the tunnel packets will include a virtio
|
|
|
|
|
* network header.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.2
|
|
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
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);
|
2015-09-14 22:56:51 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 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
|
|
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
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);
|
libnm: rework setting metadata for property handling
NMSetting internally already tracked a list of all proper GObject properties
and D-Bus-only properties.
Rework the tracking of the list, so that:
- instead of attaching the data to the GType of the setting via
g_type_set_qdata(), it is tracked in a static array indexed by
NMMetaSettingType. This allows to find the setting-data by simple
pointer arithmetic, instead of taking a look and iterating (like
g_type_set_qdata() does).
Note, that this is still thread safe, because the static table entry is
initialized in the class-init function with _nm_setting_class_commit().
And it only accessed by following a NMSettingClass instance, thus
the class constructor already ran (maybe not for all setting classes,
but for the particular one that we look up).
I think this makes initialization of the metadata simpler to
understand.
Previously, in a first phase each class would attach the metadata
to the GType as setting_property_overrides_quark(). Then during
nm_setting_class_ensure_properties() it would merge them and
set as setting_properties_quark(). Now, during the first phase,
we only incrementally build a properties_override GArray, which
we finally hand over during nm_setting_class_commit().
- sort the property infos by name and do binary search.
Also expose this meta data types as internal API in nm-setting-private.h.
While not accessed yet, it can prove beneficial, to have direct (internal)
access to these structures.
Also, rename NMSettingProperty to NMSettInfoProperty to use a distinct
naming scheme. We already have 40+ subclasses of NMSetting that are called
NMSetting*. Likewise, NMMetaSetting* is heavily used already. So, choose a
new, distinct name.
2018-07-28 15:26:03 +02:00
|
|
|
|
|
|
|
|
_nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_TUN);
|
2015-09-14 22:56:51 +02:00
|
|
|
}
|