2014-07-27 20:35:17 +02:00
|
|
|
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
|
/*
|
|
|
|
|
* 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 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, write to the
|
|
|
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
* Boston, MA 02110-1301 USA.
|
|
|
|
|
*
|
2018-03-09 10:51:49 +01:00
|
|
|
* (C) Copyright 2014 - 2018 Red Hat, Inc.
|
2014-07-27 20:35:17 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef NM_CORE_NM_INTERNAL_H
|
|
|
|
|
#define NM_CORE_NM_INTERNAL_H
|
|
|
|
|
|
|
|
|
|
/* This header file contain functions that are provided as private API
|
|
|
|
|
* by libnm-core. It will contain functions to give privileged access to
|
|
|
|
|
* libnm-core. This can be useful for NetworkManager and libnm.so
|
|
|
|
|
* which both are special users of libnm-core.
|
|
|
|
|
* It also exposes some utility functions for reuse.
|
|
|
|
|
*
|
|
|
|
|
* These functions are not exported and are only available to components that link
|
|
|
|
|
* statically against libnm-core. This basically means libnm-core, libnm, NetworkManager
|
|
|
|
|
* and some test programs.
|
|
|
|
|
**/
|
2018-01-02 13:37:06 +01:00
|
|
|
#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
|
|
|
|
|
#error Cannot use this header.
|
|
|
|
|
#endif
|
2014-07-27 20:35:17 +02:00
|
|
|
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-connection.h"
|
|
|
|
|
#include "nm-core-enum-types.h"
|
2018-05-22 15:41:29 +02:00
|
|
|
#include "nm-setting-6lowpan.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-8021x.h"
|
|
|
|
|
#include "nm-setting-adsl.h"
|
|
|
|
|
#include "nm-setting-bluetooth.h"
|
|
|
|
|
#include "nm-setting-bond.h"
|
|
|
|
|
#include "nm-setting-bridge-port.h"
|
|
|
|
|
#include "nm-setting-bridge.h"
|
|
|
|
|
#include "nm-setting-cdma.h"
|
|
|
|
|
#include "nm-setting-connection.h"
|
|
|
|
|
#include "nm-setting-dcb.h"
|
2017-01-31 14:13:35 +01:00
|
|
|
#include "nm-setting-dummy.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-generic.h"
|
|
|
|
|
#include "nm-setting-gsm.h"
|
|
|
|
|
#include "nm-setting-infiniband.h"
|
2015-09-01 14:06:00 +02:00
|
|
|
#include "nm-setting-ip-tunnel.h"
|
2016-08-16 05:55:55 +05:30
|
|
|
#include "nm-setting-proxy.h"
|
2014-07-27 20:35:17 +02:00
|
|
|
#include "nm-setting-ip4-config.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-ip6-config.h"
|
2016-06-30 18:20:43 +02:00
|
|
|
#include "nm-setting-macsec.h"
|
2015-09-17 18:13:49 +02:00
|
|
|
#include "nm-setting-macvlan.h"
|
2018-08-07 15:52:56 +02:00
|
|
|
#include "nm-setting-match.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-olpc-mesh.h"
|
2017-08-01 18:36:34 +02:00
|
|
|
#include "nm-setting-ovs-bridge.h"
|
2017-08-01 18:36:34 +02:00
|
|
|
#include "nm-setting-ovs-interface.h"
|
2017-08-01 18:36:34 +02:00
|
|
|
#include "nm-setting-ovs-patch.h"
|
2017-10-02 09:03:19 +02:00
|
|
|
#include "nm-setting-ovs-port.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-ppp.h"
|
|
|
|
|
#include "nm-setting-pppoe.h"
|
|
|
|
|
#include "nm-setting-serial.h"
|
2018-05-25 12:05:24 +02:00
|
|
|
#include "nm-setting-sriov.h"
|
2017-11-16 17:35:20 +01:00
|
|
|
#include "nm-setting-tc-config.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-team-port.h"
|
|
|
|
|
#include "nm-setting-team.h"
|
2015-09-14 22:56:51 +02:00
|
|
|
#include "nm-setting-tun.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-vlan.h"
|
|
|
|
|
#include "nm-setting-vpn.h"
|
2015-10-13 09:09:54 +02:00
|
|
|
#include "nm-setting-vxlan.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting-wimax.h"
|
|
|
|
|
#include "nm-setting-wired.h"
|
|
|
|
|
#include "nm-setting-wireless-security.h"
|
|
|
|
|
#include "nm-setting-wireless.h"
|
2018-03-09 10:51:49 +01:00
|
|
|
#include "nm-setting-wpan.h"
|
2014-10-21 18:43:33 -04:00
|
|
|
#include "nm-setting.h"
|
|
|
|
|
#include "nm-simple-connection.h"
|
|
|
|
|
#include "nm-utils.h"
|
|
|
|
|
#include "nm-vpn-dbus-interface.h"
|
2015-10-30 11:29:56 +01:00
|
|
|
#include "nm-core-types-internal.h"
|
libnm/vpn: allow specifying non-absolute plugin name in VPN .name file
Since commit 3dfbbb227e82b47973f612b6b031d8d591727436, we enforce that
the plugin path in the .name file is absolute and we perform several
checks on the file before loading it (ownership, etc).
Relax that, to also allow libray names without path component.
In that case, g_module_open()/dlopen() will search for a library
in various search paths. This allows, to omit absolute paths
in the .name file. The latter is problematic, because by default
we install the .name file in the architecture independent location
/usr/lib/NetworkManager. As such, it should not contain paths
to architecture dependent libraries. With this change, a .name
file can contain only the library name and it will be loaded
using the usual mechanism.
However, specifying absolute paths is still possible and works
same as before, including checking file permissions.
As such, distributions probably should package the VPN plugins
to have no path in the .name file. On the other hand, a user
compiling from source probably wants to specify an absolute
path. The reason is, that the user probably doesn't build the
plugin for multiple achitectures and that way, he can install
the plugin in a separate (private) prefix.
2016-04-18 18:19:04 +02:00
|
|
|
#include "nm-vpn-editor-plugin.h"
|
libnm: use NMMetaSettingInfo for tracking setting priority
Previously, each (non abstract) NMSetting class had to register
its name and priority via _nm_register_setting().
Note, that libnm-core.la already links against "nm-meta-setting.c",
which also redundantly keeps track of the settings name and gtype
as well.
Re-use NMMetaSettingInfo also in libnm-core.la, to track this meta
data.
The goal is to get rid of private data structures that track
meta data about NMSetting classes. In this case, "registered_settings"
hash. Instead, we should have one place where all this meta data
is tracked. This was, it is also accessible as internal API,
which can be useful (for keyfile).
Note that NMSettingClass has some overlap with NMMetaSettingInfo.
One difference is, that NMMetaSettingInfo is const, while NMSettingClass
is only initialized during the class_init() method. Appart from that,
it's mostly a matter of taste, whether we attach meta data to
NMSettingClass, to NMMetaSettingInfo, or to a static-array indexed
by NMMetaSettingType.
Note, that previously, _nm_register_setting() was private API. That
means, no user could subclass a functioning NMSetting instance. The same
is still true: NMMetaSettingInfo is internal API and users cannot access
it to create their own NMSetting subclasses. But that is almost desired.
libnm is not designed, to be extensible via subclassing, nor is it
clear why that would be a useful thing to do. One day, we should remove
the NMSetting and NMSettingClass definitions from public headers. Their
only use is subclassing the types, which however does not work.
While libnm-core was linking already against nm-meta-setting.c,
nm_meta_setting_infos was unreferenced. So, this change increases
the binary size of libnm and NetworkManager (1032 bytes). Note however
that roughly the same information was previously allocated at runtime.
2018-07-27 14:08:14 +02:00
|
|
|
#include "nm-meta-setting.h"
|
2014-07-27 20:35:17 +02:00
|
|
|
|
2017-11-23 15:52:07 +01:00
|
|
|
/* IEEE 802.1D-1998 timer values */
|
|
|
|
|
#define NM_BR_MIN_HELLO_TIME 1
|
|
|
|
|
#define NM_BR_MAX_HELLO_TIME 10
|
|
|
|
|
|
|
|
|
|
#define NM_BR_MIN_FORWARD_DELAY 2
|
|
|
|
|
#define NM_BR_MAX_FORWARD_DELAY 30
|
|
|
|
|
|
|
|
|
|
#define NM_BR_MIN_MAX_AGE 6
|
|
|
|
|
#define NM_BR_MAX_MAX_AGE 40
|
|
|
|
|
|
|
|
|
|
/* IEEE 802.1D-1998 Table 7.4 */
|
|
|
|
|
#define NM_BR_MIN_AGEING_TIME 0
|
|
|
|
|
#define NM_BR_MAX_AGEING_TIME 1000000
|
|
|
|
|
|
2014-08-11 18:10:43 +02:00
|
|
|
/* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
|
|
|
|
|
* connection can be replaced by a already-defined connection. This flag only
|
|
|
|
|
* takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE
|
|
|
|
|
* flag.
|
|
|
|
|
*/
|
2015-09-18 17:21:34 +02:00
|
|
|
#define NM_SETTING_COMPARE_FLAG_INFERRABLE ((NMSettingCompareFlags) 0x80000000)
|
2014-08-11 18:10:43 +02:00
|
|
|
|
2015-09-18 17:21:34 +02:00
|
|
|
/* NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY: this flag is used for properties
|
|
|
|
|
* that automatically get re-applied on an active connection when the settings
|
|
|
|
|
* connection is modified. For most properties, the applied-connection is distinct
|
|
|
|
|
* from the setting-connection and changes don't propagate. Exceptions are the
|
|
|
|
|
* firewall-zone and the metered property.
|
|
|
|
|
*/
|
|
|
|
|
#define NM_SETTING_COMPARE_FLAG_IGNORE_REAPPLY_IMMEDIATELY ((NMSettingCompareFlags) 0x40000000)
|
|
|
|
|
|
|
|
|
|
/* NM_SETTING_COMPARE_FLAG_NONE: for convenience, define a special flag NONE -- which
|
|
|
|
|
* equals to numeric zero (NM_SETTING_COMPARE_FLAG_EXACT).
|
|
|
|
|
*/
|
|
|
|
|
#define NM_SETTING_COMPARE_FLAG_NONE ((NMSettingCompareFlags) 0)
|
2014-07-27 20:35:17 +02:00
|
|
|
|
2014-08-11 18:21:53 +02:00
|
|
|
#define NM_SETTING_SECRET_FLAGS_ALL \
|
|
|
|
|
(NM_SETTING_SECRET_FLAG_NONE | \
|
|
|
|
|
NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
|
|
|
|
|
NM_SETTING_SECRET_FLAG_NOT_SAVED | \
|
|
|
|
|
NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
|
|
|
|
|
|
libnm-core: allow strict and relaxed error behavior for _nm_setting_new_from_dbus()
In some situations, we want strict checking of errors, for example when
NetworkManager receives a new connection from a client, the connection
must make sense as a whole (and since NetworkManager service is backward
compatible to the clients and not the other way around, there is no
excuse for sending invalid data to the server).
In other situations, we want a best-effort behavior. Like when
NetworkManager sends a connection to its clients, those clients
want to extract as many properties as they understand, but in order
to be forward compatible against newer server versions, invalid
or unknown properties must be accepted.
Previously, a mixture of both was done. Some issues caused a failure
to create a new NMSetting, other invalid parts were just silently
ignored or triggered a g_warning() in glib.
Now allow for both. When doing strict-validation, be more strict and
reject all unknown properties and catch when the user sets an invalid
argument. On the other hand, allow for a best-effort mode that
effectively cannot fail and will return a new NMSetting instance.
For now, add NMSettingParseFlags so that the caller can choose the
old behavior, strict parsing, or best effort.
This patch doesn't have any externally visible change except that
no more g_warnings will be emitted.
2016-03-18 13:42:50 +01:00
|
|
|
typedef enum { /*< skip >*/
|
|
|
|
|
NM_SETTING_PARSE_FLAGS_NONE = 0,
|
|
|
|
|
NM_SETTING_PARSE_FLAGS_STRICT = 1LL << 0,
|
|
|
|
|
NM_SETTING_PARSE_FLAGS_BEST_EFFORT = 1LL << 1,
|
2016-03-17 10:34:44 +01:00
|
|
|
NM_SETTING_PARSE_FLAGS_NORMALIZE = 1LL << 2,
|
libnm-core: allow strict and relaxed error behavior for _nm_setting_new_from_dbus()
In some situations, we want strict checking of errors, for example when
NetworkManager receives a new connection from a client, the connection
must make sense as a whole (and since NetworkManager service is backward
compatible to the clients and not the other way around, there is no
excuse for sending invalid data to the server).
In other situations, we want a best-effort behavior. Like when
NetworkManager sends a connection to its clients, those clients
want to extract as many properties as they understand, but in order
to be forward compatible against newer server versions, invalid
or unknown properties must be accepted.
Previously, a mixture of both was done. Some issues caused a failure
to create a new NMSetting, other invalid parts were just silently
ignored or triggered a g_warning() in glib.
Now allow for both. When doing strict-validation, be more strict and
reject all unknown properties and catch when the user sets an invalid
argument. On the other hand, allow for a best-effort mode that
effectively cannot fail and will return a new NMSetting instance.
For now, add NMSettingParseFlags so that the caller can choose the
old behavior, strict parsing, or best effort.
This patch doesn't have any externally visible change except that
no more g_warnings will be emitted.
2016-03-18 13:42:50 +01:00
|
|
|
|
|
|
|
|
_NM_SETTING_PARSE_FLAGS_LAST,
|
|
|
|
|
NM_SETTING_PARSE_FLAGS_ALL = ((_NM_SETTING_PARSE_FLAGS_LAST - 1) << 1) - 1,
|
|
|
|
|
} NMSettingParseFlags;
|
|
|
|
|
|
|
|
|
|
gboolean _nm_connection_replace_settings (NMConnection *connection,
|
|
|
|
|
GVariant *new_settings,
|
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
2018-06-27 17:00:55 +02:00
|
|
|
gpointer _nm_connection_check_main_setting (NMConnection *connection,
|
|
|
|
|
const char *setting_name,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
2017-02-28 19:34:59 +01:00
|
|
|
/**
|
|
|
|
|
* NMSettingVerifyResult:
|
|
|
|
|
* @NM_SETTING_VERIFY_SUCCESS: the setting verifies successfully
|
|
|
|
|
* @NM_SETTING_VERIFY_ERROR: the setting has a serious misconfiguration
|
|
|
|
|
* @NM_SETTING_VERIFY_NORMALIZABLE: the setting is valid but has properties
|
|
|
|
|
* that should be normalized
|
|
|
|
|
* @NM_SETTING_VERIFY_NORMALIZABLE_ERROR: the setting is invalid but the
|
|
|
|
|
* errors can be fixed by nm_connection_normalize().
|
|
|
|
|
*/
|
|
|
|
|
typedef enum {
|
|
|
|
|
NM_SETTING_VERIFY_SUCCESS = TRUE,
|
|
|
|
|
NM_SETTING_VERIFY_ERROR = FALSE,
|
|
|
|
|
NM_SETTING_VERIFY_NORMALIZABLE = 2,
|
|
|
|
|
NM_SETTING_VERIFY_NORMALIZABLE_ERROR = 3,
|
|
|
|
|
} NMSettingVerifyResult;
|
|
|
|
|
|
|
|
|
|
NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error);
|
|
|
|
|
|
2017-03-01 13:50:59 +01:00
|
|
|
gboolean _nm_connection_remove_setting (NMConnection *connection, GType setting_type);
|
|
|
|
|
|
2016-03-17 10:34:44 +01:00
|
|
|
NMConnection *_nm_simple_connection_new_from_dbus (GVariant *dict,
|
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
2017-06-01 13:43:52 +02:00
|
|
|
NMSettingPriority _nm_setting_get_setting_priority (NMSetting *setting);
|
2014-08-11 18:21:53 +02:00
|
|
|
|
2014-02-26 10:09:54 +01:00
|
|
|
gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue *value);
|
|
|
|
|
|
libnm: add generic-data for implementing NMSetting
Add a new way how NMSetting subclasses can be implemented.
Currently, most NMSetting implementations realize all their properties
via GObject properties. That has some downsides:
- the biggest one, is the large effort to add new properties.
Most of them are implemented on a one-by-one basis and they come
with additional API (like native getter functions).
It makes it cumbersome to add more properties.
- for certain properties, it's hard to encode them entirely in
a GObject property. That results in unusable API like
NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_BOND_OPTIONS,
NM_SETTING_USER_DATA. These complex valued properties only
exist, because we currently always need GObject properties
to even implement simple functionality. For example,
nm_setting_duplicate() is entirely implemented via
nm_setting_enumerate_values(), which can only iterate
GObject properies. There is no reason why this is necessary.
Note also how nmcli badly handles bond options and VPN
data. That is only a shortcoming of nmcli and wouldn't
need to be that way. But it happend, because we didn't
keep an open mind that settings might be more than just
accessing GObject properties.
- a major point of NMSetting is to convert to/from a GVariant
from the D-Bus API. As NMSetting needs to squeeze all values
into the static GObject structure, there is no place to
encode invalid or unknown properties. Optimally,
_nm_setting_new_from_dbus() does not loose any information
and a subsequent _nm_setting_to_dbus() can restore the original
variant. That is interesting, because we want that an older
libnm client can talk to a newer NetworkManager version. The
client needs to handle unknown properties gracefully to stay
forward compatible. However, it also should not just drop the
properties on the floor.
Note however, optimally we want that nm_setting_verify() still
can reject settings that have such unknown/invalid values. So,
it should be possible to create an NMSetting instance without
error or loosing information. But verify() should be usable to
identify such settings as invalid.
They also have a few upsides.
- libnm is heavily oriented around GObject. So, we generate
our nm-settings manual based on the gtk-doc. Note however,
how we fail to generate a useful manual for bond.options.
Also note, that there is no reason we couldn't generate
great documentation, even if the properties are not GObject
properties.
- GObject properties do give some functionality like meta-data,
data binding and notification. However, the meta-data is not
sufficient on its own. Note how keyfile and nmcli need extensive
descriptor tables on top of GObject properties, to make this
useful. Note how GObject notifications for NMSetting instances
are usually not useful, aside for data binding like nmtui does.
Also note how NMSettingBond already follows a different paradigm
than using GObject properties. Nowdays, NMSettingBond is considered
a mistake (related bug rh#1032808). Many ideas of NMSettingBond
are flawed, like exposing an inferiour API that reduces everything
to a string hash. Also, it only implemented the options hash inside
NMSettingBond. That means, if we would consider this a good style,
we would have to duplicate this approach in each new setting
implementation.
Add a new style to track data for NMSetting subclasses. It keeps
an internal hash table with all GVariant properies. Also, the
functionality is hooked into NMSetting base class, so all future
subclasses that follow this way, can benefit from this. This approach
has a few similiarties with NMSettingBond, but avoids its flaws.
With this, we also no longer need GObject properties (if we would
also implement generating useful documentation based on non-gkt-doc).
They may be added as accessors if they are useful, but there is no
need for them.
Also, handling the properties as a hash of variants invites for a
more generic approach when handling them. While we still could add
accessors that operate on a one-by-one bases, this leads to a more
generic usage where we apply common functionality to a set of properties.
Also, this is for the moment entirely internal and an implementation
detail. It's entirely up to the NMSetting subclass to make use of this
new style. Also, there are little hooks for the subclass available.
If they turn out to be necessary, they might be added. However, for
the moment, the functionality is restricted to what is useful and
necessary.
2018-07-27 10:05:40 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
GHashTable *_nm_setting_gendata_hash (NMSetting *setting,
|
|
|
|
|
gboolean create_if_necessary);
|
|
|
|
|
|
|
|
|
|
void _nm_setting_gendata_notify (NMSetting *setting,
|
|
|
|
|
gboolean keys_changed);
|
|
|
|
|
|
|
|
|
|
guint _nm_setting_gendata_get_all (NMSetting *setting,
|
|
|
|
|
const char *const**out_names,
|
|
|
|
|
GVariant *const**out_values);
|
|
|
|
|
|
|
|
|
|
gboolean _nm_setting_gendata_reset_from_hash (NMSetting *setting,
|
|
|
|
|
GHashTable *new);
|
|
|
|
|
|
|
|
|
|
void _nm_setting_gendata_to_gvalue (NMSetting *setting,
|
|
|
|
|
GValue *value);
|
|
|
|
|
|
|
|
|
|
GVariant *nm_setting_gendata_get (NMSetting *setting,
|
|
|
|
|
const char *name);
|
|
|
|
|
|
|
|
|
|
const char *const*nm_setting_gendata_get_all_names (NMSetting *setting,
|
|
|
|
|
guint *out_len);
|
|
|
|
|
|
|
|
|
|
GVariant *const*nm_setting_gendata_get_all_values (NMSetting *setting);
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
libnm, cli, ifcfg-rh: add NMSettingEthtool setting
Note that in NetworkManager API (D-Bus, libnm, and nmcli),
the features are called "feature-xyz". The "feature-" prefix
is used, because NMSettingEthtool possibly will gain support
for options that are not only -K|--offload|--features, for
example -C|--coalesce.
The "xzy" suffix is either how ethtool utility calls the feature
("tso", "rx"). Or, if ethtool utility specifies no alias for that
feature, it's the name from kernel's ETH_SS_FEATURES ("tx-tcp6-segmentation").
If possible, we prefer ethtool utility's naming.
Also note, how the features "feature-sg", "feature-tso", and
"feature-tx" actually refer to multiple underlying kernel features
at once. This too follows what ethtool utility does.
The functionality is not yet implemented server-side.
2018-07-16 23:37:55 +02:00
|
|
|
guint nm_setting_ethtool_init_features (NMSettingEthtool *setting,
|
|
|
|
|
NMTernary *requested /* indexed by NMEthtoolID - _NM_ETHTOOL_ID_FEATURE_FIRST */);
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2016-10-13 17:51:07 +02:00
|
|
|
#define NM_UTILS_HWADDR_LEN_MAX_STR (NM_UTILS_HWADDR_LEN_MAX * 3)
|
|
|
|
|
|
|
|
|
|
guint8 *_nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize buffer_length, gsize *out_length);
|
|
|
|
|
const char *nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len);
|
2016-05-25 10:46:48 +02:00
|
|
|
|
2016-07-10 13:42:13 +02:00
|
|
|
char *_nm_utils_bin2str (gconstpointer addr, gsize length, gboolean upper_case);
|
2018-05-22 20:08:09 +02:00
|
|
|
void _nm_utils_bin2str_full (gconstpointer addr, gsize length, const char delimiter, gboolean upper_case, char *out);
|
2016-07-10 13:42:13 +02:00
|
|
|
|
2014-07-27 23:33:16 +02:00
|
|
|
GSList * _nm_utils_hash_values_to_slist (GHashTable *hash);
|
|
|
|
|
|
2014-06-24 17:40:08 -04:00
|
|
|
GHashTable *_nm_utils_copy_strdict (GHashTable *strdict);
|
|
|
|
|
|
2014-06-24 12:46:03 -04:00
|
|
|
typedef gpointer (*NMUtilsCopyFunc) (gpointer);
|
|
|
|
|
|
2017-12-11 11:37:21 +01:00
|
|
|
const char **_nm_ip_address_get_attribute_names (const NMIPAddress *addr, gboolean sorted, guint *out_length);
|
|
|
|
|
|
2017-09-13 20:43:16 +02:00
|
|
|
gboolean _nm_ip_route_attribute_validate_all (const NMIPRoute *route);
|
2017-10-30 12:23:34 +01:00
|
|
|
const char **_nm_ip_route_get_attribute_names (const NMIPRoute *route, gboolean sorted, guint *out_length);
|
|
|
|
|
GHashTable *_nm_ip_route_get_attributes_direct (NMIPRoute *route);
|
2017-09-13 20:43:16 +02:00
|
|
|
|
2018-05-25 12:05:24 +02:00
|
|
|
NMSriovVF *_nm_utils_sriov_vf_from_strparts (const char *index, const char *detail, GError **error);
|
|
|
|
|
gboolean _nm_sriov_vf_attribute_validate_all (const NMSriovVF *vf, GError **error);
|
|
|
|
|
|
2017-09-13 20:43:16 +02:00
|
|
|
static inline void
|
|
|
|
|
_nm_auto_ip_route_unref (NMIPRoute **v)
|
|
|
|
|
{
|
|
|
|
|
if (*v)
|
|
|
|
|
nm_ip_route_unref (*v);
|
|
|
|
|
}
|
|
|
|
|
#define nm_auto_ip_route_unref nm_auto (_nm_auto_ip_route_unref)
|
|
|
|
|
|
2014-06-24 12:46:03 -04:00
|
|
|
GPtrArray *_nm_utils_copy_slist_to_array (const GSList *list,
|
|
|
|
|
NMUtilsCopyFunc copy_func,
|
|
|
|
|
GDestroyNotify unref_func);
|
|
|
|
|
GSList *_nm_utils_copy_array_to_slist (const GPtrArray *array,
|
|
|
|
|
NMUtilsCopyFunc copy_func);
|
2014-07-27 23:33:16 +02:00
|
|
|
|
2014-08-26 08:31:04 -04:00
|
|
|
GPtrArray *_nm_utils_copy_array (const GPtrArray *array,
|
|
|
|
|
NMUtilsCopyFunc copy_func,
|
|
|
|
|
GDestroyNotify free_func);
|
|
|
|
|
GPtrArray *_nm_utils_copy_object_array (const GPtrArray *array);
|
|
|
|
|
|
2016-09-23 15:03:41 +02:00
|
|
|
gssize _nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpointer needle);
|
2015-05-12 11:29:29 +02:00
|
|
|
|
2015-07-01 14:08:51 +02:00
|
|
|
GSList * _nm_utils_strv_to_slist (char **strv, gboolean deep_copy);
|
|
|
|
|
char ** _nm_utils_slist_to_strv (GSList *slist, gboolean deep_copy);
|
2015-07-01 14:02:31 +02:00
|
|
|
|
|
|
|
|
GPtrArray * _nm_utils_strv_to_ptrarray (char **strv);
|
|
|
|
|
char ** _nm_utils_ptrarray_to_strv (GPtrArray *ptrarray);
|
2015-07-16 10:36:19 +02:00
|
|
|
gboolean _nm_utils_strv_equal (char **strv1, char **strv2);
|
2015-07-01 14:02:31 +02:00
|
|
|
|
2015-05-28 21:52:24 +02:00
|
|
|
gboolean _nm_utils_check_file (const char *filename,
|
|
|
|
|
gint64 check_owner,
|
|
|
|
|
NMUtilsCheckFilePredicate check_file,
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
struct stat *out_st,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
libnm: require exact vpn plugin filename
Originally, nm-applet loaded the vpn plugins by passing the filename
to g_module_open(). Thereby, g_module_open() allowed for missing file
extension and tries to complete the name with a system-dependent suffix.
When porting to libnm, we kept that behavior but did more elaborate
checks on the file, like checking owner and permissions.
Change to no longer trying to append the system suffix, but require
an exact path. That is no usability problem, because the plugin path
is specified in the .name files, and we just require them now to be the
full path (including the .so extension).
Note also, that this only affects new, libnm-based vpn plugins, thus there
is no change in behavior for legacy libnm-glib based plugins.
Fixes: eed0d0c58f7f13638eb587e240737048d729cb68
2015-08-18 11:56:17 +02:00
|
|
|
gboolean _nm_utils_check_module_file (const char *name,
|
|
|
|
|
int check_owner,
|
|
|
|
|
NMUtilsCheckFilePredicate check_file,
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
GError **error);
|
2015-05-28 22:07:55 +02:00
|
|
|
|
2014-12-03 17:29:54 +01:00
|
|
|
#define NM_UTILS_UUID_TYPE_LEGACY 0
|
|
|
|
|
#define NM_UTILS_UUID_TYPE_VARIANT3 1
|
|
|
|
|
|
|
|
|
|
char *nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args);
|
|
|
|
|
|
2017-05-28 17:34:31 +03:00
|
|
|
/* arbitrarily chosen namespace UUID for _nm_utils_uuid_generate_from_strings() */
|
2015-02-22 20:15:52 +01:00
|
|
|
#define NM_UTILS_UUID_NS "b425e9fb-7598-44b4-9e3b-5a2e3aaa4905"
|
|
|
|
|
|
|
|
|
|
char *_nm_utils_uuid_generate_from_strings (const char *string1, ...) G_GNUC_NULL_TERMINATED;
|
|
|
|
|
|
2016-11-08 17:39:26 +01:00
|
|
|
char *nm_utils_uuid_generate_buf_ (char *buf);
|
|
|
|
|
#define nm_utils_uuid_generate_buf(buf) \
|
|
|
|
|
({ \
|
|
|
|
|
G_STATIC_ASSERT (sizeof (buf) == G_N_ELEMENTS (buf) && sizeof (buf) >= 37); \
|
|
|
|
|
nm_utils_uuid_generate_buf_ (buf); \
|
|
|
|
|
})
|
|
|
|
|
#define nm_utils_uuid_generate_a() (nm_utils_uuid_generate_buf_ (g_alloca (37)))
|
|
|
|
|
|
2014-10-15 14:55:41 -04:00
|
|
|
void _nm_dbus_errors_init (void);
|
|
|
|
|
|
2014-11-14 11:45:51 -05:00
|
|
|
extern gboolean _nm_utils_is_manager_process;
|
|
|
|
|
|
2014-12-03 08:23:44 -05:00
|
|
|
GByteArray *nm_utils_rsa_key_encrypt (const guint8 *data,
|
|
|
|
|
gsize len,
|
|
|
|
|
const char *in_password,
|
|
|
|
|
char **out_password,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
2015-03-27 08:02:25 -04:00
|
|
|
gulong _nm_dbus_signal_connect_data (GDBusProxy *proxy,
|
|
|
|
|
const char *signal_name,
|
|
|
|
|
const GVariantType *signature,
|
|
|
|
|
GCallback c_handler,
|
|
|
|
|
gpointer data,
|
|
|
|
|
GClosureNotify destroy_data,
|
|
|
|
|
GConnectFlags connect_flags);
|
|
|
|
|
#define _nm_dbus_signal_connect(proxy, name, signature, handler, data) \
|
|
|
|
|
_nm_dbus_signal_connect_data (proxy, name, signature, handler, data, NULL, (GConnectFlags) 0)
|
|
|
|
|
|
2015-03-27 08:44:50 -04:00
|
|
|
GVariant *_nm_dbus_proxy_call_finish (GDBusProxy *proxy,
|
|
|
|
|
GAsyncResult *res,
|
|
|
|
|
const GVariantType *reply_type,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
|
|
|
|
GVariant *_nm_dbus_proxy_call_sync (GDBusProxy *proxy,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
const char *method_name,
|
2015-03-27 08:44:50 -04:00
|
|
|
GVariant *parameters,
|
|
|
|
|
const GVariantType *reply_type,
|
|
|
|
|
GDBusCallFlags flags,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
int timeout_msec,
|
2015-03-27 08:44:50 -04:00
|
|
|
GCancellable *cancellable,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
2015-03-27 09:04:13 -04:00
|
|
|
gboolean _nm_dbus_error_has_name (GError *error,
|
|
|
|
|
const char *dbus_error_name);
|
2015-05-20 12:21:11 +02:00
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2015-05-20 12:21:11 +02:00
|
|
|
|
2015-05-22 13:26:40 +02:00
|
|
|
gboolean _nm_vpn_plugin_info_check_file (const char *filename,
|
|
|
|
|
gboolean check_absolute,
|
|
|
|
|
gboolean do_validate_filename,
|
|
|
|
|
gint64 check_owner,
|
|
|
|
|
NMUtilsCheckFilePredicate check_file,
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
|
|
|
|
const char *_nm_vpn_plugin_info_get_default_dir_etc (void);
|
|
|
|
|
const char *_nm_vpn_plugin_info_get_default_dir_lib (void);
|
|
|
|
|
const char *_nm_vpn_plugin_info_get_default_dir_user (void);
|
|
|
|
|
|
|
|
|
|
GSList *_nm_vpn_plugin_info_list_load_dir (const char *dirname,
|
|
|
|
|
gboolean do_validate_filename,
|
|
|
|
|
gint64 check_owner,
|
|
|
|
|
NMUtilsCheckFilePredicate check_file,
|
|
|
|
|
gpointer user_data);
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2015-05-22 13:26:40 +02:00
|
|
|
|
2015-05-20 12:21:11 +02:00
|
|
|
typedef struct {
|
|
|
|
|
const char *name;
|
|
|
|
|
gboolean numeric;
|
|
|
|
|
gboolean ipv6_only;
|
2015-05-20 12:31:10 +02:00
|
|
|
} NMUtilsDNSOptionDesc;
|
2015-05-20 12:21:11 +02:00
|
|
|
|
2015-05-20 12:31:10 +02:00
|
|
|
extern const NMUtilsDNSOptionDesc _nm_utils_dns_option_descs[];
|
2015-05-20 12:21:11 +02:00
|
|
|
|
|
|
|
|
gboolean _nm_utils_dns_option_validate (const char *option, char **out_name,
|
|
|
|
|
long *out_value, gboolean ipv6,
|
2015-05-20 12:31:10 +02:00
|
|
|
const NMUtilsDNSOptionDesc *option_descs);
|
2017-09-27 11:54:51 +02:00
|
|
|
gssize _nm_utils_dns_option_find_idx (GPtrArray *array, const char *option);
|
2015-05-20 12:21:11 +02:00
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2015-05-20 12:21:11 +02:00
|
|
|
|
2015-05-22 18:52:22 +02:00
|
|
|
typedef struct _NMUtilsStrStrDictKey NMUtilsStrStrDictKey;
|
|
|
|
|
guint _nm_utils_strstrdictkey_hash (gconstpointer a);
|
|
|
|
|
gboolean _nm_utils_strstrdictkey_equal (gconstpointer a, gconstpointer b);
|
|
|
|
|
NMUtilsStrStrDictKey *_nm_utils_strstrdictkey_create (const char *v1, const char *v2);
|
|
|
|
|
|
|
|
|
|
#define _nm_utils_strstrdictkey_static(v1, v2) \
|
|
|
|
|
( (NMUtilsStrStrDictKey *) ("\03" v1 "\0" v2 "") )
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2015-05-22 18:52:22 +02:00
|
|
|
|
2015-10-30 11:02:44 +01:00
|
|
|
gboolean _nm_setting_vlan_set_priorities (NMSettingVlan *setting,
|
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
|
const NMVlanQosMapping *qos_map,
|
|
|
|
|
guint n_qos_map);
|
|
|
|
|
void _nm_setting_vlan_get_priorities (NMSettingVlan *setting,
|
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
|
NMVlanQosMapping **out_qos_map,
|
|
|
|
|
guint *out_n_qos_map);
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2015-10-30 11:02:44 +01:00
|
|
|
|
all: make MAC address randomization algorithm configurable
For the per-connection settings "ethernet.cloned-mac-address"
and "wifi.cloned-mac-address", and for the per-device setting
"wifi.scan-rand-mac-address", we may generate MAC addresses using
either the "random" or "stable" algorithm.
Add new properties "generate-mac-address-mask" that allow to configure
which bits of the MAC address will be scrambled.
By default, the "random" and "stable" algorithms scamble all bits
of the MAC address, including the OUI part and generate a locally-
administered, unicast address.
By specifying a MAC address mask, we can now configure to perserve
parts of the current MAC address of the device. For example, setting
"FF:FF:FF:00:00:00" will preserve the first 3 octects of the current
MAC address.
One can also explicitly specify a MAC address to use instead of the
current MAC address. For example, "FF:FF:FF:00:00:00 68:F7:28:00:00:00"
sets the OUI part of the MAC address to "68:F7:28" while scrambling
the last 3 octects.
Similarly, "02:00:00:00:00:00 00:00:00:00:00:00" will scamble
all bits of the MAC address, except clearing the second-least
significant bit. Thus, creating a burned-in address, globally
administered.
One can also supply a list of MAC addresses like
"FF:FF:FF:00:00:00 68:F7:28:00:00:00 00:0C:29:00:00:00 ..." in which
case a MAC address is choosen randomly.
To fully scamble the MAC address one can configure
"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00".
which also randomly creates either a locally or globally administered
address.
With this, the following macchanger options can be implemented:
`macchanger --random`
This is the default if no mask is configured.
-> ""
while is the same as:
-> "00:00:00:00:00:00"
-> "02:00:00:00:00:00 02:00:00:00:00:00"
`macchanger --random --bia`
-> "02:00:00:00:00:00 00:00:00:00:00:00"
`macchanger --ending`
This option cannot be fully implemented, because macchanger
uses the current MAC address but also implies --bia.
-> "FF:FF:FF:00:00:00"
This would yields the same result only if the current MAC address
is already a burned-in address too. Otherwise, it has not the same
effect as --ending.
-> "FF:FF:FF:00:00:00 <MAC_ADDR>"
Alternatively, instead of using the current MAC address,
spell the OUI part out. But again, that is not really the
same as macchanger does because you explictly have to name
the OUI part to use.
`machanger --another`
`machanger --another_any`
-> "FF:FF:FF:00:00:00 <MAC_ADDR> <MAC_ADDR> ..."
"$(printf "FF:FF:FF:00:00:00 %s\n" "$(sed -n 's/^\([0-9a-fA-F][0-9a-fA-F]\) \([0-9a-fA-F][0-9a-fA-F]\) \([0-9a-fA-F][0-9a-fA-F]\) .*/\1:\2:\3:00:00:00/p' /usr/share/macchanger/wireless.list | xargs)")"
2016-06-22 20:31:39 +02:00
|
|
|
struct ether_addr;
|
|
|
|
|
|
|
|
|
|
gboolean _nm_utils_generate_mac_address_mask_parse (const char *value,
|
|
|
|
|
struct ether_addr *out_mask,
|
|
|
|
|
struct ether_addr **out_ouis,
|
|
|
|
|
gsize *out_ouis_len,
|
|
|
|
|
GError **error);
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
all: make MAC address randomization algorithm configurable
For the per-connection settings "ethernet.cloned-mac-address"
and "wifi.cloned-mac-address", and for the per-device setting
"wifi.scan-rand-mac-address", we may generate MAC addresses using
either the "random" or "stable" algorithm.
Add new properties "generate-mac-address-mask" that allow to configure
which bits of the MAC address will be scrambled.
By default, the "random" and "stable" algorithms scamble all bits
of the MAC address, including the OUI part and generate a locally-
administered, unicast address.
By specifying a MAC address mask, we can now configure to perserve
parts of the current MAC address of the device. For example, setting
"FF:FF:FF:00:00:00" will preserve the first 3 octects of the current
MAC address.
One can also explicitly specify a MAC address to use instead of the
current MAC address. For example, "FF:FF:FF:00:00:00 68:F7:28:00:00:00"
sets the OUI part of the MAC address to "68:F7:28" while scrambling
the last 3 octects.
Similarly, "02:00:00:00:00:00 00:00:00:00:00:00" will scamble
all bits of the MAC address, except clearing the second-least
significant bit. Thus, creating a burned-in address, globally
administered.
One can also supply a list of MAC addresses like
"FF:FF:FF:00:00:00 68:F7:28:00:00:00 00:0C:29:00:00:00 ..." in which
case a MAC address is choosen randomly.
To fully scamble the MAC address one can configure
"02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00".
which also randomly creates either a locally or globally administered
address.
With this, the following macchanger options can be implemented:
`macchanger --random`
This is the default if no mask is configured.
-> ""
while is the same as:
-> "00:00:00:00:00:00"
-> "02:00:00:00:00:00 02:00:00:00:00:00"
`macchanger --random --bia`
-> "02:00:00:00:00:00 00:00:00:00:00:00"
`macchanger --ending`
This option cannot be fully implemented, because macchanger
uses the current MAC address but also implies --bia.
-> "FF:FF:FF:00:00:00"
This would yields the same result only if the current MAC address
is already a burned-in address too. Otherwise, it has not the same
effect as --ending.
-> "FF:FF:FF:00:00:00 <MAC_ADDR>"
Alternatively, instead of using the current MAC address,
spell the OUI part out. But again, that is not really the
same as macchanger does because you explictly have to name
the OUI part to use.
`machanger --another`
`machanger --another_any`
-> "FF:FF:FF:00:00:00 <MAC_ADDR> <MAC_ADDR> ..."
"$(printf "FF:FF:FF:00:00:00 %s\n" "$(sed -n 's/^\([0-9a-fA-F][0-9a-fA-F]\) \([0-9a-fA-F][0-9a-fA-F]\) \([0-9a-fA-F][0-9a-fA-F]\) .*/\1:\2:\3:00:00:00/p' /usr/share/macchanger/wireless.list | xargs)")"
2016-06-22 20:31:39 +02:00
|
|
|
|
2016-03-16 11:22:07 +01:00
|
|
|
typedef enum {
|
|
|
|
|
NM_BOND_OPTION_TYPE_INT,
|
|
|
|
|
NM_BOND_OPTION_TYPE_STRING,
|
|
|
|
|
NM_BOND_OPTION_TYPE_BOTH,
|
|
|
|
|
NM_BOND_OPTION_TYPE_IP,
|
2016-03-15 17:37:06 +01:00
|
|
|
NM_BOND_OPTION_TYPE_MAC,
|
2016-03-16 11:22:07 +01:00
|
|
|
NM_BOND_OPTION_TYPE_IFNAME,
|
|
|
|
|
} NMBondOptionType;
|
|
|
|
|
|
|
|
|
|
NMBondOptionType
|
|
|
|
|
_nm_setting_bond_get_option_type (NMSettingBond *setting, const char *name);
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2017-06-07 12:46:10 +02:00
|
|
|
|
|
|
|
|
/* nm_connection_get_uuid() asserts against NULL, which is the right thing to
|
|
|
|
|
* do in order to catch bugs. However, sometimes that behavior is inconvenient.
|
|
|
|
|
* Just try or return NULL. */
|
|
|
|
|
|
|
|
|
|
static inline const char *
|
|
|
|
|
_nm_connection_get_id (NMConnection *connection)
|
|
|
|
|
{
|
|
|
|
|
return connection ? nm_connection_get_id (connection) : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline const char *
|
|
|
|
|
_nm_connection_get_uuid (NMConnection *connection)
|
|
|
|
|
{
|
|
|
|
|
return connection ? nm_connection_get_uuid (connection) : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
all: add connection.multi-connect property for wildcard profiles
Add a new option that allows to activate a profile multiple times
(at the same time). Previoulsy, all profiles were implicitly
NM_SETTING_CONNECTION_MULTI_CONNECT_SINGLE, meaning, that activating
a profile that is already active will deactivate it first.
This will make more sense, as we also add more match-options how
profiles can be restricted to particular devices. We already have
connection.type, connection.interface-name, and (ethernet|wifi).mac-address
to restrict a profile to particular devices. For example, it is however
not possible to specify a wildcard like "eth*" to match a profile to
a set of devices by interface-name. That is another missing feature,
and once we extend the matching capabilities, it makes more sense to
activate a profile multiple times.
See also https://bugzilla.redhat.com/show_bug.cgi?id=997998, which
previously changed that a connection is restricted to a single activation
at a time. This work relaxes that again.
This only adds the new property, it is not used nor implemented yet.
https://bugzilla.redhat.com/show_bug.cgi?id=1555012
2018-04-10 11:45:35 +02:00
|
|
|
NMConnectionMultiConnect _nm_connection_get_multi_connect (NMConnection *connection);
|
|
|
|
|
|
2017-06-07 12:46:10 +02:00
|
|
|
/*****************************************************************************/
|
2016-04-30 16:43:10 +02:00
|
|
|
|
2016-07-04 16:25:39 +02:00
|
|
|
typedef enum {
|
|
|
|
|
NM_BOND_MODE_UNKNOWN = 0,
|
|
|
|
|
NM_BOND_MODE_ROUNDROBIN,
|
|
|
|
|
NM_BOND_MODE_ACTIVEBACKUP,
|
|
|
|
|
NM_BOND_MODE_XOR,
|
|
|
|
|
NM_BOND_MODE_BROADCAST,
|
|
|
|
|
NM_BOND_MODE_8023AD,
|
|
|
|
|
NM_BOND_MODE_TLB,
|
|
|
|
|
NM_BOND_MODE_ALB,
|
|
|
|
|
} NMBondMode;
|
|
|
|
|
|
|
|
|
|
NMBondMode _nm_setting_bond_mode_from_string (const char *str);
|
|
|
|
|
gboolean _nm_setting_bond_option_supported (const char *option, NMBondMode mode);
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2016-07-04 16:25:39 +02:00
|
|
|
|
2017-05-31 22:37:49 +02:00
|
|
|
NMSettingBluetooth *_nm_connection_get_setting_bluetooth_for_nap (NMConnection *connection);
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-11-08 22:13:40 +01:00
|
|
|
const char *nm_utils_inet_ntop (int addr_family, gconstpointer addr, char *dst);
|
|
|
|
|
|
2016-04-30 16:43:10 +02:00
|
|
|
gboolean _nm_utils_inet6_is_token (const struct in6_addr *in6addr);
|
|
|
|
|
|
2016-10-02 18:22:50 +02:00
|
|
|
/*****************************************************************************/
|
2016-08-30 15:21:16 +02:00
|
|
|
|
2017-10-26 11:39:58 +02:00
|
|
|
gboolean _nm_utils_team_config_equal (const char *conf1, const char *conf2, gboolean port);
|
|
|
|
|
GValue *_nm_utils_team_config_get (const char *conf,
|
|
|
|
|
const char *key,
|
|
|
|
|
const char *key2,
|
|
|
|
|
const char *key3,
|
|
|
|
|
gboolean port_config);
|
|
|
|
|
|
|
|
|
|
gboolean _nm_utils_team_config_set (char **conf,
|
|
|
|
|
const char *key,
|
|
|
|
|
const char *key2,
|
|
|
|
|
const char *key3,
|
|
|
|
|
const GValue *value);
|
2016-08-30 15:21:16 +02:00
|
|
|
|
2017-02-16 12:20:51 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-10-20 16:55:39 +02:00
|
|
|
static inline int
|
|
|
|
|
nm_setting_ip_config_get_addr_family (NMSettingIPConfig *s_ip)
|
|
|
|
|
{
|
|
|
|
|
if (NM_IS_SETTING_IP4_CONFIG (s_ip))
|
|
|
|
|
return AF_INET;
|
|
|
|
|
if (NM_IS_SETTING_IP6_CONFIG (s_ip))
|
|
|
|
|
return AF_INET6;
|
|
|
|
|
g_return_val_if_reached (AF_UNSPEC);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-11-18 17:17:24 +01:00
|
|
|
guint32 _nm_utils_parse_tc_handle (const char *str,
|
|
|
|
|
GError **error);
|
|
|
|
|
void _nm_utils_string_append_tc_parent (GString *string,
|
|
|
|
|
const char *prefix,
|
|
|
|
|
guint32 parent);
|
|
|
|
|
void _nm_utils_string_append_tc_qdisc_rest (GString *string,
|
|
|
|
|
NMTCQdisc *qdisc);
|
2017-11-27 22:16:36 +01:00
|
|
|
gboolean _nm_utils_string_append_tc_tfilter_rest (GString *string,
|
|
|
|
|
NMTCTfilter *tfilter,
|
|
|
|
|
GError **error);
|
2017-11-18 17:17:24 +01:00
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-01-18 10:43:48 +01:00
|
|
|
static inline gboolean
|
|
|
|
|
_nm_connection_type_is_master (const char *type)
|
|
|
|
|
{
|
|
|
|
|
return (NM_IN_STRSET (type,
|
|
|
|
|
NM_SETTING_BOND_SETTING_NAME,
|
|
|
|
|
NM_SETTING_BRIDGE_SETTING_NAME,
|
|
|
|
|
NM_SETTING_TEAM_SETTING_NAME,
|
|
|
|
|
NM_SETTING_OVS_BRIDGE_SETTING_NAME,
|
|
|
|
|
NM_SETTING_OVS_PORT_SETTING_NAME));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-03-06 16:10:01 +01:00
|
|
|
gboolean _nm_utils_dhcp_duid_valid (const char *duid, GBytes **out_duid_bin);
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2018-05-25 12:05:24 +02:00
|
|
|
|
|
|
|
|
gboolean _nm_setting_sriov_sort_vfs (NMSettingSriov *setting);
|
|
|
|
|
|
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
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
libnm: add generic-data for implementing NMSetting
Add a new way how NMSetting subclasses can be implemented.
Currently, most NMSetting implementations realize all their properties
via GObject properties. That has some downsides:
- the biggest one, is the large effort to add new properties.
Most of them are implemented on a one-by-one basis and they come
with additional API (like native getter functions).
It makes it cumbersome to add more properties.
- for certain properties, it's hard to encode them entirely in
a GObject property. That results in unusable API like
NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_BOND_OPTIONS,
NM_SETTING_USER_DATA. These complex valued properties only
exist, because we currently always need GObject properties
to even implement simple functionality. For example,
nm_setting_duplicate() is entirely implemented via
nm_setting_enumerate_values(), which can only iterate
GObject properies. There is no reason why this is necessary.
Note also how nmcli badly handles bond options and VPN
data. That is only a shortcoming of nmcli and wouldn't
need to be that way. But it happend, because we didn't
keep an open mind that settings might be more than just
accessing GObject properties.
- a major point of NMSetting is to convert to/from a GVariant
from the D-Bus API. As NMSetting needs to squeeze all values
into the static GObject structure, there is no place to
encode invalid or unknown properties. Optimally,
_nm_setting_new_from_dbus() does not loose any information
and a subsequent _nm_setting_to_dbus() can restore the original
variant. That is interesting, because we want that an older
libnm client can talk to a newer NetworkManager version. The
client needs to handle unknown properties gracefully to stay
forward compatible. However, it also should not just drop the
properties on the floor.
Note however, optimally we want that nm_setting_verify() still
can reject settings that have such unknown/invalid values. So,
it should be possible to create an NMSetting instance without
error or loosing information. But verify() should be usable to
identify such settings as invalid.
They also have a few upsides.
- libnm is heavily oriented around GObject. So, we generate
our nm-settings manual based on the gtk-doc. Note however,
how we fail to generate a useful manual for bond.options.
Also note, that there is no reason we couldn't generate
great documentation, even if the properties are not GObject
properties.
- GObject properties do give some functionality like meta-data,
data binding and notification. However, the meta-data is not
sufficient on its own. Note how keyfile and nmcli need extensive
descriptor tables on top of GObject properties, to make this
useful. Note how GObject notifications for NMSetting instances
are usually not useful, aside for data binding like nmtui does.
Also note how NMSettingBond already follows a different paradigm
than using GObject properties. Nowdays, NMSettingBond is considered
a mistake (related bug rh#1032808). Many ideas of NMSettingBond
are flawed, like exposing an inferiour API that reduces everything
to a string hash. Also, it only implemented the options hash inside
NMSettingBond. That means, if we would consider this a good style,
we would have to duplicate this approach in each new setting
implementation.
Add a new style to track data for NMSetting subclasses. It keeps
an internal hash table with all GVariant properies. Also, the
functionality is hooked into NMSetting base class, so all future
subclasses that follow this way, can benefit from this. This approach
has a few similiarties with NMSettingBond, but avoids its flaws.
With this, we also no longer need GObject properties (if we would
also implement generating useful documentation based on non-gkt-doc).
They may be added as accessors if they are useful, but there is no
need for them.
Also, handling the properties as a hash of variants invites for a
more generic approach when handling them. While we still could add
accessors that operate on a one-by-one bases, this leads to a more
generic usage where we apply common functionality to a set of properties.
Also, this is for the moment entirely internal and an implementation
detail. It's entirely up to the NMSetting subclass to make use of this
new style. Also, there are little hooks for the subclass available.
If they turn out to be necessary, they might be added. However, for
the moment, the functionality is restricted to what is useful and
necessary.
2018-07-27 10:05:40 +02:00
|
|
|
typedef struct _NMSettInfoSetting NMSettInfoSetting;
|
|
|
|
|
|
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
|
|
|
typedef GVariant *(*NMSettingPropertyGetFunc) (NMSetting *setting,
|
|
|
|
|
const char *property);
|
|
|
|
|
typedef GVariant *(*NMSettingPropertySynthFunc) (NMSetting *setting,
|
|
|
|
|
NMConnection *connection,
|
|
|
|
|
const char *property);
|
|
|
|
|
typedef gboolean (*NMSettingPropertySetFunc) (NMSetting *setting,
|
|
|
|
|
GVariant *connection_dict,
|
|
|
|
|
const char *property,
|
|
|
|
|
GVariant *value,
|
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
|
GError **error);
|
|
|
|
|
typedef gboolean (*NMSettingPropertyNotSetFunc) (NMSetting *setting,
|
|
|
|
|
GVariant *connection_dict,
|
|
|
|
|
const char *property,
|
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
|
GError **error);
|
|
|
|
|
typedef GVariant *(*NMSettingPropertyTransformToFunc) (const GValue *from);
|
|
|
|
|
typedef void (*NMSettingPropertyTransformFromFunc) (GVariant *from,
|
|
|
|
|
GValue *to);
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
const char *name;
|
|
|
|
|
GParamSpec *param_spec;
|
|
|
|
|
const GVariantType *dbus_type;
|
|
|
|
|
|
|
|
|
|
NMSettingPropertyGetFunc get_func;
|
|
|
|
|
NMSettingPropertySynthFunc synth_func;
|
|
|
|
|
NMSettingPropertySetFunc set_func;
|
|
|
|
|
NMSettingPropertyNotSetFunc not_set_func;
|
|
|
|
|
|
|
|
|
|
NMSettingPropertyTransformToFunc to_dbus;
|
|
|
|
|
NMSettingPropertyTransformFromFunc from_dbus;
|
|
|
|
|
} NMSettInfoProperty;
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
libnm: add generic-data for implementing NMSetting
Add a new way how NMSetting subclasses can be implemented.
Currently, most NMSetting implementations realize all their properties
via GObject properties. That has some downsides:
- the biggest one, is the large effort to add new properties.
Most of them are implemented on a one-by-one basis and they come
with additional API (like native getter functions).
It makes it cumbersome to add more properties.
- for certain properties, it's hard to encode them entirely in
a GObject property. That results in unusable API like
NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_BOND_OPTIONS,
NM_SETTING_USER_DATA. These complex valued properties only
exist, because we currently always need GObject properties
to even implement simple functionality. For example,
nm_setting_duplicate() is entirely implemented via
nm_setting_enumerate_values(), which can only iterate
GObject properies. There is no reason why this is necessary.
Note also how nmcli badly handles bond options and VPN
data. That is only a shortcoming of nmcli and wouldn't
need to be that way. But it happend, because we didn't
keep an open mind that settings might be more than just
accessing GObject properties.
- a major point of NMSetting is to convert to/from a GVariant
from the D-Bus API. As NMSetting needs to squeeze all values
into the static GObject structure, there is no place to
encode invalid or unknown properties. Optimally,
_nm_setting_new_from_dbus() does not loose any information
and a subsequent _nm_setting_to_dbus() can restore the original
variant. That is interesting, because we want that an older
libnm client can talk to a newer NetworkManager version. The
client needs to handle unknown properties gracefully to stay
forward compatible. However, it also should not just drop the
properties on the floor.
Note however, optimally we want that nm_setting_verify() still
can reject settings that have such unknown/invalid values. So,
it should be possible to create an NMSetting instance without
error or loosing information. But verify() should be usable to
identify such settings as invalid.
They also have a few upsides.
- libnm is heavily oriented around GObject. So, we generate
our nm-settings manual based on the gtk-doc. Note however,
how we fail to generate a useful manual for bond.options.
Also note, that there is no reason we couldn't generate
great documentation, even if the properties are not GObject
properties.
- GObject properties do give some functionality like meta-data,
data binding and notification. However, the meta-data is not
sufficient on its own. Note how keyfile and nmcli need extensive
descriptor tables on top of GObject properties, to make this
useful. Note how GObject notifications for NMSetting instances
are usually not useful, aside for data binding like nmtui does.
Also note how NMSettingBond already follows a different paradigm
than using GObject properties. Nowdays, NMSettingBond is considered
a mistake (related bug rh#1032808). Many ideas of NMSettingBond
are flawed, like exposing an inferiour API that reduces everything
to a string hash. Also, it only implemented the options hash inside
NMSettingBond. That means, if we would consider this a good style,
we would have to duplicate this approach in each new setting
implementation.
Add a new style to track data for NMSetting subclasses. It keeps
an internal hash table with all GVariant properies. Also, the
functionality is hooked into NMSetting base class, so all future
subclasses that follow this way, can benefit from this. This approach
has a few similiarties with NMSettingBond, but avoids its flaws.
With this, we also no longer need GObject properties (if we would
also implement generating useful documentation based on non-gkt-doc).
They may be added as accessors if they are useful, but there is no
need for them.
Also, handling the properties as a hash of variants invites for a
more generic approach when handling them. While we still could add
accessors that operate on a one-by-one bases, this leads to a more
generic usage where we apply common functionality to a set of properties.
Also, this is for the moment entirely internal and an implementation
detail. It's entirely up to the NMSetting subclass to make use of this
new style. Also, there are little hooks for the subclass available.
If they turn out to be necessary, they might be added. However, for
the moment, the functionality is restricted to what is useful and
necessary.
2018-07-27 10:05:40 +02:00
|
|
|
const GVariantType *(*get_variant_type) (const struct _NMSettInfoSetting *sett_info,
|
|
|
|
|
const char *name,
|
|
|
|
|
GError **error);
|
|
|
|
|
} NMSettInfoSettGendata;
|
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
|
|
|
|
|
|
|
|
typedef struct {
|
libnm: add generic-data for implementing NMSetting
Add a new way how NMSetting subclasses can be implemented.
Currently, most NMSetting implementations realize all their properties
via GObject properties. That has some downsides:
- the biggest one, is the large effort to add new properties.
Most of them are implemented on a one-by-one basis and they come
with additional API (like native getter functions).
It makes it cumbersome to add more properties.
- for certain properties, it's hard to encode them entirely in
a GObject property. That results in unusable API like
NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_BOND_OPTIONS,
NM_SETTING_USER_DATA. These complex valued properties only
exist, because we currently always need GObject properties
to even implement simple functionality. For example,
nm_setting_duplicate() is entirely implemented via
nm_setting_enumerate_values(), which can only iterate
GObject properies. There is no reason why this is necessary.
Note also how nmcli badly handles bond options and VPN
data. That is only a shortcoming of nmcli and wouldn't
need to be that way. But it happend, because we didn't
keep an open mind that settings might be more than just
accessing GObject properties.
- a major point of NMSetting is to convert to/from a GVariant
from the D-Bus API. As NMSetting needs to squeeze all values
into the static GObject structure, there is no place to
encode invalid or unknown properties. Optimally,
_nm_setting_new_from_dbus() does not loose any information
and a subsequent _nm_setting_to_dbus() can restore the original
variant. That is interesting, because we want that an older
libnm client can talk to a newer NetworkManager version. The
client needs to handle unknown properties gracefully to stay
forward compatible. However, it also should not just drop the
properties on the floor.
Note however, optimally we want that nm_setting_verify() still
can reject settings that have such unknown/invalid values. So,
it should be possible to create an NMSetting instance without
error or loosing information. But verify() should be usable to
identify such settings as invalid.
They also have a few upsides.
- libnm is heavily oriented around GObject. So, we generate
our nm-settings manual based on the gtk-doc. Note however,
how we fail to generate a useful manual for bond.options.
Also note, that there is no reason we couldn't generate
great documentation, even if the properties are not GObject
properties.
- GObject properties do give some functionality like meta-data,
data binding and notification. However, the meta-data is not
sufficient on its own. Note how keyfile and nmcli need extensive
descriptor tables on top of GObject properties, to make this
useful. Note how GObject notifications for NMSetting instances
are usually not useful, aside for data binding like nmtui does.
Also note how NMSettingBond already follows a different paradigm
than using GObject properties. Nowdays, NMSettingBond is considered
a mistake (related bug rh#1032808). Many ideas of NMSettingBond
are flawed, like exposing an inferiour API that reduces everything
to a string hash. Also, it only implemented the options hash inside
NMSettingBond. That means, if we would consider this a good style,
we would have to duplicate this approach in each new setting
implementation.
Add a new style to track data for NMSetting subclasses. It keeps
an internal hash table with all GVariant properies. Also, the
functionality is hooked into NMSetting base class, so all future
subclasses that follow this way, can benefit from this. This approach
has a few similiarties with NMSettingBond, but avoids its flaws.
With this, we also no longer need GObject properties (if we would
also implement generating useful documentation based on non-gkt-doc).
They may be added as accessors if they are useful, but there is no
need for them.
Also, handling the properties as a hash of variants invites for a
more generic approach when handling them. While we still could add
accessors that operate on a one-by-one bases, this leads to a more
generic usage where we apply common functionality to a set of properties.
Also, this is for the moment entirely internal and an implementation
detail. It's entirely up to the NMSetting subclass to make use of this
new style. Also, there are little hooks for the subclass available.
If they turn out to be necessary, they might be added. However, for
the moment, the functionality is restricted to what is useful and
necessary.
2018-07-27 10:05:40 +02:00
|
|
|
/* if set, then this setting class has no own fields. Instead, its
|
|
|
|
|
* data is entirely based on gendata. Meaning: it tracks all data
|
|
|
|
|
* as native GVariants.
|
|
|
|
|
* It might have some GObject properties, but these are merely accessors
|
|
|
|
|
* to the underlying gendata.
|
|
|
|
|
*
|
|
|
|
|
* Note, that at the moment there are few hooks, to customize the behavior
|
|
|
|
|
* of the setting further. They are currently unneeded. This is desired,
|
|
|
|
|
* but could be added when there is a good reason.
|
|
|
|
|
*
|
|
|
|
|
* However, a few hooks there are... see NMSettInfoSettGendata. */
|
|
|
|
|
const NMSettInfoSettGendata *gendata_info;
|
|
|
|
|
} NMSettInfoSettDetail;
|
|
|
|
|
|
|
|
|
|
struct _NMSettInfoSetting {
|
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
|
|
|
NMSettingClass *setting_class;
|
|
|
|
|
const NMSettInfoProperty *property_infos;
|
|
|
|
|
guint property_infos_len;
|
|
|
|
|
NMSettInfoSettDetail detail;
|
libnm: add generic-data for implementing NMSetting
Add a new way how NMSetting subclasses can be implemented.
Currently, most NMSetting implementations realize all their properties
via GObject properties. That has some downsides:
- the biggest one, is the large effort to add new properties.
Most of them are implemented on a one-by-one basis and they come
with additional API (like native getter functions).
It makes it cumbersome to add more properties.
- for certain properties, it's hard to encode them entirely in
a GObject property. That results in unusable API like
NM_SETTING_IP_CONFIG_ADDRESSES, NM_SETTING_BOND_OPTIONS,
NM_SETTING_USER_DATA. These complex valued properties only
exist, because we currently always need GObject properties
to even implement simple functionality. For example,
nm_setting_duplicate() is entirely implemented via
nm_setting_enumerate_values(), which can only iterate
GObject properies. There is no reason why this is necessary.
Note also how nmcli badly handles bond options and VPN
data. That is only a shortcoming of nmcli and wouldn't
need to be that way. But it happend, because we didn't
keep an open mind that settings might be more than just
accessing GObject properties.
- a major point of NMSetting is to convert to/from a GVariant
from the D-Bus API. As NMSetting needs to squeeze all values
into the static GObject structure, there is no place to
encode invalid or unknown properties. Optimally,
_nm_setting_new_from_dbus() does not loose any information
and a subsequent _nm_setting_to_dbus() can restore the original
variant. That is interesting, because we want that an older
libnm client can talk to a newer NetworkManager version. The
client needs to handle unknown properties gracefully to stay
forward compatible. However, it also should not just drop the
properties on the floor.
Note however, optimally we want that nm_setting_verify() still
can reject settings that have such unknown/invalid values. So,
it should be possible to create an NMSetting instance without
error or loosing information. But verify() should be usable to
identify such settings as invalid.
They also have a few upsides.
- libnm is heavily oriented around GObject. So, we generate
our nm-settings manual based on the gtk-doc. Note however,
how we fail to generate a useful manual for bond.options.
Also note, that there is no reason we couldn't generate
great documentation, even if the properties are not GObject
properties.
- GObject properties do give some functionality like meta-data,
data binding and notification. However, the meta-data is not
sufficient on its own. Note how keyfile and nmcli need extensive
descriptor tables on top of GObject properties, to make this
useful. Note how GObject notifications for NMSetting instances
are usually not useful, aside for data binding like nmtui does.
Also note how NMSettingBond already follows a different paradigm
than using GObject properties. Nowdays, NMSettingBond is considered
a mistake (related bug rh#1032808). Many ideas of NMSettingBond
are flawed, like exposing an inferiour API that reduces everything
to a string hash. Also, it only implemented the options hash inside
NMSettingBond. That means, if we would consider this a good style,
we would have to duplicate this approach in each new setting
implementation.
Add a new style to track data for NMSetting subclasses. It keeps
an internal hash table with all GVariant properies. Also, the
functionality is hooked into NMSetting base class, so all future
subclasses that follow this way, can benefit from this. This approach
has a few similiarties with NMSettingBond, but avoids its flaws.
With this, we also no longer need GObject properties (if we would
also implement generating useful documentation based on non-gkt-doc).
They may be added as accessors if they are useful, but there is no
need for them.
Also, handling the properties as a hash of variants invites for a
more generic approach when handling them. While we still could add
accessors that operate on a one-by-one bases, this leads to a more
generic usage where we apply common functionality to a set of properties.
Also, this is for the moment entirely internal and an implementation
detail. It's entirely up to the NMSetting subclass to make use of this
new style. Also, there are little hooks for the subclass available.
If they turn out to be necessary, they might be added. However, for
the moment, the functionality is restricted to what is useful and
necessary.
2018-07-27 10:05:40 +02:00
|
|
|
};
|
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
|
|
|
|
|
|
|
|
const NMSettInfoSetting *_nm_sett_info_setting_get (NMSettingClass *setting_class);
|
|
|
|
|
|
|
|
|
|
const NMSettInfoProperty *_nm_sett_info_property_get (NMSettingClass *setting_class,
|
|
|
|
|
const char *property_name);
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2014-07-27 20:35:17 +02:00
|
|
|
#endif
|