2014-07-24 12:53:33 +00: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.
|
|
|
|
*
|
|
|
|
* Copyright 2011 - 2014 Red Hat, Inc.
|
|
|
|
*/
|
|
|
|
|
2016-02-12 13:44:52 +00:00
|
|
|
#include "nm-default.h"
|
2016-02-19 13:57:48 +00:00
|
|
|
|
2016-02-12 13:44:52 +00:00
|
|
|
#include "nm-setting-vlan.h"
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "nm-utils.h"
|
2015-10-30 10:09:41 +00:00
|
|
|
#include "nm-core-types-internal.h"
|
2014-07-24 12:53:33 +00:00
|
|
|
#include "nm-setting-connection.h"
|
|
|
|
#include "nm-setting-private.h"
|
2014-10-22 02:09:52 +00:00
|
|
|
#include "nm-setting-wired.h"
|
2014-10-22 02:30:31 +00:00
|
|
|
#include "nm-connection-private.h"
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* SECTION:nm-setting-vlan
|
|
|
|
* @short_description: Describes connection properties for VLAN interfaces
|
|
|
|
*
|
|
|
|
* The #NMSettingVlan object is a #NMSetting subclass that describes properties
|
|
|
|
* necessary for connection to VLAN interfaces.
|
|
|
|
**/
|
|
|
|
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (NMSettingVlan, nm_setting_vlan, NM_TYPE_SETTING,
|
2014-08-07 21:19:40 +00:00
|
|
|
_nm_register_setting (VLAN, 1))
|
2014-07-24 12:53:33 +00:00
|
|
|
NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_VLAN)
|
|
|
|
|
|
|
|
#define NM_SETTING_VLAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VLAN, NMSettingVlanPrivate))
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
char *parent;
|
|
|
|
guint32 id;
|
|
|
|
guint32 flags;
|
|
|
|
GSList *ingress_priority_map;
|
|
|
|
GSList *egress_priority_map;
|
|
|
|
} NMSettingVlanPrivate;
|
|
|
|
|
|
|
|
enum {
|
|
|
|
PROP_0,
|
|
|
|
PROP_PARENT,
|
|
|
|
PROP_ID,
|
|
|
|
PROP_FLAGS,
|
|
|
|
PROP_INGRESS_PRIORITY_MAP,
|
|
|
|
PROP_EGRESS_PRIORITY_MAP,
|
|
|
|
LAST_PROP
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MAX_SKB_PRIO G_MAXUINT32
|
|
|
|
#define MAX_8021P_PRIO 7 /* Max 802.1p priority */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_new:
|
|
|
|
*
|
|
|
|
* Creates a new #NMSettingVlan object with default values.
|
|
|
|
*
|
|
|
|
* Returns: (transfer full): the new empty #NMSettingVlan object
|
|
|
|
**/
|
|
|
|
NMSetting *
|
|
|
|
nm_setting_vlan_new (void)
|
|
|
|
{
|
|
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_VLAN, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_get_parent:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
*
|
|
|
|
* Returns: the #NMSettingVlan:parent property of the setting
|
|
|
|
**/
|
|
|
|
const char *
|
|
|
|
nm_setting_vlan_get_parent (NMSettingVlan *setting)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), NULL);
|
|
|
|
return NM_SETTING_VLAN_GET_PRIVATE (setting)->parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_get_id:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
*
|
|
|
|
* Returns: the #NMSettingVlan:id property of the setting
|
|
|
|
**/
|
|
|
|
guint32
|
|
|
|
nm_setting_vlan_get_id (NMSettingVlan *setting)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), 0);
|
|
|
|
return NM_SETTING_VLAN_GET_PRIVATE (setting)->id;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_get_flags:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
*
|
|
|
|
* Returns: the #NMSettingVlan:flags property of the setting
|
|
|
|
**/
|
|
|
|
guint32
|
|
|
|
nm_setting_vlan_get_flags (NMSettingVlan *setting)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), 0);
|
|
|
|
return NM_SETTING_VLAN_GET_PRIVATE (setting)->flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
static guint32
|
|
|
|
get_max_prio (NMVlanPriorityMap map, gboolean from)
|
|
|
|
{
|
|
|
|
if (map == NM_VLAN_INGRESS_MAP)
|
|
|
|
return from ? MAX_8021P_PRIO : MAX_SKB_PRIO;
|
|
|
|
else if (map == NM_VLAN_EGRESS_MAP)
|
|
|
|
return from ? MAX_SKB_PRIO : MAX_8021P_PRIO;
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
|
|
|
|
2015-10-30 10:09:41 +00:00
|
|
|
static NMVlanQosMapping *
|
2014-07-24 12:53:33 +00:00
|
|
|
priority_map_new_from_str (NMVlanPriorityMap map, const char *str)
|
|
|
|
{
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *p = NULL;
|
2014-07-24 12:53:33 +00:00
|
|
|
gchar **t = NULL;
|
|
|
|
guint32 len;
|
|
|
|
guint64 from, to;
|
|
|
|
|
|
|
|
g_return_val_if_fail (str && str[0], NULL);
|
|
|
|
|
|
|
|
t = g_strsplit (str, ":", 0);
|
|
|
|
len = g_strv_length (t);
|
|
|
|
if (len == 2) {
|
|
|
|
from = g_ascii_strtoull (t[0], NULL, 10);
|
|
|
|
to = g_ascii_strtoull (t[1], NULL, 10);
|
|
|
|
|
|
|
|
if ((from <= get_max_prio (map, TRUE)) && (to <= get_max_prio (map, FALSE))) {
|
2015-10-30 10:09:41 +00:00
|
|
|
p = g_malloc0 (sizeof (NMVlanQosMapping));
|
2014-07-24 12:53:33 +00:00
|
|
|
p->from = from;
|
|
|
|
p->to = to;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Warn */
|
|
|
|
g_warn_if_fail (len == 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_strfreev (t);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-10-30 10:09:41 +00:00
|
|
|
priority_map_free (NMVlanQosMapping *map)
|
2014-07-24 12:53:33 +00:00
|
|
|
{
|
|
|
|
g_return_if_fail (map != NULL);
|
|
|
|
g_free (map);
|
|
|
|
}
|
|
|
|
|
|
|
|
static GSList *
|
|
|
|
get_map (NMSettingVlan *self, NMVlanPriorityMap map)
|
|
|
|
{
|
|
|
|
if (map == NM_VLAN_INGRESS_MAP)
|
|
|
|
return NM_SETTING_VLAN_GET_PRIVATE (self)->ingress_priority_map;
|
|
|
|
else if (map == NM_VLAN_EGRESS_MAP)
|
|
|
|
return NM_SETTING_VLAN_GET_PRIVATE (self)->egress_priority_map;
|
|
|
|
g_assert_not_reached ();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-10-12 14:06:05 +00:00
|
|
|
static gint
|
2015-10-30 11:07:37 +00:00
|
|
|
prio_map_compare (gconstpointer p_a, gconstpointer p_b)
|
2015-10-12 14:06:05 +00:00
|
|
|
{
|
2015-10-30 11:07:37 +00:00
|
|
|
const NMVlanQosMapping *a = p_a;
|
|
|
|
const NMVlanQosMapping *b = p_b;
|
|
|
|
|
2015-10-12 14:06:05 +00:00
|
|
|
return a->from < b->from
|
|
|
|
? -1
|
|
|
|
: (a->from > b->from
|
|
|
|
? 1
|
|
|
|
: (a->to < b->to ? -1 : (a->to > b->to ? 1 : 0)));
|
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
static void
|
|
|
|
set_map (NMSettingVlan *self, NMVlanPriorityMap map, GSList *list)
|
|
|
|
{
|
2015-10-30 11:07:37 +00:00
|
|
|
/* Assert that the list is sorted */
|
|
|
|
#if NM_MORE_ASSERTS >= 2
|
|
|
|
{
|
|
|
|
GSList *iter, *last;
|
|
|
|
|
|
|
|
last = list;
|
|
|
|
iter = list ? list->next : NULL;
|
|
|
|
while (iter) {
|
|
|
|
const NMVlanQosMapping *l = last->data;
|
|
|
|
const NMVlanQosMapping *m = iter->data;
|
|
|
|
|
|
|
|
nm_assert (prio_map_compare (last->data, iter->data) < 0);
|
|
|
|
|
|
|
|
/* Also reject duplicates (based on "from") */
|
|
|
|
nm_assert (l->from < m->from);
|
|
|
|
|
|
|
|
last = iter;
|
|
|
|
iter = iter->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2015-10-12 14:06:05 +00:00
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
if (map == NM_VLAN_INGRESS_MAP) {
|
|
|
|
NM_SETTING_VLAN_GET_PRIVATE (self)->ingress_priority_map = list;
|
|
|
|
g_object_notify (G_OBJECT (self), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP);
|
|
|
|
} else if (map == NM_VLAN_EGRESS_MAP) {
|
|
|
|
NM_SETTING_VLAN_GET_PRIVATE (self)->egress_priority_map = list;
|
|
|
|
g_object_notify (G_OBJECT (self), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP);
|
|
|
|
} else
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
|
|
|
|
2015-10-12 13:33:43 +00:00
|
|
|
static gboolean
|
|
|
|
check_replace_duplicate_priority (GSList *list, guint32 from, guint32 to)
|
|
|
|
{
|
|
|
|
GSList *iter;
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *p;
|
2015-10-12 13:33:43 +00:00
|
|
|
|
|
|
|
for (iter = list; iter; iter = g_slist_next (iter)) {
|
|
|
|
p = iter->data;
|
|
|
|
if (p->from == from) {
|
|
|
|
p->to = to;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
/**
|
|
|
|
* nm_setting_vlan_add_priority_str:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
* @str: the string which contains a priority map, like "3:7"
|
|
|
|
*
|
|
|
|
* Adds a priority map entry into either the #NMSettingVlan:ingress_priority_map
|
|
|
|
* or the #NMSettingVlan:egress_priority_map properties. The priority map maps
|
|
|
|
* the Linux SKB priorities to 802.1p priorities.
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if the entry was successfully added to the list, or it
|
|
|
|
* overwrote the old value, %FALSE if error
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
const char *str)
|
|
|
|
{
|
2015-10-12 13:33:43 +00:00
|
|
|
GSList *list = NULL;
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *item = NULL;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), FALSE);
|
|
|
|
g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, FALSE);
|
|
|
|
g_return_val_if_fail (str && str[0], FALSE);
|
|
|
|
|
|
|
|
list = get_map (setting, map);
|
|
|
|
|
|
|
|
item = priority_map_new_from_str (map, str);
|
libnm-core: mute coverity for RESOURCE_LEAK (CWE-772) in g_return_val_if_fail()
Error: RESOURCE_LEAK (CWE-772): [#def10]
NetworkManager-0.9.11.0/libnm-core/nm-setting-vlan.c:225: alloc_fn: Storage is returned from allocation function "priority_map_new_from_str".
NetworkManager-0.9.11.0/libnm-core/nm-setting-vlan.c:154:4: alloc_fn: Storage is returned from allocation function "g_malloc0".
NetworkManager-0.9.11.0/libnm-core/nm-setting-vlan.c:154:4: var_assign: Assigning: "p" = "g_malloc0(8UL)".
NetworkManager-0.9.11.0/libnm-core/nm-setting-vlan.c:164:2: return_alloc: Returning allocated memory "p".
NetworkManager-0.9.11.0/libnm-core/nm-setting-vlan.c:225: var_assign: Assigning: "item" = storage returned from "priority_map_new_from_str(map, str)".
NetworkManager-0.9.11.0/libnm-core/nm-setting-vlan.c:226: leaked_storage: Variable "item" going out of scope leaks the storage it points to.
Error: RESOURCE_LEAK (CWE-772): [#def11]
NetworkManager-0.9.11.0/libnm-core/nm-utils.c:2056: alloc_fn: Storage is returned from allocation function "crypto_make_des_aes_key".
NetworkManager-0.9.11.0/libnm-core/crypto.c:405:2: alloc_fn: Storage is returned from allocation function "g_malloc0".
NetworkManager-0.9.11.0/libnm-core/crypto.c:405:2: var_assign: Assigning: "key" = "g_malloc0(digest_len + 1U)".
NetworkManager-0.9.11.0/libnm-core/crypto.c:407:2: noescape: Resource "key" is not freed or pointed-to in function "crypto_md5_hash".
NetworkManager-0.9.11.0/libnm-core/crypto.c:769:24: noescape: "crypto_md5_hash(char const *, gssize, char const *, gssize, char *, gsize)" does not free or save its pointer parameter "buffer".
NetworkManager-0.9.11.0/libnm-core/crypto.c:415:2: return_alloc: Returning allocated memory "key".
NetworkManager-0.9.11.0/libnm-core/nm-utils.c:2056: var_assign: Assigning: "key" = storage returned from "crypto_make_des_aes_key("DES-EDE3-CBC", &salt[0], salt_len, in_password, &key_len, NULL)".
NetworkManager-0.9.11.0/libnm-core/nm-utils.c:2057: leaked_storage: Variable "key" going out of scope leaks the storage it points to.
2014-12-12 13:31:27 +00:00
|
|
|
if (!item)
|
|
|
|
g_return_val_if_reached (FALSE);
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
/* Duplicates get replaced */
|
2015-10-12 13:33:43 +00:00
|
|
|
if (check_replace_duplicate_priority (list, item->from, item->to)) {
|
|
|
|
g_free (item);
|
|
|
|
if (map == NM_VLAN_INGRESS_MAP)
|
|
|
|
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP);
|
|
|
|
else
|
|
|
|
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP);
|
|
|
|
return TRUE;
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
|
|
|
|
2015-10-30 11:07:37 +00:00
|
|
|
set_map (setting, map, g_slist_insert_sorted (list, item, prio_map_compare));
|
2014-07-24 12:53:33 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_get_num_priorities:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
*
|
|
|
|
* Returns the number of entires in the
|
|
|
|
* #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map
|
|
|
|
* properties of this setting.
|
|
|
|
*
|
|
|
|
* Returns: return the number of ingress/egress priority entries, -1 if error
|
|
|
|
**/
|
|
|
|
gint32
|
|
|
|
nm_setting_vlan_get_num_priorities (NMSettingVlan *setting, NMVlanPriorityMap map)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), -1);
|
|
|
|
g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, -1);
|
|
|
|
|
|
|
|
return g_slist_length (get_map (setting, map));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_get_priority:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
* @idx: the zero-based index of the ingress/egress priority map entry
|
|
|
|
* @out_from: (out): on return the value of the priority map's 'from' item
|
|
|
|
* @out_to: (out): on return the value of priority map's 'to' item
|
|
|
|
*
|
|
|
|
* Retrieve one of the entries of the #NMSettingVlan:ingress_priority_map
|
|
|
|
* or #NMSettingVlan:egress_priority_map properties of this setting.
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if a priority map was returned, %FALSE if error
|
|
|
|
**/
|
|
|
|
gboolean
|
|
|
|
nm_setting_vlan_get_priority (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
guint32 idx,
|
|
|
|
guint32 *out_from,
|
|
|
|
guint32 *out_to)
|
|
|
|
{
|
|
|
|
GSList *list = NULL;
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *item = NULL;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), FALSE);
|
|
|
|
g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, FALSE);
|
|
|
|
g_return_val_if_fail (out_from != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (out_to != NULL, FALSE);
|
|
|
|
|
|
|
|
list = get_map (setting, map);
|
|
|
|
g_return_val_if_fail (idx < g_slist_length (list), FALSE);
|
|
|
|
|
|
|
|
item = g_slist_nth_data (list, idx);
|
|
|
|
g_assert (item);
|
|
|
|
*out_from = item->from;
|
|
|
|
*out_to = item->to;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_add_priority:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
* @from: the priority to map to @to
|
|
|
|
* @to: the priority to map @from to
|
|
|
|
*
|
|
|
|
* Adds a priority mapping to the #NMSettingVlan:ingress_priority_map or
|
|
|
|
* #NMSettingVlan:egress_priority_map properties of the setting. If @from is
|
|
|
|
* already in the given priority map, this function will overwrite the
|
|
|
|
* existing entry with the new @to.
|
|
|
|
*
|
|
|
|
* If @map is #NM_VLAN_INGRESS_MAP then @from is the incoming 802.1q VLAN
|
|
|
|
* Priority Code Point (PCP) value, and @to is the Linux SKB priority value.
|
|
|
|
*
|
|
|
|
* If @map is #NM_VLAN_EGRESS_MAP then @from is the Linux SKB priority value and
|
|
|
|
* @to is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if the new priority mapping was successfully added to the
|
|
|
|
* list, %FALSE if error
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
nm_setting_vlan_add_priority (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
guint32 from,
|
|
|
|
guint32 to)
|
|
|
|
{
|
2015-10-12 13:33:43 +00:00
|
|
|
GSList *list = NULL;
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *item;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), FALSE);
|
|
|
|
g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, FALSE);
|
|
|
|
|
|
|
|
list = get_map (setting, map);
|
2015-10-12 13:33:43 +00:00
|
|
|
if (check_replace_duplicate_priority (list, from, to)) {
|
|
|
|
if (map == NM_VLAN_INGRESS_MAP)
|
|
|
|
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_INGRESS_PRIORITY_MAP);
|
|
|
|
else
|
|
|
|
g_object_notify (G_OBJECT (setting), NM_SETTING_VLAN_EGRESS_PRIORITY_MAP);
|
|
|
|
return TRUE;
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
|
|
|
|
2015-10-30 10:09:41 +00:00
|
|
|
item = g_malloc0 (sizeof (NMVlanQosMapping));
|
2014-07-24 12:53:33 +00:00
|
|
|
item->from = from;
|
|
|
|
item->to = to;
|
2015-10-30 11:07:37 +00:00
|
|
|
set_map (setting, map, g_slist_insert_sorted (list, item, prio_map_compare));
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2015-10-30 10:02:44 +00:00
|
|
|
gboolean
|
|
|
|
_nm_setting_vlan_set_priorities (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
const NMVlanQosMapping *qos_map,
|
|
|
|
guint n_qos_map)
|
|
|
|
{
|
|
|
|
gboolean has_changes = FALSE;
|
|
|
|
GSList *map_prev, *map_new;
|
|
|
|
guint i;
|
|
|
|
gint64 from_last;
|
|
|
|
|
|
|
|
map_prev = get_map (setting, map);
|
|
|
|
|
|
|
|
if (n_qos_map != g_slist_length (map_prev))
|
|
|
|
has_changes = TRUE;
|
|
|
|
else {
|
|
|
|
const GSList *iter;
|
|
|
|
|
|
|
|
iter = map_prev;
|
|
|
|
for (i = 0; i < n_qos_map; i++, iter = iter->next) {
|
|
|
|
const NMVlanQosMapping *m = iter->data;
|
|
|
|
|
|
|
|
if ( m->from != qos_map[i].from
|
|
|
|
|| m->to != qos_map[i].to) {
|
|
|
|
has_changes = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!has_changes)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
map_new = NULL;
|
|
|
|
from_last = G_MAXINT64;
|
|
|
|
for (i = n_qos_map; i > 0;) {
|
|
|
|
const NMVlanQosMapping *m = &qos_map[--i];
|
|
|
|
NMVlanQosMapping *item;
|
|
|
|
|
|
|
|
/* We require the array to be presorted. */
|
|
|
|
if (m->from >= from_last)
|
|
|
|
g_return_val_if_reached (FALSE);
|
|
|
|
from_last = m->from;
|
|
|
|
|
|
|
|
item = g_malloc0 (sizeof (NMVlanQosMapping));
|
|
|
|
item->from = m->from;
|
|
|
|
item->to = m->to;
|
|
|
|
map_new = g_slist_prepend (map_new, item);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_slist_free_full (map_prev, g_free);
|
|
|
|
set_map (setting, map, map_new);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_nm_setting_vlan_get_priorities (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
NMVlanQosMapping **out_qos_map,
|
|
|
|
guint *out_n_qos_map)
|
|
|
|
{
|
|
|
|
GSList *list;
|
|
|
|
NMVlanQosMapping *qos_map = NULL;
|
|
|
|
guint n_qos_map, i;
|
|
|
|
|
|
|
|
list = get_map (setting, map);
|
|
|
|
|
|
|
|
n_qos_map = g_slist_length (list);
|
|
|
|
|
|
|
|
if (n_qos_map > 0) {
|
|
|
|
qos_map = g_new (NMVlanQosMapping, n_qos_map);
|
|
|
|
|
|
|
|
for (i = 0; list; i++, list = list->next) {
|
|
|
|
nm_assert (i < n_qos_map);
|
|
|
|
qos_map[i] = *((const NMVlanQosMapping *) list->data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*out_qos_map = qos_map;
|
|
|
|
*out_n_qos_map = n_qos_map;
|
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
/**
|
|
|
|
* nm_setting_vlan_remove_priority:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
* @idx: the zero-based index of the priority map to remove
|
|
|
|
*
|
|
|
|
* Removes the priority map at index @idx from the
|
|
|
|
* #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map
|
|
|
|
* properties.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
nm_setting_vlan_remove_priority (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
guint32 idx)
|
|
|
|
{
|
|
|
|
GSList *list = NULL, *item = NULL;
|
|
|
|
|
|
|
|
g_return_if_fail (NM_IS_SETTING_VLAN (setting));
|
|
|
|
g_return_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP);
|
|
|
|
|
|
|
|
list = get_map (setting, map);
|
|
|
|
g_return_if_fail (idx < g_slist_length (list));
|
|
|
|
|
|
|
|
item = g_slist_nth (list, idx);
|
2015-10-30 10:09:41 +00:00
|
|
|
priority_map_free ((NMVlanQosMapping *) (item->data));
|
2014-07-24 12:53:33 +00:00
|
|
|
set_map (setting, map, g_slist_delete_link (list, item));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_remove_priority_by_value:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
* @from: the priority to map to @to
|
|
|
|
* @to: the priority to map @from to
|
|
|
|
*
|
|
|
|
* Removes the priority map @form:@to from the #NMSettingVlan:ingress_priority_map
|
|
|
|
* or #NMSettingVlan:egress_priority_map (according to @map argument)
|
|
|
|
* properties.
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if the priority mapping was found and removed; %FALSE if it was not.
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
nm_setting_vlan_remove_priority_by_value (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
guint32 from,
|
|
|
|
guint32 to)
|
|
|
|
{
|
|
|
|
GSList *list = NULL, *iter = NULL;
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *item;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), FALSE);
|
|
|
|
g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, FALSE);
|
|
|
|
|
|
|
|
list = get_map (setting, map);
|
|
|
|
for (iter = list; iter; iter = g_slist_next (iter)) {
|
|
|
|
item = iter->data;
|
|
|
|
if (item->from == from && item->to == to) {
|
2015-10-30 10:09:41 +00:00
|
|
|
priority_map_free ((NMVlanQosMapping *) (iter->data));
|
2014-07-24 12:53:33 +00:00
|
|
|
set_map (setting, map, g_slist_delete_link (list, iter));
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_remove_priority_str_by_value:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
* @str: the string which contains a priority map, like "3:7"
|
|
|
|
*
|
|
|
|
* Removes the priority map @str from the #NMSettingVlan:ingress_priority_map
|
|
|
|
* or #NMSettingVlan:egress_priority_map (according to @map argument)
|
|
|
|
* properties.
|
|
|
|
*
|
|
|
|
* Returns: %TRUE if the priority mapping was found and removed; %FALSE if it was not.
|
|
|
|
*/
|
|
|
|
gboolean
|
|
|
|
nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting,
|
|
|
|
NMVlanPriorityMap map,
|
|
|
|
const char *str)
|
|
|
|
{
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *item;
|
2014-07-24 12:53:33 +00:00
|
|
|
gboolean found;
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_VLAN (setting), FALSE);
|
|
|
|
g_return_val_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP, FALSE);
|
|
|
|
|
|
|
|
item = priority_map_new_from_str (map, str);
|
|
|
|
if (!item)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
found = nm_setting_vlan_remove_priority_by_value (setting, map, item->from, item->to);
|
|
|
|
g_free (item);
|
|
|
|
return found;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_vlan_clear_priorities:
|
|
|
|
* @setting: the #NMSettingVlan
|
|
|
|
* @map: the type of priority map
|
|
|
|
*
|
|
|
|
* Clear all the entires from #NMSettingVlan:ingress_priority_map or
|
|
|
|
* #NMSettingVlan:egress_priority_map properties.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
nm_setting_vlan_clear_priorities (NMSettingVlan *setting, NMVlanPriorityMap map)
|
|
|
|
{
|
|
|
|
GSList *list = NULL;
|
|
|
|
|
|
|
|
g_return_if_fail (NM_IS_SETTING_VLAN (setting));
|
|
|
|
g_return_if_fail (map == NM_VLAN_INGRESS_MAP || map == NM_VLAN_EGRESS_MAP);
|
|
|
|
|
|
|
|
list = get_map (setting, map);
|
|
|
|
g_slist_free_full (list, g_free);
|
|
|
|
set_map (setting, map, NULL);
|
|
|
|
}
|
|
|
|
|
2016-10-02 16:22:50 +00:00
|
|
|
/*****************************************************************************/
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
nm_setting_vlan_init (NMSettingVlan *setting)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2014-10-22 02:30:31 +00:00
|
|
|
verify (NMSetting *setting, NMConnection *connection, GError **error)
|
2014-07-24 12:53:33 +00:00
|
|
|
{
|
|
|
|
NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
|
2014-10-22 02:30:31 +00:00
|
|
|
NMSettingConnection *s_con;
|
|
|
|
NMSettingWired *s_wired;
|
|
|
|
|
|
|
|
if (connection) {
|
|
|
|
s_con = nm_connection_get_setting_connection (connection);
|
|
|
|
s_wired = nm_connection_get_setting_wired (connection);
|
|
|
|
} else {
|
|
|
|
s_con = NULL;
|
|
|
|
s_wired = NULL;
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (priv->parent) {
|
|
|
|
if (nm_utils_is_uuid (priv->parent)) {
|
|
|
|
/* If we have an NMSettingConnection:master with slave-type="vlan",
|
|
|
|
* then it must be the same UUID.
|
|
|
|
*/
|
|
|
|
if (s_con) {
|
|
|
|
const char *master = NULL, *slave_type = NULL;
|
|
|
|
|
|
|
|
slave_type = nm_setting_connection_get_slave_type (s_con);
|
|
|
|
if (!g_strcmp0 (slave_type, NM_SETTING_VLAN_SETTING_NAME))
|
|
|
|
master = nm_setting_connection_get_master (s_con);
|
|
|
|
|
|
|
|
if (master && g_strcmp0 (priv->parent, master) != 0) {
|
|
|
|
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 17:52:23 +00:00
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
2014-07-24 12:53:33 +00:00
|
|
|
_("'%s' value doesn't match '%s=%s'"),
|
|
|
|
priv->parent, NM_SETTING_CONNECTION_MASTER, master);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_PARENT);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (!nm_utils_iface_valid_name (priv->parent)) {
|
|
|
|
/* parent must be either a UUID or an interface 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 17:52:23 +00:00
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
2014-07-24 12:53:33 +00:00
|
|
|
_("'%s' is neither an UUID nor an interface name"),
|
|
|
|
priv->parent);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_PARENT);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* If parent is NULL, the parent must be specified via
|
|
|
|
* NMSettingWired:mac-address.
|
|
|
|
*/
|
2014-10-22 02:30:31 +00:00
|
|
|
if ( connection
|
2014-08-13 00:38:09 +00:00
|
|
|
&& (!s_wired || !nm_setting_wired_get_mac_address (s_wired))) {
|
2014-07-24 12:53:33 +00:00
|
|
|
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 17:52:23 +00:00
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_MISSING_PROPERTY,
|
2014-07-24 12:53:33 +00:00
|
|
|
_("property is not specified and neither is '%s:%s'"),
|
|
|
|
NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_PARENT);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-22 10:23:02 +00:00
|
|
|
if (priv->id >= 4095) {
|
|
|
|
g_set_error (error,
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
_("the vlan id must be in range 0-4094 but is %u"),
|
|
|
|
priv->id);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_ID);
|
|
|
|
}
|
|
|
|
|
2015-10-13 08:05:19 +00:00
|
|
|
if (priv->flags & ~NM_VLAN_FLAGS_ALL) {
|
2014-07-24 12:53:33 +00:00
|
|
|
g_set_error_literal (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 17:52:23 +00:00
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
2014-07-24 12:53:33 +00:00
|
|
|
_("flags are invalid"));
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_FLAGS);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2014-08-04 23:57:20 +00:00
|
|
|
return TRUE;
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
|
|
|
|
2015-10-08 07:52:48 +00:00
|
|
|
static GVariant *
|
|
|
|
_override_flags_get (NMSetting *setting, const char *property)
|
|
|
|
{
|
|
|
|
return g_variant_new_uint32 (nm_setting_vlan_get_flags ((NMSettingVlan *) setting));
|
|
|
|
}
|
|
|
|
|
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 12:42:50 +00:00
|
|
|
static gboolean
|
2015-10-08 08:02:48 +00:00
|
|
|
_override_flags_not_set (NMSetting *setting,
|
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 12:42:50 +00:00
|
|
|
GVariant *connection_dict,
|
|
|
|
const char *property,
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
GError **error)
|
2015-10-08 08:02:48 +00:00
|
|
|
{
|
|
|
|
/* we changed the default value for FLAGS. When an older client
|
|
|
|
* doesn't serialize the property, we assume it is the old default. */
|
|
|
|
g_object_set (G_OBJECT (setting),
|
|
|
|
NM_SETTING_VLAN_FLAGS, (NMVlanFlags) 0,
|
|
|
|
NULL);
|
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 12:42:50 +00:00
|
|
|
return TRUE;
|
2015-10-08 08:02:48 +00:00
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
static GSList *
|
2014-08-21 17:19:53 +00:00
|
|
|
priority_strv_to_maplist (NMVlanPriorityMap map, char **strv)
|
2014-07-24 12:53:33 +00:00
|
|
|
{
|
2014-08-21 17:19:53 +00:00
|
|
|
GSList *list = NULL;
|
|
|
|
int i;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
2015-09-01 14:06:54 +00:00
|
|
|
for (i = 0; strv && strv[i]; i++) {
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *item;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
2014-08-21 17:19:53 +00:00
|
|
|
item = priority_map_new_from_str (map, strv[i]);
|
2015-10-12 13:33:43 +00:00
|
|
|
if (item) {
|
|
|
|
if (!check_replace_duplicate_priority (list, item->from, item->to))
|
|
|
|
list = g_slist_prepend (list, item);
|
|
|
|
}
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
2015-10-30 11:07:37 +00:00
|
|
|
return g_slist_sort (list, prio_map_compare);
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
set_property (GObject *object, guint prop_id,
|
|
|
|
const GValue *value, GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
NMSettingVlan *setting = NM_SETTING_VLAN (object);
|
|
|
|
NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
case PROP_PARENT:
|
|
|
|
g_free (priv->parent);
|
|
|
|
priv->parent = g_value_dup_string (value);
|
|
|
|
break;
|
|
|
|
case PROP_ID:
|
|
|
|
priv->id = g_value_get_uint (value);
|
|
|
|
break;
|
|
|
|
case PROP_FLAGS:
|
2014-06-26 20:47:46 +00:00
|
|
|
priv->flags = g_value_get_flags (value);
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
|
|
|
case PROP_INGRESS_PRIORITY_MAP:
|
|
|
|
g_slist_free_full (priv->ingress_priority_map, g_free);
|
|
|
|
priv->ingress_priority_map =
|
2014-08-21 17:19:53 +00:00
|
|
|
priority_strv_to_maplist (NM_VLAN_INGRESS_MAP, g_value_get_boxed (value));
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
|
|
|
case PROP_EGRESS_PRIORITY_MAP:
|
|
|
|
g_slist_free_full (priv->egress_priority_map, g_free);
|
|
|
|
priv->egress_priority_map =
|
2014-08-21 17:19:53 +00:00
|
|
|
priority_strv_to_maplist (NM_VLAN_EGRESS_MAP, g_value_get_boxed (value));
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-21 17:19:53 +00:00
|
|
|
static char **
|
|
|
|
priority_maplist_to_strv (GSList *list)
|
2014-07-24 12:53:33 +00:00
|
|
|
{
|
2014-08-21 17:19:53 +00:00
|
|
|
GSList *iter;
|
|
|
|
GPtrArray *strv;
|
|
|
|
|
|
|
|
strv = g_ptr_array_new ();
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
for (iter = list; iter; iter = g_slist_next (iter)) {
|
2015-10-30 10:09:41 +00:00
|
|
|
NMVlanQosMapping *item = iter->data;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
2014-08-21 17:19:53 +00:00
|
|
|
g_ptr_array_add (strv, g_strdup_printf ("%d:%d", item->from, item->to));
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
2014-08-21 17:19:53 +00:00
|
|
|
g_ptr_array_add (strv, NULL);
|
|
|
|
|
|
|
|
return (char **) g_ptr_array_free (strv, FALSE);
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
get_property (GObject *object, guint prop_id,
|
|
|
|
GValue *value, GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
NMSettingVlan *setting = NM_SETTING_VLAN (object);
|
|
|
|
NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
case PROP_PARENT:
|
|
|
|
g_value_set_string (value, priv->parent);
|
|
|
|
break;
|
|
|
|
case PROP_ID:
|
|
|
|
g_value_set_uint (value, priv->id);
|
|
|
|
break;
|
|
|
|
case PROP_FLAGS:
|
2014-06-26 20:47:46 +00:00
|
|
|
g_value_set_flags (value, priv->flags);
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
|
|
|
case PROP_INGRESS_PRIORITY_MAP:
|
2014-08-21 17:19:53 +00:00
|
|
|
g_value_take_boxed (value, priority_maplist_to_strv (priv->ingress_priority_map));
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
|
|
|
case PROP_EGRESS_PRIORITY_MAP:
|
2014-08-21 17:19:53 +00:00
|
|
|
g_value_take_boxed (value, priority_maplist_to_strv (priv->egress_priority_map));
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
finalize (GObject *object)
|
|
|
|
{
|
|
|
|
NMSettingVlan *setting = NM_SETTING_VLAN (object);
|
|
|
|
NMSettingVlanPrivate *priv = NM_SETTING_VLAN_GET_PRIVATE (setting);
|
|
|
|
|
|
|
|
g_free (priv->parent);
|
|
|
|
g_slist_free_full (priv->ingress_priority_map, g_free);
|
|
|
|
g_slist_free_full (priv->egress_priority_map, g_free);
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (nm_setting_vlan_parent_class)->finalize (object);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
|
|
|
|
{
|
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
|
|
|
|
NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
|
|
|
|
|
|
|
|
g_type_class_add_private (setting_class, sizeof (NMSettingVlanPrivate));
|
|
|
|
|
|
|
|
/* virtual methods */
|
|
|
|
object_class->set_property = set_property;
|
|
|
|
object_class->get_property = get_property;
|
|
|
|
object_class->finalize = finalize;
|
|
|
|
parent_class->verify = verify;
|
|
|
|
|
|
|
|
/* Properties */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* NMSettingVlan:parent:
|
|
|
|
*
|
|
|
|
* If given, specifies the parent interface name or parent connection UUID
|
|
|
|
* from which this VLAN interface should be created. If this property is
|
|
|
|
* not specified, the connection must contain an #NMSettingWired setting
|
|
|
|
* with a #NMSettingWired:mac-address property.
|
|
|
|
**/
|
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 13:58:25 +00:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: parent
|
|
|
|
* variable: DEVICE or PHYSDEV
|
|
|
|
* description: Parent interface of the VLAN.
|
|
|
|
* ---end---
|
|
|
|
*/
|
2014-07-24 12:53:33 +00:00
|
|
|
g_object_class_install_property
|
|
|
|
(object_class, PROP_PARENT,
|
|
|
|
g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "",
|
|
|
|
NULL,
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
|
|
|
|
/**
|
|
|
|
* NMSettingVlan:id:
|
|
|
|
*
|
|
|
|
* The VLAN identifier that the interface created by this connection should
|
2016-01-22 10:23:02 +00:00
|
|
|
* be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
|
2014-07-24 12:53:33 +00:00
|
|
|
**/
|
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 13:58:25 +00:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: id
|
|
|
|
* variable: VLAN_ID or DEVICE
|
|
|
|
* description: VLAN identifier.
|
|
|
|
* ---end---
|
|
|
|
*/
|
2014-07-24 12:53:33 +00:00
|
|
|
g_object_class_install_property
|
|
|
|
(object_class, PROP_ID,
|
|
|
|
g_param_spec_uint (NM_SETTING_VLAN_ID, "", "",
|
|
|
|
0, 4095, 0,
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
|
|
|
|
/**
|
|
|
|
* NMSettingVlan:flags:
|
|
|
|
*
|
|
|
|
* One or more flags which control the behavior and features of the VLAN
|
|
|
|
* interface. Flags include %NM_VLAN_FLAG_REORDER_HEADERS (reordering of
|
|
|
|
* output packet headers), %NM_VLAN_FLAG_GVRP (use of the GVRP protocol),
|
|
|
|
* and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its
|
2015-10-13 08:05:19 +00:00
|
|
|
* master device's operating state). %NM_VLAN_FLAG_MVRP (use of the MVRP
|
|
|
|
* protocol).
|
2015-10-08 08:02:48 +00:00
|
|
|
*
|
|
|
|
* The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS,
|
|
|
|
* but it used to be 0. To preserve backward compatibility, the default-value
|
|
|
|
* in the D-Bus API continues to be 0 and a missing property on D-Bus
|
|
|
|
* is still considered as 0.
|
2014-07-24 12:53:33 +00:00
|
|
|
**/
|
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 13:58:25 +00:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: flags
|
2016-02-26 14:29:19 +00:00
|
|
|
* variable: GVRP, MVRP, VLAN_FLAGS
|
|
|
|
* values: "yes or "no" for GVRP and MVRP; "LOOSE_BINDING" and "NO_REORDER_HDR" for VLAN_FLAGS
|
2015-07-17 07:20:29 +00:00
|
|
|
* description: VLAN flags.
|
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 13:58:25 +00:00
|
|
|
* ---end---
|
|
|
|
*/
|
2014-07-24 12:53:33 +00:00
|
|
|
g_object_class_install_property
|
|
|
|
(object_class, PROP_FLAGS,
|
2014-06-26 20:47:46 +00:00
|
|
|
g_param_spec_flags (NM_SETTING_VLAN_FLAGS, "", "",
|
|
|
|
NM_TYPE_VLAN_FLAGS,
|
2015-08-28 14:45:42 +00:00
|
|
|
NM_VLAN_FLAG_REORDER_HEADERS,
|
2014-06-26 20:47:46 +00:00
|
|
|
G_PARAM_READWRITE |
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
2015-10-08 07:52:48 +00:00
|
|
|
_nm_setting_class_override_property (parent_class, NM_SETTING_VLAN_FLAGS,
|
|
|
|
NULL,
|
|
|
|
_override_flags_get,
|
|
|
|
NULL,
|
2015-10-08 08:02:48 +00:00
|
|
|
_override_flags_not_set);
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* NMSettingVlan:ingress-priority-map:
|
|
|
|
*
|
|
|
|
* For incoming packets, a list of mappings from 802.1p priorities to Linux
|
|
|
|
* SKB priorities. The mapping is given in the format "from:to" where both
|
|
|
|
* "from" and "to" are unsigned integers, ie "7:3".
|
|
|
|
**/
|
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 13:58:25 +00:00
|
|
|
/* ---ifcfg-rh---
|
2015-08-31 06:44:10 +00:00
|
|
|
* property: ingress-priority-map
|
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 13:58:25 +00:00
|
|
|
* variable: VLAN_INGRESS_PRIORITY_MAP
|
|
|
|
* description: Ingress priority mapping.
|
|
|
|
* example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5
|
|
|
|
* ---end---
|
|
|
|
*/
|
2014-07-24 12:53:33 +00:00
|
|
|
g_object_class_install_property
|
|
|
|
(object_class, PROP_INGRESS_PRIORITY_MAP,
|
2014-07-29 13:22:07 +00:00
|
|
|
g_param_spec_boxed (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "",
|
2014-08-21 17:19:53 +00:00
|
|
|
G_TYPE_STRV,
|
2014-07-29 13:22:07 +00:00
|
|
|
G_PARAM_READWRITE |
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* NMSettingVlan:egress-priority-map:
|
|
|
|
*
|
|
|
|
* For outgoing packets, a list of mappings from Linux SKB priorities to
|
|
|
|
* 802.1p priorities. The mapping is given in the format "from:to" where
|
|
|
|
* both "from" and "to" are unsigned integers, ie "7:3".
|
|
|
|
**/
|
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 13:58:25 +00:00
|
|
|
/* ---ifcfg-rh---
|
2015-08-31 06:44:10 +00:00
|
|
|
* property: egress-priority-map
|
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 13:58:25 +00:00
|
|
|
* variable: VLAN_EGRESS_PRIORITY_MAP
|
|
|
|
* description: Egress priority mapping.
|
|
|
|
* example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7
|
|
|
|
* ---end---
|
|
|
|
*/
|
2014-07-24 12:53:33 +00:00
|
|
|
g_object_class_install_property
|
|
|
|
(object_class, PROP_EGRESS_PRIORITY_MAP,
|
2014-07-29 13:22:07 +00:00
|
|
|
g_param_spec_boxed (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "",
|
2014-08-21 17:19:53 +00:00
|
|
|
G_TYPE_STRV,
|
2014-07-29 13:22:07 +00:00
|
|
|
G_PARAM_READWRITE |
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
2014-08-04 23:57:20 +00:00
|
|
|
|
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 13:58:25 +00:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: interface-name
|
|
|
|
* variable: PHYSDEV and VLAN_ID, or DEVICE
|
|
|
|
* description: VLAN interface name.
|
|
|
|
* If all variables are set, parent device from PHYSDEV takes precedence over DEVICE,
|
|
|
|
* but VLAN id from DEVICE takes precedence over VLAN_ID.
|
|
|
|
* example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12
|
|
|
|
* ---end---
|
2014-11-16 20:36:18 +00:00
|
|
|
* ---dbus---
|
|
|
|
* property: interface-name
|
|
|
|
* format: string
|
|
|
|
* description: Deprecated in favor of connection.interface-name, but can
|
|
|
|
* be used for backward-compatibility with older daemons, to set the
|
|
|
|
* vlan's interface name.
|
|
|
|
* ---end---
|
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 13:58:25 +00:00
|
|
|
*/
|
2014-08-16 14:09:48 +00:00
|
|
|
_nm_setting_class_add_dbus_only_property (parent_class, "interface-name",
|
|
|
|
G_VARIANT_TYPE_STRING,
|
2014-08-04 23:57:20 +00:00
|
|
|
_nm_setting_get_deprecated_virtual_interface_name,
|
2014-09-15 17:30:07 +00:00
|
|
|
NULL);
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|