2014-07-24 08:53:33 -04: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.
|
|
|
|
|
*
|
2017-11-16 18:54:06 +01:00
|
|
|
* Copyright 2017 Red Hat, Inc.
|
2014-07-24 08:53:33 -04:00
|
|
|
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
|
|
|
|
|
*/
|
|
|
|
|
|
2016-02-19 14:57:48 +01:00
|
|
|
#include "nm-default.h"
|
2014-11-13 10:07:02 -05:00
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
#include "nm-setting-team-port.h"
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
#include "nm-utils.h"
|
|
|
|
|
#include "nm-utils-private.h"
|
2014-10-21 22:30:31 -04:00
|
|
|
#include "nm-connection-private.h"
|
2014-10-21 22:09:52 -04:00
|
|
|
#include "nm-setting-connection.h"
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* SECTION:nm-setting-team-port
|
|
|
|
|
* @short_description: Describes connection properties for team ports
|
|
|
|
|
*
|
|
|
|
|
* The #NMSettingTeamPort object is a #NMSetting subclass that describes
|
|
|
|
|
* optional properties that apply to team ports.
|
|
|
|
|
**/
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
/*****************************************************************************/
|
2014-07-24 08:53:33 -04:00
|
|
|
|
2019-01-11 08:28:26 +01:00
|
|
|
NM_GOBJECT_PROPERTIES_DEFINE (NMSettingTeamPort,
|
2014-07-24 08:53:33 -04:00
|
|
|
PROP_CONFIG,
|
2017-10-30 12:27:58 +01:00
|
|
|
PROP_QUEUE_ID,
|
|
|
|
|
PROP_PRIO,
|
|
|
|
|
PROP_STICKY,
|
|
|
|
|
PROP_LACP_PRIO,
|
|
|
|
|
PROP_LACP_KEY,
|
2017-11-16 18:54:06 +01:00
|
|
|
PROP_LINK_WATCHERS,
|
2019-01-11 08:28:26 +01:00
|
|
|
);
|
2014-07-24 08:53:33 -04:00
|
|
|
|
2019-01-11 08:28:26 +01:00
|
|
|
static const _NMUtilsTeamPropertyKeys _prop_to_keys[_PROPERTY_ENUMS_LAST] = {
|
2019-02-08 11:00:19 +01:00
|
|
|
[PROP_CONFIG] = { },
|
|
|
|
|
[PROP_QUEUE_ID] = { .key1 = "queue_id", .default_int = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT, },
|
|
|
|
|
[PROP_PRIO] = { .key1 = "prio", },
|
|
|
|
|
[PROP_STICKY] = { .key1 = "sticky", },
|
|
|
|
|
[PROP_LACP_PRIO] = { .key1 = "lacp_prio", .default_int = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT, },
|
|
|
|
|
[PROP_LACP_KEY] = { .key1 = "lacp_key", },
|
|
|
|
|
[PROP_LINK_WATCHERS] = { .key1 = "link_watch", },
|
2017-10-30 16:24:04 +01:00
|
|
|
};
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
typedef struct {
|
|
|
|
|
char *config;
|
|
|
|
|
int queue_id;
|
|
|
|
|
int prio;
|
|
|
|
|
gboolean sticky;
|
|
|
|
|
int lacp_prio;
|
|
|
|
|
int lacp_key;
|
|
|
|
|
GPtrArray *link_watchers; /* Array of NMTeamLinkWatcher */
|
|
|
|
|
} NMSettingTeamPortPrivate;
|
|
|
|
|
|
|
|
|
|
G_DEFINE_TYPE (NMSettingTeamPort, nm_setting_team_port, NM_TYPE_SETTING)
|
|
|
|
|
|
|
|
|
|
#define NM_SETTING_TEAM_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TEAM_PORT, NMSettingTeamPortPrivate))
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_config:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTeamPort:config property of the setting
|
|
|
|
|
**/
|
|
|
|
|
const char *
|
|
|
|
|
nm_setting_team_port_get_config (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), NULL);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_TEAM_PORT_GET_PRIVATE (setting)->config;
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-30 12:27:58 +01:00
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_queue_id:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTeamPort:queue_id property of the setting
|
|
|
|
|
*
|
2017-11-10 12:15:39 +01:00
|
|
|
* Since: 1.12
|
2017-10-30 12:27:58 +01:00
|
|
|
**/
|
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
|
2017-10-30 12:27:58 +01:00
|
|
|
nm_setting_team_port_get_queue_id (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), -1);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_TEAM_PORT_GET_PRIVATE (setting)->queue_id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_prio:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTeamPort:prio property of the setting
|
|
|
|
|
*
|
2017-11-10 12:15:39 +01:00
|
|
|
* Since: 1.12
|
2017-10-30 12:27:58 +01:00
|
|
|
**/
|
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
|
2017-10-30 12:27:58 +01:00
|
|
|
nm_setting_team_port_get_prio (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_TEAM_PORT_GET_PRIVATE (setting)->prio;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_sticky:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTeamPort:sticky property of the setting
|
|
|
|
|
*
|
2017-11-10 12:15:39 +01:00
|
|
|
* Since: 1.12
|
2017-10-30 12:27:58 +01:00
|
|
|
**/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_setting_team_port_get_sticky (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), FALSE);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_TEAM_PORT_GET_PRIVATE (setting)->sticky;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_lacp_prio:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTeamPort:lacp-prio property of the setting
|
|
|
|
|
*
|
2017-11-10 12:15:39 +01:00
|
|
|
* Since: 1.12
|
2017-10-30 12:27:58 +01:00
|
|
|
**/
|
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
|
2017-10-30 12:27:58 +01:00
|
|
|
nm_setting_team_port_get_lacp_prio (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_TEAM_PORT_GET_PRIVATE (setting)->lacp_prio;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_lacp_key:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingTeamPort:lacp-key property of the setting
|
|
|
|
|
*
|
2017-11-10 12:15:39 +01:00
|
|
|
* Since: 1.12
|
2017-10-30 12:27:58 +01:00
|
|
|
**/
|
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
|
2017-10-30 12:27:58 +01:00
|
|
|
nm_setting_team_port_get_lacp_key (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_TEAM_PORT_GET_PRIVATE (setting)->lacp_key;
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-16 18:54:06 +01:00
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_num_link_watchers:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Returns: the number of configured link watchers
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
|
|
|
|
guint
|
|
|
|
|
nm_setting_team_port_get_num_link_watchers (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), 0);
|
|
|
|
|
|
|
|
|
|
return priv->link_watchers->len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_get_link_watcher:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
* @idx: index number of the link watcher to return
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer none): the link watcher at index @idx.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
|
|
|
|
NMTeamLinkWatcher *
|
|
|
|
|
nm_setting_team_port_get_link_watcher (NMSettingTeamPort *setting, guint idx)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), NULL);
|
|
|
|
|
g_return_val_if_fail (idx < priv->link_watchers->len, NULL);
|
|
|
|
|
|
|
|
|
|
return priv->link_watchers->pdata[idx];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_add_link_watcher:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
* @link_watcher: the link watcher to add
|
|
|
|
|
*
|
|
|
|
|
* Appends a new link watcher to the setting.
|
|
|
|
|
*
|
|
|
|
|
* Returns: %TRUE if the link watcher is added; %FALSE if an identical link
|
|
|
|
|
* watcher was already there.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_setting_team_port_add_link_watcher (NMSettingTeamPort *setting,
|
|
|
|
|
NMTeamLinkWatcher *link_watcher)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
guint i;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), FALSE);
|
|
|
|
|
g_return_val_if_fail (link_watcher != NULL, FALSE);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < priv->link_watchers->len; i++) {
|
|
|
|
|
if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_ptr_array_add (priv->link_watchers, nm_team_link_watcher_dup (link_watcher));
|
2019-01-11 08:28:26 +01:00
|
|
|
_notify (setting, PROP_LINK_WATCHERS);
|
2017-11-16 18:54:06 +01:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_remove_link_watcher:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
* @idx: index number of the link watcher to remove
|
|
|
|
|
*
|
|
|
|
|
* Removes the link watcher at index #idx.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
|
|
|
|
void
|
|
|
|
|
nm_setting_team_port_remove_link_watcher (NMSettingTeamPort *setting, guint idx)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (NM_IS_SETTING_TEAM_PORT (setting));
|
|
|
|
|
g_return_if_fail (idx < priv->link_watchers->len);
|
|
|
|
|
|
|
|
|
|
g_ptr_array_remove_index (priv->link_watchers, idx);
|
2019-01-11 08:28:26 +01:00
|
|
|
_notify (setting, PROP_LINK_WATCHERS);
|
2017-11-16 18:54:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_remove_link_watcher_by_value:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
* @link_watcher: the link watcher to remove
|
|
|
|
|
*
|
|
|
|
|
* Removes the link watcher entry matching link_watcher.
|
|
|
|
|
*
|
|
|
|
|
* Returns: %TRUE if the link watcher was found and removed, %FALSE otherwise.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_setting_team_port_remove_link_watcher_by_value (NMSettingTeamPort *setting,
|
|
|
|
|
NMTeamLinkWatcher *link_watcher)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
guint i;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM_PORT (setting), FALSE);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < priv->link_watchers->len; i++) {
|
|
|
|
|
if (nm_team_link_watcher_equal (priv->link_watchers->pdata[i], link_watcher)) {
|
|
|
|
|
g_ptr_array_remove_index (priv->link_watchers, i);
|
2019-01-11 08:28:26 +01:00
|
|
|
_notify (setting, PROP_LINK_WATCHERS);
|
2017-11-16 18:54:06 +01:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_clear_link_watchers:
|
|
|
|
|
* @setting: the #NMSettingTeamPort
|
|
|
|
|
*
|
|
|
|
|
* Removes all configured link watchers.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
|
|
|
|
void
|
|
|
|
|
nm_setting_team_port_clear_link_watchers (NMSettingTeamPort *setting)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (NM_IS_SETTING_TEAM_PORT (setting));
|
|
|
|
|
|
2018-05-28 15:31:11 +02:00
|
|
|
if (priv->link_watchers->len != 0) {
|
|
|
|
|
g_ptr_array_set_size (priv->link_watchers, 0);
|
2019-01-11 08:28:26 +01:00
|
|
|
_notify (setting, PROP_LINK_WATCHERS);
|
2018-05-28 15:31:11 +02:00
|
|
|
}
|
2017-11-16 18:54:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static GVariant *
|
|
|
|
|
team_link_watchers_to_dbus (const GValue *prop_value)
|
|
|
|
|
{
|
|
|
|
|
return _nm_utils_team_link_watchers_to_variant (g_value_get_boxed (prop_value));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
team_link_watchers_from_dbus (GVariant *dbus_value,
|
|
|
|
|
GValue *prop_value)
|
|
|
|
|
{
|
|
|
|
|
g_value_take_boxed (prop_value, _nm_utils_team_link_watchers_from_variant (dbus_value));
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
static gboolean
|
2014-10-21 22:30:31 -04:00
|
|
|
verify (NMSetting *setting, NMConnection *connection, GError **error)
|
2014-07-24 08:53:33 -04:00
|
|
|
{
|
2016-03-11 13:17:24 +01:00
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
|
2014-10-21 22:30:31 -04:00
|
|
|
if (connection) {
|
2014-07-07 17:05:10 +02:00
|
|
|
NMSettingConnection *s_con;
|
|
|
|
|
const char *slave_type;
|
|
|
|
|
|
2014-10-21 22:30:31 -04:00
|
|
|
s_con = nm_connection_get_setting_connection (connection);
|
|
|
|
|
if (!s_con) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
|
NM_CONNECTION_ERROR_MISSING_SETTING,
|
|
|
|
|
_("missing setting"));
|
|
|
|
|
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_SETTING_NAME);
|
2014-07-07 17:05:10 +02:00
|
|
|
return FALSE;
|
2014-10-21 22:30:31 -04:00
|
|
|
}
|
2014-07-07 17:05:10 +02:00
|
|
|
|
|
|
|
|
slave_type = nm_setting_connection_get_slave_type (s_con);
|
|
|
|
|
if ( slave_type
|
|
|
|
|
&& strcmp (slave_type, NM_SETTING_TEAM_SETTING_NAME)) {
|
|
|
|
|
g_set_error (error,
|
libnm-core: merge NMSetting*Error into NMConnectionError
Each setting type was defining its own error type, but most of them
had exactly the same three errors ("unknown", "missing property", and
"invalid property"), and none of the other values was of much use
programmatically anyway.
So, this commit merges NMSettingError, NMSettingAdslError, etc, all
into NMConnectionError. (The reason for merging into NMConnectionError
rather than NMSettingError is that we also already have
"NMSettingsError", for errors related to the settings service, so
"NMConnectionError" is a less-confusable name for settings/connection
errors than "NMSettingError".)
Also, make sure that all of the affected error messages are localized,
and (where appropriate) prefix them with the relevant property name.
Renamed error codes:
NM_SETTING_ERROR_PROPERTY_NOT_FOUND -> NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND
NM_SETTING_ERROR_PROPERTY_NOT_SECRET -> NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET
Remapped error codes:
NM_SETTING_*_ERROR_MISSING_PROPERTY -> NM_CONNECTION_ERROR_MISSING_PROPERTY
NM_SETTING_*_ERROR_INVALID_PROPERTY -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND -> NM_CONNECTION_ERROR_INVALID_SETTING
NM_SETTING_BOND_ERROR_INVALID_OPTION -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_BOND_ERROR_MISSING_OPTION -> NM_CONNECTION_ERROR_MISSING_PROPERTY
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND -> NM_CONNECTION_ERROR_MISSING_SETTING
NM_SETTING_CONNECTION_ERROR_SLAVE_SETTING_NOT_FOUND -> NM_CONNECTION_ERROR_MISSING_SETTING
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_VLAN_ERROR_INVALID_PARENT -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING -> NM_CONNECTION_ERROR_MISSING_SETTING
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME -> NM_CONNECTION_ERROR_MISSING_PROPERTY
NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP -> NM_CONNECTION_ERROR_INVALID_PROPERTY
NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND -> NM_CONNECTION_ERROR_MISSING_PROPERTY
Dropped error codes (were previously defined but unused):
NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED
NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING
NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED
NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING
NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING
NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING
2014-10-20 13:52:23 -04:00
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
2014-07-07 17:05:10 +02:00
|
|
|
_("A connection with a '%s' setting must have the slave-type set to '%s'. Instead it is '%s'"),
|
|
|
|
|
NM_SETTING_TEAM_PORT_SETTING_NAME,
|
|
|
|
|
NM_SETTING_TEAM_SETTING_NAME,
|
|
|
|
|
slave_type);
|
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-08-01 18:48:15 +02:00
|
|
|
|
|
|
|
|
if (priv->config) {
|
2016-09-23 11:16:48 +02:00
|
|
|
if (strlen (priv->config) > 1*1024*1024) {
|
|
|
|
|
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("team config exceeds size limit"));
|
|
|
|
|
g_prefix_error (error,
|
|
|
|
|
"%s.%s: ",
|
|
|
|
|
NM_SETTING_TEAM_PORT_SETTING_NAME,
|
|
|
|
|
NM_SETTING_TEAM_PORT_CONFIG);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-23 10:30:50 +02:00
|
|
|
if (!nm_utils_is_json_object (priv->config, error)) {
|
2016-08-01 18:48:15 +02:00
|
|
|
g_prefix_error (error,
|
|
|
|
|
"%s.%s: ",
|
|
|
|
|
NM_SETTING_TEAM_PORT_SETTING_NAME,
|
|
|
|
|
NM_SETTING_TEAM_PORT_CONFIG);
|
2016-08-30 15:22:04 +02:00
|
|
|
/* We treat an empty string as no config for compatibility. */
|
|
|
|
|
return *priv->config ? FALSE : NM_SETTING_VERIFY_NORMALIZABLE;
|
2016-08-01 18:48:15 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-30 16:37:54 +02:00
|
|
|
/* NOTE: normalizable/normalizable-errors must appear at the end with decreasing severity.
|
|
|
|
|
* Take care to properly order statements with priv->config above. */
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
libnm: rework compare_property() implementation for NMSetting
NMSetting's compare_property() has and had two callers:
nm_setting_compare() and nm_setting_diff().
compare_property() accepts a NMSettingCompareFlags argument, but
at the same time, both callers have another complex (and
inconsistent!) set of pre-checks for shortcuting the call of
compare_property(): should_compare_prop().
Merge should_compare_prop() into compare_property(). This way,
nm_setting_compare() and nm_setting_diff() has less additional
code, and are simpler to follow. Especially nm_setting_compare()
is now trivial. And nm_setting_diff() is still complicated, but
not related to the question how the property compares or whether
it should be compared at all.
If you want to know whether it should be compared, all you need to do
now is follow NMSettingClass.compare_property().
This changes function pointer NMSettingClass.compare_property(),
which is public API. However, no user can actually use this (and shall
not!), because _nm_setting_class_commit_full() etc. is private API. A
user outside of libnm-core cannot create his/her own subclasses of
NMSetting, and never could in the past. So, this API/ABI change doesn't
matter.
2019-01-09 09:08:39 +01:00
|
|
|
static NMTernary
|
|
|
|
|
compare_property (const NMSettInfoSetting *sett_info,
|
|
|
|
|
guint property_idx,
|
|
|
|
|
NMSetting *setting,
|
2016-03-11 13:17:24 +01:00
|
|
|
NMSetting *other,
|
|
|
|
|
NMSettingCompareFlags flags)
|
|
|
|
|
{
|
libnm: rework compare_property() implementation for NMSetting
NMSetting's compare_property() has and had two callers:
nm_setting_compare() and nm_setting_diff().
compare_property() accepts a NMSettingCompareFlags argument, but
at the same time, both callers have another complex (and
inconsistent!) set of pre-checks for shortcuting the call of
compare_property(): should_compare_prop().
Merge should_compare_prop() into compare_property(). This way,
nm_setting_compare() and nm_setting_diff() has less additional
code, and are simpler to follow. Especially nm_setting_compare()
is now trivial. And nm_setting_diff() is still complicated, but
not related to the question how the property compares or whether
it should be compared at all.
If you want to know whether it should be compared, all you need to do
now is follow NMSettingClass.compare_property().
This changes function pointer NMSettingClass.compare_property(),
which is public API. However, no user can actually use this (and shall
not!), because _nm_setting_class_commit_full() etc. is private API. A
user outside of libnm-core cannot create his/her own subclasses of
NMSetting, and never could in the past. So, this API/ABI change doesn't
matter.
2019-01-09 09:08:39 +01:00
|
|
|
NMSettingTeamPortPrivate *a_priv;
|
|
|
|
|
NMSettingTeamPortPrivate *b_priv;
|
2016-03-11 13:17:24 +01:00
|
|
|
|
libnm: rework compare_property() implementation for NMSetting
NMSetting's compare_property() has and had two callers:
nm_setting_compare() and nm_setting_diff().
compare_property() accepts a NMSettingCompareFlags argument, but
at the same time, both callers have another complex (and
inconsistent!) set of pre-checks for shortcuting the call of
compare_property(): should_compare_prop().
Merge should_compare_prop() into compare_property(). This way,
nm_setting_compare() and nm_setting_diff() has less additional
code, and are simpler to follow. Especially nm_setting_compare()
is now trivial. And nm_setting_diff() is still complicated, but
not related to the question how the property compares or whether
it should be compared at all.
If you want to know whether it should be compared, all you need to do
now is follow NMSettingClass.compare_property().
This changes function pointer NMSettingClass.compare_property(),
which is public API. However, no user can actually use this (and shall
not!), because _nm_setting_class_commit_full() etc. is private API. A
user outside of libnm-core cannot create his/her own subclasses of
NMSetting, and never could in the past. So, this API/ABI change doesn't
matter.
2019-01-09 09:08:39 +01:00
|
|
|
if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_PORT_LINK_WATCHERS)) {
|
2017-11-16 18:54:06 +01:00
|
|
|
|
libnm: rework compare_property() implementation for NMSetting
NMSetting's compare_property() has and had two callers:
nm_setting_compare() and nm_setting_diff().
compare_property() accepts a NMSettingCompareFlags argument, but
at the same time, both callers have another complex (and
inconsistent!) set of pre-checks for shortcuting the call of
compare_property(): should_compare_prop().
Merge should_compare_prop() into compare_property(). This way,
nm_setting_compare() and nm_setting_diff() has less additional
code, and are simpler to follow. Especially nm_setting_compare()
is now trivial. And nm_setting_diff() is still complicated, but
not related to the question how the property compares or whether
it should be compared at all.
If you want to know whether it should be compared, all you need to do
now is follow NMSettingClass.compare_property().
This changes function pointer NMSettingClass.compare_property(),
which is public API. However, no user can actually use this (and shall
not!), because _nm_setting_class_commit_full() etc. is private API. A
user outside of libnm-core cannot create his/her own subclasses of
NMSetting, and never could in the past. So, this API/ABI change doesn't
matter.
2019-01-09 09:08:39 +01:00
|
|
|
if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE))
|
|
|
|
|
return NM_TERNARY_DEFAULT;
|
2019-03-21 11:30:21 +01:00
|
|
|
if (!other)
|
|
|
|
|
return TRUE;
|
|
|
|
|
a_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
b_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (other);
|
|
|
|
|
return _nm_team_link_watchers_equal (a_priv->link_watchers,
|
|
|
|
|
b_priv->link_watchers,
|
|
|
|
|
TRUE);
|
2017-11-16 18:54:06 +01:00
|
|
|
}
|
2016-03-11 13:17:24 +01:00
|
|
|
|
libnm: rework compare_property() implementation for NMSetting
NMSetting's compare_property() has and had two callers:
nm_setting_compare() and nm_setting_diff().
compare_property() accepts a NMSettingCompareFlags argument, but
at the same time, both callers have another complex (and
inconsistent!) set of pre-checks for shortcuting the call of
compare_property(): should_compare_prop().
Merge should_compare_prop() into compare_property(). This way,
nm_setting_compare() and nm_setting_diff() has less additional
code, and are simpler to follow. Especially nm_setting_compare()
is now trivial. And nm_setting_diff() is still complicated, but
not related to the question how the property compares or whether
it should be compared at all.
If you want to know whether it should be compared, all you need to do
now is follow NMSettingClass.compare_property().
This changes function pointer NMSettingClass.compare_property(),
which is public API. However, no user can actually use this (and shall
not!), because _nm_setting_class_commit_full() etc. is private API. A
user outside of libnm-core cannot create his/her own subclasses of
NMSetting, and never could in the past. So, this API/ABI change doesn't
matter.
2019-01-09 09:08:39 +01:00
|
|
|
if (nm_streq (sett_info->property_infos[property_idx].name, NM_SETTING_TEAM_PORT_CONFIG)) {
|
|
|
|
|
if (other) {
|
|
|
|
|
a_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
b_priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (other);
|
|
|
|
|
|
|
|
|
|
if (NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)) {
|
|
|
|
|
/* If we are trying to match a connection in order to assume it (and thus
|
|
|
|
|
* @flags contains INFERRABLE), use the "relaxed" matching for team
|
|
|
|
|
* configuration. Otherwise, for all other purposes (including connection
|
|
|
|
|
* comparison before an update), resort to the default string comparison. */
|
|
|
|
|
return _nm_utils_team_config_equal (a_priv->config,
|
|
|
|
|
b_priv->config,
|
|
|
|
|
TRUE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nm_streq0 (a_priv->config, b_priv->config);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_CLASS (nm_setting_team_port_parent_class)->compare_property (sett_info,
|
|
|
|
|
property_idx,
|
|
|
|
|
setting,
|
|
|
|
|
other,
|
|
|
|
|
flags);
|
2016-03-11 13:17:24 +01:00
|
|
|
}
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
static void
|
2019-01-11 08:32:54 +01:00
|
|
|
get_property (GObject *object, guint prop_id,
|
|
|
|
|
GValue *value, GParamSpec *pspec)
|
2014-07-24 08:53:33 -04:00
|
|
|
{
|
2019-01-11 08:32:54 +01:00
|
|
|
NMSettingTeamPort *setting = NM_SETTING_TEAM_PORT (object);
|
2017-10-30 12:27:58 +01:00
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_CONFIG:
|
|
|
|
|
g_value_set_string (value, nm_setting_team_port_get_config (setting));
|
|
|
|
|
break;
|
|
|
|
|
case PROP_QUEUE_ID:
|
|
|
|
|
g_value_set_int (value, priv->queue_id);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_PRIO:
|
|
|
|
|
g_value_set_int (value, priv->prio);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_STICKY:
|
|
|
|
|
g_value_set_boolean (value, priv->sticky);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_LACP_PRIO:
|
|
|
|
|
g_value_set_int (value, priv->lacp_prio);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_LACP_KEY:
|
|
|
|
|
g_value_set_int (value, priv->lacp_key);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_LINK_WATCHERS:
|
|
|
|
|
g_value_take_boxed (value, _nm_utils_copy_array (priv->link_watchers,
|
|
|
|
|
(NMUtilsCopyFunc) nm_team_link_watcher_dup,
|
|
|
|
|
(GDestroyNotify) nm_team_link_watcher_unref));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2014-07-24 08:53:33 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_property (GObject *object, guint prop_id,
|
|
|
|
|
const GValue *value, GParamSpec *pspec)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (object);
|
2017-10-30 16:24:04 +01:00
|
|
|
const GValue *align_value = NULL;
|
|
|
|
|
gboolean align_config = FALSE;
|
2014-07-24 08:53:33 -04:00
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
#define JSON_TO_VAL(typ, id) _nm_utils_json_extract_##typ (priv->config, _prop_to_keys[id], TRUE)
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_CONFIG:
|
2015-02-07 17:21:30 +01:00
|
|
|
g_free (priv->config);
|
2014-07-24 08:53:33 -04:00
|
|
|
priv->config = g_value_dup_string (value);
|
2017-10-30 16:24:04 +01:00
|
|
|
priv->queue_id = JSON_TO_VAL (int, PROP_QUEUE_ID);
|
|
|
|
|
priv->prio = JSON_TO_VAL (int, PROP_PRIO);
|
|
|
|
|
priv->sticky = JSON_TO_VAL (boolean, PROP_STICKY);
|
|
|
|
|
priv->lacp_prio = JSON_TO_VAL (int, PROP_LACP_PRIO);
|
|
|
|
|
priv->lacp_key = JSON_TO_VAL (int, PROP_LACP_KEY);
|
2017-11-16 18:54:06 +01:00
|
|
|
|
|
|
|
|
g_ptr_array_unref (priv->link_watchers);
|
|
|
|
|
priv->link_watchers = JSON_TO_VAL (ptr_array, PROP_LINK_WATCHERS);
|
2014-07-24 08:53:33 -04:00
|
|
|
break;
|
2017-10-30 12:27:58 +01:00
|
|
|
case PROP_QUEUE_ID:
|
2017-10-30 16:24:04 +01:00
|
|
|
if (priv->queue_id == g_value_get_int (value))
|
|
|
|
|
break;
|
2017-10-30 12:27:58 +01:00
|
|
|
priv->queue_id = g_value_get_int (value);
|
2017-11-08 18:10:27 +01:00
|
|
|
if (priv->queue_id != NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT)
|
2017-10-30 16:24:04 +01:00
|
|
|
align_value = value;
|
|
|
|
|
align_config = TRUE;
|
2017-10-30 12:27:58 +01:00
|
|
|
break;
|
|
|
|
|
case PROP_PRIO:
|
2017-10-30 16:24:04 +01:00
|
|
|
if (priv->prio == g_value_get_int (value))
|
|
|
|
|
break;
|
2017-10-30 12:27:58 +01:00
|
|
|
priv->prio = g_value_get_int (value);
|
2017-10-30 16:24:04 +01:00
|
|
|
if (priv->prio)
|
|
|
|
|
align_value = value;
|
|
|
|
|
align_config = TRUE;
|
2017-10-30 12:27:58 +01:00
|
|
|
break;
|
|
|
|
|
case PROP_STICKY:
|
2017-10-30 16:24:04 +01:00
|
|
|
if (priv->sticky == g_value_get_boolean (value))
|
|
|
|
|
break;
|
2017-10-30 12:27:58 +01:00
|
|
|
priv->sticky = g_value_get_boolean (value);
|
2017-10-30 16:24:04 +01:00
|
|
|
if (priv->sticky)
|
|
|
|
|
align_value = value;
|
|
|
|
|
align_config = TRUE;
|
2017-10-30 12:27:58 +01:00
|
|
|
break;
|
|
|
|
|
case PROP_LACP_PRIO:
|
2017-10-30 16:24:04 +01:00
|
|
|
if (priv->lacp_prio == g_value_get_int (value))
|
|
|
|
|
break;
|
2017-10-30 12:27:58 +01:00
|
|
|
priv->lacp_prio = g_value_get_int (value);
|
2017-10-30 16:24:04 +01:00
|
|
|
/* from libteam sources: lacp_prio default value is 0xff */
|
2017-11-08 18:10:27 +01:00
|
|
|
if (priv->lacp_prio != NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT)
|
2017-10-30 16:24:04 +01:00
|
|
|
align_value = value;
|
|
|
|
|
align_config = TRUE;
|
2017-10-30 12:27:58 +01:00
|
|
|
break;
|
|
|
|
|
case PROP_LACP_KEY:
|
2017-10-30 16:24:04 +01:00
|
|
|
if (priv->lacp_key == g_value_get_int (value))
|
|
|
|
|
break;
|
2017-10-30 12:27:58 +01:00
|
|
|
priv->lacp_key = g_value_get_int (value);
|
2017-11-08 18:10:27 +01:00
|
|
|
if (priv->lacp_key)
|
2017-10-30 16:24:04 +01:00
|
|
|
align_value = value;
|
|
|
|
|
align_config = TRUE;
|
2017-10-30 12:27:58 +01:00
|
|
|
break;
|
2017-11-16 18:54:06 +01:00
|
|
|
case PROP_LINK_WATCHERS:
|
|
|
|
|
g_ptr_array_unref (priv->link_watchers);
|
|
|
|
|
priv->link_watchers = _nm_utils_copy_array (g_value_get_boxed (value),
|
|
|
|
|
(NMUtilsCopyFunc) nm_team_link_watcher_dup,
|
|
|
|
|
(GDestroyNotify) nm_team_link_watcher_unref);
|
|
|
|
|
if (priv->link_watchers->len)
|
|
|
|
|
align_value = value;
|
|
|
|
|
align_config = TRUE;
|
|
|
|
|
break;
|
2014-07-24 08:53:33 -04:00
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2017-10-30 16:24:04 +01:00
|
|
|
if (align_config)
|
|
|
|
|
_nm_utils_json_append_gvalue (&priv->config, _prop_to_keys[prop_id], align_value);
|
2014-07-24 08:53:33 -04:00
|
|
|
}
|
|
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
static void
|
2019-01-11 08:32:54 +01:00
|
|
|
nm_setting_team_port_init (NMSettingTeamPort *setting)
|
2014-07-24 08:53:33 -04:00
|
|
|
{
|
2017-10-30 12:27:58 +01:00
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (setting);
|
2014-07-24 08:53:33 -04:00
|
|
|
|
2019-01-11 08:32:54 +01:00
|
|
|
priv->queue_id = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT;
|
|
|
|
|
priv->lacp_prio = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT;
|
|
|
|
|
priv->link_watchers = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_team_link_watcher_unref);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_team_port_new:
|
|
|
|
|
*
|
|
|
|
|
* Creates a new #NMSettingTeamPort object with default values.
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): the new empty #NMSettingTeamPort object
|
|
|
|
|
**/
|
|
|
|
|
NMSetting *
|
|
|
|
|
nm_setting_team_port_new (void)
|
|
|
|
|
{
|
|
|
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_TEAM_PORT, NULL);
|
2014-07-24 08:53:33 -04:00
|
|
|
}
|
|
|
|
|
|
2015-02-07 17:21:30 +01:00
|
|
|
static void
|
|
|
|
|
finalize (GObject *object)
|
|
|
|
|
{
|
|
|
|
|
NMSettingTeamPortPrivate *priv = NM_SETTING_TEAM_PORT_GET_PRIVATE (object);
|
|
|
|
|
|
|
|
|
|
g_free (priv->config);
|
2017-11-16 18:54:06 +01:00
|
|
|
g_ptr_array_unref (priv->link_watchers);
|
2015-02-07 17:21:30 +01:00
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (nm_setting_team_port_parent_class)->finalize (object);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
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_team_port_class_init (NMSettingTeamPortClass *klass)
|
2014-07-24 08:53:33 -04: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);
|
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
|
|
|
GArray *properties_override = _nm_sett_info_property_override_create_array ();
|
2014-07-24 08:53:33 -04: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 (NMSettingTeamPortPrivate));
|
2014-07-24 08:53:33 -04:00
|
|
|
|
2016-03-11 13:17:24 +01:00
|
|
|
object_class->get_property = get_property;
|
2019-01-11 08:32:54 +01:00
|
|
|
object_class->set_property = set_property;
|
2016-03-11 13:17:24 +01:00
|
|
|
object_class->finalize = finalize;
|
2014-07-24 08:53:33 -04: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
|
|
|
setting_class->compare_property = compare_property;
|
|
|
|
|
setting_class->verify = verify;
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
/**
|
|
|
|
|
* NMSettingTeamPort:config:
|
|
|
|
|
*
|
|
|
|
|
* The JSON configuration for the team port. The property should contain raw
|
|
|
|
|
* JSON configuration data suitable for teamd, because the value is passed
|
|
|
|
|
* directly to teamd. If not specified, the default configuration is
|
|
|
|
|
* used. See man teamd.conf for the format details.
|
|
|
|
|
**/
|
libnm, libnm-util: move settings doc generation to libnm-core
Move the settings/plugins doc generation from libnm-util to
libnm-core, since libnm-util isn't being updated for all new
properties.
With this commit, the keyfile and ifcfg-rh documentation is basically
unchanged, except that deprecated properties are now gone, and new
properties have been added, and the sections are in a different order.
(generate-plugin-docs.pl just outputs the settings in Makefile order,
and they were unsorted in libnm-util, but are sorted in libnm-core).
The settings documentation used for nm-settings.5, the D-Bus API docs,
and the nmcli help is changed a bit more at this point, and mostly for
the worse, since the libnm-core setting properties don't match up with
the D-Bus API as well as the libnm-util ones do. To be fixed...
(I also removed the "plugins docs" line in each plugin docs comment
block while moving them, since those blocks will be used for more than
just plugins soon, and it's sort of obvious anyway.)
2014-10-28 09:58:25 -04:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
|
* property: config
|
|
|
|
|
* variable: TEAM_PORT_CONFIG
|
|
|
|
|
* description: Team port configuration in JSON. See man teamd.conf for details.
|
|
|
|
|
* ---end---
|
|
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_CONFIG] =
|
|
|
|
|
g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "",
|
|
|
|
|
NULL,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2017-10-30 12:27:58 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingTeamPort:queue-id:
|
|
|
|
|
*
|
|
|
|
|
* Corresponds to the teamd ports.PORTIFNAME.queue_id.
|
|
|
|
|
* When set to -1 means the parameter is skipped from the json config.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_QUEUE_ID] =
|
|
|
|
|
g_param_spec_int (NM_SETTING_TEAM_PORT_QUEUE_ID, "", "",
|
|
|
|
|
G_MININT32, G_MAXINT32, 0,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2017-10-30 12:27:58 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingTeamPort:prio:
|
|
|
|
|
*
|
|
|
|
|
* Corresponds to the teamd ports.PORTIFNAME.prio.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_PRIO] =
|
|
|
|
|
g_param_spec_int (NM_SETTING_TEAM_PORT_PRIO, "", "",
|
|
|
|
|
G_MININT32, G_MAXINT32, 0,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2017-10-30 12:27:58 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingTeamPort:sticky:
|
|
|
|
|
*
|
|
|
|
|
* Corresponds to the teamd ports.PORTIFNAME.sticky.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_STICKY] =
|
|
|
|
|
g_param_spec_boolean (NM_SETTING_TEAM_PORT_STICKY, "", "",
|
|
|
|
|
FALSE,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2017-10-30 12:27:58 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingTeamPort:lacp-prio:
|
|
|
|
|
*
|
|
|
|
|
* Corresponds to the teamd ports.PORTIFNAME.lacp_prio.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_LACP_PRIO] =
|
|
|
|
|
g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_PRIO, "", "",
|
|
|
|
|
G_MININT32, G_MAXINT32, 0,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2017-10-30 12:27:58 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingTeamPort:lacp-key:
|
|
|
|
|
*
|
|
|
|
|
* Corresponds to the teamd ports.PORTIFNAME.lacp_key.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_LACP_KEY] =
|
|
|
|
|
g_param_spec_int (NM_SETTING_TEAM_PORT_LACP_KEY, "", "",
|
|
|
|
|
G_MININT32, G_MAXINT32, 0,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2017-10-30 12:27:58 +01:00
|
|
|
|
2017-11-16 18:54:06 +01:00
|
|
|
/**
|
2018-03-24 15:18:21 +00:00
|
|
|
* NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher))
|
2017-11-16 18:54:06 +01:00
|
|
|
*
|
|
|
|
|
* Link watchers configuration for the connection: each link watcher is
|
|
|
|
|
* defined by a dictionary, whose keys depend upon the selected link
|
|
|
|
|
* watcher. Available link watchers are 'ethtool', 'nsna_ping' and
|
|
|
|
|
* 'arp_ping' and it is specified in the dictionary with the key 'name'.
|
|
|
|
|
* Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait';
|
|
|
|
|
* nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host';
|
|
|
|
|
* arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
|
2018-09-30 11:30:18 -03:00
|
|
|
* 'validate-inactive', 'send-always'. See teamd.conf man for more details.
|
2017-11-16 18:54:06 +01:00
|
|
|
*
|
|
|
|
|
* Since: 1.12
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_LINK_WATCHERS] =
|
|
|
|
|
g_param_spec_boxed (NM_SETTING_TEAM_PORT_LINK_WATCHERS, "", "",
|
|
|
|
|
G_TYPE_PTR_ARRAY,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2017-10-30 12:27:58 +01: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
|
|
|
_properties_override_add_transform (properties_override,
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_LINK_WATCHERS],
|
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
|
|
|
G_VARIANT_TYPE ("aa{sv}"),
|
|
|
|
|
team_link_watchers_to_dbus,
|
|
|
|
|
team_link_watchers_from_dbus);
|
|
|
|
|
|
2019-01-11 08:28:26 +01:00
|
|
|
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_full (setting_class, NM_META_SETTING_TYPE_TEAM_PORT,
|
|
|
|
|
NULL, properties_override);
|
2014-07-24 08:53:33 -04:00
|
|
|
}
|