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 2007 - 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-ip6-config.h"
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
#include <string.h>
|
2016-04-30 14:48:02 +00:00
|
|
|
#include <arpa/inet.h>
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
#include "nm-setting-private.h"
|
2014-06-26 20:47:46 +00:00
|
|
|
#include "nm-core-enum-types.h"
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* SECTION:nm-setting-ip6-config
|
|
|
|
* @short_description: Describes IPv6 addressing, routing, and name service properties
|
|
|
|
*
|
|
|
|
* The #NMSettingIP6Config object is a #NMSetting subclass that describes
|
|
|
|
* properties related to IPv6 addressing, routing, and Domain Name Service
|
2014-10-19 21:30:10 +00:00
|
|
|
*
|
|
|
|
* #NMSettingIP6Config has few properties or methods of its own; it inherits
|
|
|
|
* almost everything from #NMSettingIPConfig.
|
|
|
|
*
|
|
|
|
* NetworkManager supports 6 values for the #NMSettingIPConfig:method property
|
|
|
|
* for IPv6. If "auto" is specified then the appropriate automatic method (PPP,
|
|
|
|
* router advertisement, etc) is used for the device and most other properties
|
|
|
|
* can be left unset. To force the use of DHCP only, specify "dhcp"; this
|
|
|
|
* method is only valid for Ethernet- based hardware. If "link-local" is
|
|
|
|
* specified, then an IPv6 link-local address will be assigned to the interface.
|
|
|
|
* If "manual" is specified, static IP addressing is used and at least one IP
|
|
|
|
* address must be given in the "addresses" property. If "ignore" is specified,
|
|
|
|
* IPv6 configuration is not done. Note: the "shared" method is not yet
|
|
|
|
* supported.
|
2014-07-24 12:53:33 +00:00
|
|
|
**/
|
|
|
|
|
2014-10-19 21:30:10 +00:00
|
|
|
G_DEFINE_TYPE_WITH_CODE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING_IP_CONFIG,
|
2014-08-07 21:19:40 +00:00
|
|
|
_nm_register_setting (IP6_CONFIG, 4))
|
2014-07-24 12:53:33 +00:00
|
|
|
NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_IP6_CONFIG)
|
|
|
|
|
|
|
|
#define NM_SETTING_IP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_IP6_CONFIG, NMSettingIP6ConfigPrivate))
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
NMSettingIP6ConfigPrivacy ip6_privacy;
|
2015-09-08 18:22:17 +00:00
|
|
|
NMSettingIP6ConfigAddrGenMode addr_gen_mode;
|
2016-04-30 14:48:02 +00:00
|
|
|
char *token;
|
2014-07-24 12:53:33 +00:00
|
|
|
} NMSettingIP6ConfigPrivate;
|
|
|
|
|
|
|
|
|
|
|
|
enum {
|
|
|
|
PROP_0,
|
|
|
|
PROP_IP6_PRIVACY,
|
2015-09-08 18:22:17 +00:00
|
|
|
PROP_ADDR_GEN_MODE,
|
2016-04-30 14:48:02 +00:00
|
|
|
PROP_TOKEN,
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
LAST_PROP
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_ip6_config_new:
|
|
|
|
*
|
|
|
|
* Creates a new #NMSettingIP6Config object with default values.
|
|
|
|
*
|
|
|
|
* Returns: (transfer full): the new empty #NMSettingIP6Config object
|
|
|
|
**/
|
|
|
|
NMSetting *
|
|
|
|
nm_setting_ip6_config_new (void)
|
|
|
|
{
|
|
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_IP6_CONFIG, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nm_setting_ip6_config_get_ip6_privacy:
|
|
|
|
* @setting: the #NMSettingIP6Config
|
|
|
|
*
|
|
|
|
* Returns the value contained in the #NMSettingIP6Config:ip6-privacy
|
|
|
|
* property.
|
|
|
|
*
|
|
|
|
* Returns: IPv6 Privacy Extensions configuration value (#NMSettingIP6ConfigPrivacy).
|
|
|
|
**/
|
|
|
|
NMSettingIP6ConfigPrivacy
|
|
|
|
nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Config *setting)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN);
|
|
|
|
|
|
|
|
return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->ip6_privacy;
|
|
|
|
}
|
|
|
|
|
2015-09-08 18:22:17 +00:00
|
|
|
/**
|
|
|
|
* nm_setting_ip6_config_get_addr_gen_mode:
|
|
|
|
* @setting: the #NMSettingIP6Config
|
|
|
|
*
|
|
|
|
* Returns the value contained in the #NMSettingIP6Config:addr-gen-mode
|
|
|
|
* property.
|
|
|
|
*
|
|
|
|
* Returns: IPv6 Address Generation Mode.
|
|
|
|
*
|
|
|
|
* Since: 1.2
|
|
|
|
**/
|
|
|
|
NMSettingIP6ConfigAddrGenMode
|
|
|
|
nm_setting_ip6_config_get_addr_gen_mode (NMSettingIP6Config *setting)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting),
|
2015-10-26 17:21:18 +00:00
|
|
|
NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY);
|
2015-09-08 18:22:17 +00:00
|
|
|
|
|
|
|
return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->addr_gen_mode;
|
|
|
|
}
|
|
|
|
|
2016-04-30 14:48:02 +00:00
|
|
|
/**
|
|
|
|
* nm_setting_ip6_config_get_token:
|
|
|
|
* @setting: the #NMSettingIP6Config
|
|
|
|
*
|
|
|
|
* Returns the value contained in the #NMSettingIP6Config:token
|
|
|
|
* property.
|
|
|
|
*
|
|
|
|
* Returns: A string.
|
|
|
|
*
|
|
|
|
* Since: 1.4
|
|
|
|
**/
|
|
|
|
const char *
|
|
|
|
nm_setting_ip6_config_get_token (NMSettingIP6Config *setting)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), NULL);
|
|
|
|
|
|
|
|
return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->token;
|
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
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
|
|
|
{
|
2015-09-08 18:22:17 +00:00
|
|
|
NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting);
|
2014-10-19 21:30:10 +00:00
|
|
|
NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
|
2014-10-21 01:30:56 +00:00
|
|
|
NMSettingVerifyResult ret;
|
2014-10-19 21:30:10 +00:00
|
|
|
const char *method;
|
2016-04-30 14:48:02 +00:00
|
|
|
gboolean token_needs_normalization = FALSE;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
2014-10-21 01:30:56 +00:00
|
|
|
ret = NM_SETTING_CLASS (nm_setting_ip6_config_parent_class)->verify (setting, connection, error);
|
|
|
|
if (ret != NM_SETTING_VERIFY_SUCCESS)
|
|
|
|
return ret;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
2014-10-19 21:30:10 +00:00
|
|
|
method = nm_setting_ip_config_get_method (s_ip);
|
|
|
|
/* Base class already checked that it exists */
|
|
|
|
g_assert (method);
|
|
|
|
|
|
|
|
if (!strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
|
|
|
|
if (nm_setting_ip_config_get_num_addresses (s_ip) == 0) {
|
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
|
|
|
_("this property cannot be empty for '%s=%s'"),
|
2014-10-19 21:30:10 +00:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_ADDRESSES);
|
2014-07-24 12:53:33 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
2014-10-19 21:30:10 +00:00
|
|
|
} else if ( !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)
|
|
|
|
|| !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)
|
|
|
|
|| !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_SHARED)) {
|
|
|
|
if (nm_setting_ip_config_get_num_dns (s_ip) > 0) {
|
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_INVALID_PROPERTY,
|
2014-07-24 12:53:33 +00:00
|
|
|
_("this property is not allowed for '%s=%s'"),
|
2014-10-19 21:30:10 +00:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_DNS);
|
2014-07-24 12:53:33 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2014-10-19 21:30:10 +00:00
|
|
|
if (nm_setting_ip_config_get_num_dns_searches (s_ip) > 0) {
|
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_INVALID_PROPERTY,
|
2014-07-24 12:53:33 +00:00
|
|
|
_("this property is not allowed for '%s=%s'"),
|
2014-10-19 21:30:10 +00:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_DNS_SEARCH);
|
2014-07-24 12:53:33 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2014-10-19 21:30:10 +00:00
|
|
|
if (nm_setting_ip_config_get_num_addresses (s_ip) > 0) {
|
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_INVALID_PROPERTY,
|
2014-07-24 12:53:33 +00:00
|
|
|
_("this property is not allowed for '%s=%s'"),
|
2014-10-19 21:30:10 +00:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_ADDRESSES);
|
2014-07-24 12:53:33 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
2014-10-19 21:30:10 +00:00
|
|
|
} else if ( !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)
|
|
|
|
|| !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
|
2014-07-24 12:53:33 +00:00
|
|
|
/* nothing to do */
|
|
|
|
} else {
|
|
|
|
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
|
|
|
_("property is invalid"));
|
2014-10-19 21:30:10 +00:00
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_METHOD);
|
2014-07-24 12:53:33 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2015-09-08 18:22:17 +00:00
|
|
|
if (!NM_IN_SET (priv->addr_gen_mode,
|
|
|
|
NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64,
|
|
|
|
NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY)) {
|
|
|
|
g_set_error_literal (error,
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
_("property is invalid"));
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_METHOD);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2016-04-30 14:48:02 +00:00
|
|
|
if (priv->token) {
|
|
|
|
if (priv->addr_gen_mode == NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64) {
|
|
|
|
struct in6_addr i6_token;
|
|
|
|
char s_token[NM_UTILS_INET_ADDRSTRLEN];
|
|
|
|
|
|
|
|
if ( inet_pton (AF_INET6, priv->token, &i6_token) != 1
|
|
|
|
|| !_nm_utils_inet6_is_token (&i6_token)) {
|
|
|
|
g_set_error_literal (error,
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
_("value is not a valid token"));
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_TOKEN);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (g_strcmp0 (priv->token, nm_utils_inet6_ntop (&i6_token, s_token)))
|
|
|
|
token_needs_normalization = TRUE;
|
|
|
|
} else {
|
|
|
|
g_set_error_literal (error,
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
_("only makes sense with EUI64 address generation mode"));
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_TOKEN);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Failures from here on, are NORMALIZABLE_ERROR... */
|
|
|
|
|
|
|
|
if (token_needs_normalization) {
|
|
|
|
g_set_error_literal (error,
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
_("token is not in canonical form"));
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_TOKEN);
|
|
|
|
return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
|
|
|
|
}
|
|
|
|
|
2016-07-01 15:05:42 +00:00
|
|
|
/* Failures from here on are NORMALIZABLE... */
|
|
|
|
|
|
|
|
if ( !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)
|
|
|
|
&& !nm_setting_ip_config_get_may_fail (s_ip)) {
|
|
|
|
g_set_error_literal (error,
|
|
|
|
NM_CONNECTION_ERROR,
|
|
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
_("property should be TRUE when method is set to ignore"));
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_MAY_FAIL);
|
|
|
|
return NM_SETTING_VERIFY_NORMALIZABLE;
|
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
nm_setting_ip6_config_init (NMSettingIP6Config *setting)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-08-16 14:09:48 +00:00
|
|
|
static GVariant *
|
|
|
|
ip6_dns_to_dbus (const GValue *prop_value)
|
|
|
|
{
|
|
|
|
return nm_utils_ip6_dns_to_variant (g_value_get_boxed (prop_value));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ip6_dns_from_dbus (GVariant *dbus_value,
|
|
|
|
GValue *prop_value)
|
|
|
|
{
|
|
|
|
g_value_take_boxed (prop_value, nm_utils_ip6_dns_from_variant (dbus_value));
|
|
|
|
}
|
|
|
|
|
|
|
|
static GVariant *
|
2014-10-21 01:30:56 +00:00
|
|
|
ip6_addresses_get (NMSetting *setting,
|
|
|
|
const char *property)
|
2014-08-16 14:09:48 +00:00
|
|
|
{
|
2014-10-21 01:30:56 +00:00
|
|
|
GPtrArray *addrs;
|
|
|
|
const char *gateway;
|
|
|
|
GVariant *ret;
|
|
|
|
|
|
|
|
g_object_get (setting, property, &addrs, NULL);
|
|
|
|
gateway = nm_setting_ip_config_get_gateway (NM_SETTING_IP_CONFIG (setting));
|
|
|
|
ret = nm_utils_ip6_addresses_to_variant (addrs, gateway);
|
|
|
|
g_ptr_array_unref (addrs);
|
|
|
|
|
|
|
|
return ret;
|
2014-08-16 14:09:48 +00:00
|
|
|
}
|
|
|
|
|
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
|
2014-10-21 01:30:56 +00:00
|
|
|
ip6_addresses_set (NMSetting *setting,
|
|
|
|
GVariant *connection_dict,
|
|
|
|
const char *property,
|
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 *value,
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
GError **error)
|
2014-08-16 14:09:48 +00:00
|
|
|
{
|
2014-10-21 01:30:56 +00:00
|
|
|
GPtrArray *addrs;
|
|
|
|
char *gateway = 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
|
|
|
/* FIXME: properly handle errors */
|
|
|
|
|
2014-11-14 16:46:19 +00:00
|
|
|
if (!_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "address-data"))
|
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;
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
|
|
|
|
addrs = nm_utils_ip6_addresses_from_variant (value, &gateway);
|
2014-10-21 01:30:56 +00:00
|
|
|
|
2014-11-14 16:46:19 +00:00
|
|
|
g_object_set (setting,
|
|
|
|
NM_SETTING_IP_CONFIG_ADDRESSES, addrs,
|
|
|
|
NM_SETTING_IP_CONFIG_GATEWAY, gateway,
|
|
|
|
NULL);
|
2014-10-21 01:30:56 +00:00
|
|
|
g_ptr_array_unref (addrs);
|
2014-11-14 16:46:19 +00:00
|
|
|
g_free (gateway);
|
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;
|
2014-08-16 14:09:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static GVariant *
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
ip6_address_data_get (NMSetting *setting,
|
|
|
|
NMConnection *connection,
|
|
|
|
const char *property)
|
|
|
|
{
|
|
|
|
GPtrArray *addrs;
|
|
|
|
GVariant *ret;
|
|
|
|
|
|
|
|
g_object_get (setting, NM_SETTING_IP_CONFIG_ADDRESSES, &addrs, NULL);
|
|
|
|
ret = nm_utils_ip_addresses_to_variant (addrs);
|
|
|
|
g_ptr_array_unref (addrs);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
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
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
ip6_address_data_set (NMSetting *setting,
|
|
|
|
GVariant *connection_dict,
|
|
|
|
const char *property,
|
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 *value,
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
GError **error)
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
{
|
|
|
|
GPtrArray *addrs;
|
|
|
|
|
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
|
|
|
/* FIXME: properly handle errors */
|
|
|
|
|
2014-11-14 16:46:19 +00:00
|
|
|
/* Ignore 'address-data' if we're going to process 'addresses' */
|
|
|
|
if (_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "address-data"))
|
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;
|
2014-11-14 16:46:19 +00:00
|
|
|
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
addrs = nm_utils_ip_addresses_from_variant (value, AF_INET6);
|
|
|
|
g_object_set (setting, NM_SETTING_IP_CONFIG_ADDRESSES, addrs, NULL);
|
|
|
|
g_ptr_array_unref (addrs);
|
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;
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static GVariant *
|
|
|
|
ip6_routes_get (NMSetting *setting,
|
|
|
|
const char *property)
|
|
|
|
{
|
|
|
|
GPtrArray *routes;
|
|
|
|
GVariant *ret;
|
|
|
|
|
|
|
|
g_object_get (setting, property, &routes, NULL);
|
|
|
|
ret = nm_utils_ip6_routes_to_variant (routes);
|
|
|
|
g_ptr_array_unref (routes);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
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
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
ip6_routes_set (NMSetting *setting,
|
|
|
|
GVariant *connection_dict,
|
|
|
|
const char *property,
|
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 *value,
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
GError **error)
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
{
|
|
|
|
GPtrArray *routes;
|
|
|
|
|
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
|
|
|
/* FIXME: properly handle errors */
|
|
|
|
|
2014-11-14 16:46:19 +00:00
|
|
|
if (!_nm_setting_use_legacy_property (setting, connection_dict, "routes", "route-data"))
|
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;
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
|
|
|
|
routes = nm_utils_ip6_routes_from_variant (value);
|
|
|
|
g_object_set (setting, property, routes, NULL);
|
|
|
|
g_ptr_array_unref (routes);
|
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;
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static GVariant *
|
|
|
|
ip6_route_data_get (NMSetting *setting,
|
|
|
|
NMConnection *connection,
|
|
|
|
const char *property)
|
2014-08-16 14:09:48 +00:00
|
|
|
{
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
GPtrArray *routes;
|
|
|
|
GVariant *ret;
|
|
|
|
|
|
|
|
g_object_get (setting, NM_SETTING_IP_CONFIG_ROUTES, &routes, NULL);
|
|
|
|
ret = nm_utils_ip_routes_to_variant (routes);
|
|
|
|
g_ptr_array_unref (routes);
|
|
|
|
|
|
|
|
return ret;
|
2014-08-16 14:09:48 +00:00
|
|
|
}
|
|
|
|
|
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
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
ip6_route_data_set (NMSetting *setting,
|
|
|
|
GVariant *connection_dict,
|
|
|
|
const char *property,
|
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 *value,
|
|
|
|
NMSettingParseFlags parse_flags,
|
|
|
|
GError **error)
|
2014-08-16 14:09:48 +00:00
|
|
|
{
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
GPtrArray *routes;
|
|
|
|
|
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
|
|
|
/* FIXME: properly handle errors */
|
|
|
|
|
2014-11-14 16:46:19 +00:00
|
|
|
/* Ignore 'route-data' if we're going to process 'routes' */
|
|
|
|
if (_nm_setting_use_legacy_property (setting, connection_dict, "routes", "route-data"))
|
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;
|
2014-11-14 16:46:19 +00:00
|
|
|
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
routes = nm_utils_ip_routes_from_variant (value, AF_INET6);
|
|
|
|
g_object_set (setting, NM_SETTING_IP_CONFIG_ROUTES, routes, NULL);
|
|
|
|
g_ptr_array_unref (routes);
|
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;
|
2014-08-16 14:09:48 +00:00
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
static void
|
|
|
|
set_property (GObject *object, guint prop_id,
|
|
|
|
const GValue *value, GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
case PROP_IP6_PRIVACY:
|
2014-06-26 20:47:46 +00:00
|
|
|
priv->ip6_privacy = g_value_get_enum (value);
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
2015-09-08 18:22:17 +00:00
|
|
|
case PROP_ADDR_GEN_MODE:
|
|
|
|
priv->addr_gen_mode = g_value_get_int (value);
|
|
|
|
break;
|
2016-04-30 14:48:02 +00:00
|
|
|
case PROP_TOKEN:
|
|
|
|
g_free (priv->token);
|
|
|
|
priv->token = g_value_dup_string (value);
|
|
|
|
break;
|
2014-07-24 12:53:33 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
get_property (GObject *object, guint prop_id,
|
|
|
|
GValue *value, GParamSpec *pspec)
|
|
|
|
{
|
|
|
|
NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object);
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
case PROP_IP6_PRIVACY:
|
2014-06-26 20:47:46 +00:00
|
|
|
g_value_set_enum (value, priv->ip6_privacy);
|
2014-07-24 12:53:33 +00:00
|
|
|
break;
|
2015-09-08 18:22:17 +00:00
|
|
|
case PROP_ADDR_GEN_MODE:
|
|
|
|
g_value_set_int (value, priv->addr_gen_mode);
|
|
|
|
break;
|
2016-04-30 14:48:02 +00:00
|
|
|
case PROP_TOKEN:
|
|
|
|
g_value_set_string (value, priv->token);
|
|
|
|
break;
|
2014-07-24 12:53:33 +00:00
|
|
|
default:
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-30 14:48:02 +00:00
|
|
|
static void
|
|
|
|
finalize (GObject *object)
|
|
|
|
{
|
|
|
|
NMSettingIP6Config *self = NM_SETTING_IP6_CONFIG (object);
|
|
|
|
NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
g_free (priv->token);
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (nm_setting_ip6_config_parent_class)->finalize (object);
|
|
|
|
}
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
static void
|
2014-10-19 21:30:10 +00:00
|
|
|
nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
|
2014-07-24 12:53:33 +00:00
|
|
|
{
|
2014-10-19 21:30:10 +00:00
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (ip6_class);
|
|
|
|
NMSettingClass *setting_class = NM_SETTING_CLASS (ip6_class);
|
2014-07-24 12:53:33 +00:00
|
|
|
|
2014-10-19 21:30:10 +00:00
|
|
|
g_type_class_add_private (ip6_class, sizeof (NMSettingIP6ConfigPrivate));
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
/* virtual methods */
|
|
|
|
object_class->set_property = set_property;
|
|
|
|
object_class->get_property = get_property;
|
2016-04-30 14:48:02 +00:00
|
|
|
object_class->finalize = finalize;
|
2014-10-19 21:30:10 +00:00
|
|
|
setting_class->verify = verify;
|
2014-07-24 12:53:33 +00:00
|
|
|
|
|
|
|
/* Properties */
|
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: method
|
|
|
|
* variable: IPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6C
|
|
|
|
* default: IPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=no
|
|
|
|
* description: Method used for IPv6 protocol configuration.
|
|
|
|
* ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yes
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---keyfile---
|
|
|
|
* property: dns
|
|
|
|
* format: list of DNS IP addresses
|
|
|
|
* description: List of DNS servers.
|
|
|
|
* example: dns=2001:4860:4860::8888;2001:4860:4860::8844;
|
|
|
|
* ---end---
|
|
|
|
* ---ifcfg-rh---
|
|
|
|
* property: dns
|
|
|
|
* variable: DNS1, DNS2, ...
|
|
|
|
* format: string
|
|
|
|
* description: List of DNS servers. NetworkManager uses the variables both
|
|
|
|
* for IPv4 and IPv6.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: dns-search
|
|
|
|
* variable: DOMAIN
|
|
|
|
* format: string (space-separated domains)
|
|
|
|
* description: List of DNS search domains.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---keyfile---
|
|
|
|
* property: addresses
|
|
|
|
* variable: address1, address2, ...
|
2014-11-18 19:19:11 +00:00
|
|
|
* format: address/plen
|
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
|
|
|
* description: List of static IP addresses.
|
2014-11-18 19:19:11 +00:00
|
|
|
* example: address1=abbe::cafe/96 address2=2001::1234
|
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---
|
|
|
|
* ---ifcfg-rh---
|
|
|
|
* property: addresses
|
2014-11-18 19:19:11 +00:00
|
|
|
* variable: IPV6ADDR, IPV6ADDR_SECONDARIES
|
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
|
|
|
* description: List of static IP addresses.
|
2014-11-18 19:19:11 +00:00
|
|
|
* example: IPV6ADDR=ab12:9876::1
|
|
|
|
* IPV6ADDR_SECONDARIES="ab12:9876::2 ab12:9876::3"
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---keyfile---
|
|
|
|
* property: gateway
|
|
|
|
* variable: gateway
|
|
|
|
* format: string
|
|
|
|
* description: Gateway IP addresses as a string.
|
|
|
|
* example: gateway=abbe::1
|
|
|
|
* ---end---
|
|
|
|
* ---ifcfg-rh---
|
|
|
|
* property: gateway
|
|
|
|
* variable: IPV6_DEFAULTGW
|
|
|
|
* description: Gateway IP address.
|
|
|
|
* example: IPV6_DEFAULTGW=abbe::1
|
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---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---keyfile---
|
|
|
|
* property: routes
|
|
|
|
* variable: route1, route2, ...
|
|
|
|
* format: route/plen[,gateway,metric]
|
|
|
|
* description: List of IP routes.
|
|
|
|
* example: route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11:5403
|
|
|
|
* ---end---
|
|
|
|
* ---ifcfg-rh---
|
|
|
|
* property: routes
|
|
|
|
* variable: (none)
|
|
|
|
* description: List of static routes. They are not stored in ifcfg-* file,
|
|
|
|
* but in route6-* file instead in the form of command line for 'ip route add'.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: ignore-auto-routes
|
|
|
|
* variable: IPV6_PEERROUTES(+)
|
|
|
|
* default: yes
|
|
|
|
* description: IPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: ignore-auto-dns
|
|
|
|
* variable: IPV6_PEERDNS(+)
|
|
|
|
* default: yes
|
|
|
|
* description: IPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: dhcp-hostname
|
|
|
|
* variable: DHCP_HOSTNAME
|
|
|
|
* description: Hostname to send the DHCP server.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: never-default
|
|
|
|
* variable: IPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)
|
|
|
|
* default: IPV6_DEFROUTE=yes (when no variable specified)
|
|
|
|
* description: IPV6_DEFROUTE=no tells NetworkManager that this connection
|
|
|
|
* should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite
|
|
|
|
* meaning as 'never-default' property.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: may-fail
|
|
|
|
* variable: IPV6_FAILURE_FATAL(+)
|
|
|
|
* default: no
|
|
|
|
* description: IPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
2014-12-22 14:10:22 +00:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: route-metric
|
|
|
|
* variable: IPV6_ROUTE_METRIC(+)
|
|
|
|
* default: -1
|
|
|
|
* description: IPV6_ROUTE_METRIC is the default IPv6 metric for routes on this connection.
|
|
|
|
* If set to -1, a default metric based on the device type is used.
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
2016-04-23 13:57:07 +00:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: dns-priority
|
|
|
|
* variable: IPV6_DNS_PRIORITY(+)
|
|
|
|
* description: The priority for DNS servers of this connection. Lower values have higher priority.
|
|
|
|
* If zero, the default value will be used (50 for VPNs, 100 for other connections).
|
|
|
|
* A negative value prevents DNS from other connections with greater values to be used.
|
|
|
|
* default: 0
|
|
|
|
* example: IPV6_DNS_PRIORITY=20
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
|
2014-07-24 12:53:33 +00:00
|
|
|
/**
|
|
|
|
* NMSettingIP6Config:ip6-privacy:
|
|
|
|
*
|
|
|
|
* Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If
|
|
|
|
* enabled, it makes the kernel generate a temporary IPv6 address in
|
|
|
|
* addition to the public one generated from MAC address via modified
|
|
|
|
* EUI-64. This enhances privacy, but could cause problems in some
|
2015-04-16 14:35:32 +00:00
|
|
|
* applications, on the other hand. The permitted values are: -1: unknown,
|
|
|
|
* 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary
|
2014-07-24 12:53:33 +00:00
|
|
|
* addresses).
|
2015-04-16 14:35:32 +00:00
|
|
|
*
|
2015-06-02 15:38:07 +00:00
|
|
|
* Having a per-connection setting set to "-1" (unknown) means fallback to
|
|
|
|
* global configuration "ipv6.ip6-privacy".
|
2015-04-16 14:38:00 +00:00
|
|
|
*
|
2015-06-02 15:38:07 +00:00
|
|
|
* If also global configuration is unspecified or set to "-1", fallback to read
|
2015-04-16 14:38:00 +00:00
|
|
|
* "/proc/sys/net/ipv6/conf/default/use_tempaddr".
|
2015-09-08 18:22:17 +00:00
|
|
|
*
|
|
|
|
* Note that this setting is distinct from the Stable Privacy addresses
|
|
|
|
* that can be enabled with the "addr-gen-mode" property's "stable-privacy"
|
|
|
|
* setting as another way of avoiding host tracking with IPv6 addresses.
|
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: ip6-privacy
|
|
|
|
* variable: IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+)
|
2014-11-19 08:57:20 +00:00
|
|
|
* values: IPV6_PRIVACY: no, yes (rfc3041 or rfc4941);
|
|
|
|
* IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, no
|
|
|
|
* default: no
|
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
|
|
|
* description: Configure IPv6 Privacy Extensions for SLAAC (RFC4941).
|
2014-11-19 08:57:20 +00:00
|
|
|
* example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes
|
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_IP6_PRIVACY,
|
2014-06-26 20:47:46 +00:00
|
|
|
g_param_spec_enum (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "",
|
|
|
|
NM_TYPE_SETTING_IP6_CONFIG_PRIVACY,
|
|
|
|
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN,
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
2014-10-19 21:30:10 +00:00
|
|
|
|
2015-09-08 18:22:17 +00:00
|
|
|
/**
|
|
|
|
* NMSettingIP6Config:addr-gen-mode:
|
|
|
|
*
|
|
|
|
* Configure method for creating the address for use with RFC4862 IPv6
|
|
|
|
* Stateless Address Autoconfiguration. The permitted values are: "eui64",
|
2016-04-25 14:14:41 +00:00
|
|
|
* or "stable-privacy".
|
2015-09-08 18:22:17 +00:00
|
|
|
*
|
|
|
|
* If the property is set to "eui64", the addresses will be generated
|
|
|
|
* using the interface tokens derived from hardware address. This makes
|
|
|
|
* the host part of the address to stay constant, making it possible
|
|
|
|
* to track host's presence when it changes networks. The address changes
|
|
|
|
* when the interface hardware is replaced.
|
|
|
|
*
|
|
|
|
* The value of "stable-privacy" enables use of cryptographically
|
|
|
|
* secure hash of a secret host-specific key along with the connection
|
|
|
|
* identification and the network address as specified by RFC7217.
|
|
|
|
* This makes it impossible to use the address track host's presence,
|
|
|
|
* and makes the address stable when the network interface hardware is
|
|
|
|
* replaced.
|
|
|
|
*
|
2016-04-25 14:14:41 +00:00
|
|
|
* On D-Bus, the absence of an addr-gen-mode setting equals enabling
|
|
|
|
* "stable-privacy". For keyfile plugin, the absence of the setting
|
|
|
|
* on disk means "eui64" so that the property doesn't change on upgrade
|
|
|
|
* from older versions.
|
2015-09-08 18:22:17 +00:00
|
|
|
*
|
|
|
|
* Note that this setting is distinct from the Privacy Extensions as
|
|
|
|
* configured by "ip6-privacy" property and it does not affect the
|
|
|
|
* temporary addresses configured with this option.
|
|
|
|
*
|
|
|
|
* Since: 1.2
|
|
|
|
**/
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: addr-gen-mode
|
|
|
|
* variable: IPV6_ADDR_GEN_MODE
|
|
|
|
* values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy
|
|
|
|
* default: eui64
|
|
|
|
* description: Configure IPv6 Stable Privacy addressing for SLAAC (RFC7217).
|
|
|
|
* example: IPV6_ADDR_GEN_MODE=stable-privacy
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
g_object_class_install_property
|
|
|
|
(object_class, PROP_ADDR_GEN_MODE,
|
|
|
|
g_param_spec_int (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, "", "",
|
|
|
|
G_MININT, G_MAXINT,
|
2015-10-26 17:21:18 +00:00
|
|
|
NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY,
|
2015-09-08 18:22:17 +00:00
|
|
|
G_PARAM_READWRITE |
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
|
2016-04-30 14:48:02 +00:00
|
|
|
/**
|
|
|
|
* NMSettingIP6Config:token:
|
|
|
|
*
|
|
|
|
* Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02
|
|
|
|
* IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.
|
|
|
|
*
|
|
|
|
* Since: 1.4
|
|
|
|
**/
|
|
|
|
/* ---ifcfg-rh---
|
|
|
|
* property: token
|
|
|
|
* variable: IPV6_TOKEN
|
|
|
|
* description: The IPv6 tokenized interface identifier token
|
|
|
|
* example: IPV6_TOKEN=::53
|
|
|
|
* ---end---
|
|
|
|
*/
|
|
|
|
g_object_class_install_property
|
|
|
|
(object_class, PROP_TOKEN,
|
|
|
|
g_param_spec_string (NM_SETTING_IP6_CONFIG_TOKEN, "", "",
|
|
|
|
NULL,
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
|
|
|
|
|
2014-10-19 21:30:10 +00:00
|
|
|
/* IP6-specific property overrides */
|
2014-11-16 20:36:18 +00:00
|
|
|
|
|
|
|
/* ---dbus---
|
|
|
|
* property: dns
|
|
|
|
* format: array of byte array
|
|
|
|
* description: Array of IP addresses of DNS servers (in network byte order)
|
|
|
|
* ---end---
|
|
|
|
*/
|
2014-10-19 21:30:10 +00:00
|
|
|
_nm_setting_class_transform_property (setting_class,
|
|
|
|
NM_SETTING_IP_CONFIG_DNS,
|
|
|
|
G_VARIANT_TYPE ("aay"),
|
|
|
|
ip6_dns_to_dbus,
|
|
|
|
ip6_dns_from_dbus);
|
|
|
|
|
2014-11-16 20:36:18 +00:00
|
|
|
/* ---dbus---
|
|
|
|
* property: addresses
|
|
|
|
* format: array of legacy IPv6 address struct (a(ayuay))
|
|
|
|
* description: Deprecated in favor of the 'address-data' and 'gateway'
|
|
|
|
* properties, but this can be used for backward-compatibility with older
|
|
|
|
* daemons. Note that if you send this property the daemon will ignore
|
|
|
|
* 'address-data' and 'gateway'.
|
|
|
|
*
|
|
|
|
* Array of IPv6 address structures. Each IPv6 address structure is
|
|
|
|
* composed of an IPv6 address, a prefix length (1 - 128), and an IPv6
|
|
|
|
* gateway address. The gateway may be zeroed out if no gateway exists for
|
|
|
|
* that subnet.
|
|
|
|
* ---end---
|
|
|
|
*/
|
2014-10-21 01:30:56 +00:00
|
|
|
_nm_setting_class_override_property (setting_class,
|
|
|
|
NM_SETTING_IP_CONFIG_ADDRESSES,
|
|
|
|
G_VARIANT_TYPE ("a(ayuay)"),
|
|
|
|
ip6_addresses_get,
|
|
|
|
ip6_addresses_set,
|
|
|
|
NULL);
|
2014-10-19 21:30:10 +00:00
|
|
|
|
2014-11-16 20:36:18 +00:00
|
|
|
/* ---dbus---
|
|
|
|
* property: address-data
|
|
|
|
* format: array of vardict
|
|
|
|
* description: Array of IPv6 addresses. Each address dictionary contains at
|
|
|
|
* least 'address' and 'prefix' entries, containing the IP address as a
|
|
|
|
* string, and the prefix length as a uint32. Additional attributes may
|
|
|
|
* also exist on some addresses.
|
|
|
|
* ---end---
|
|
|
|
*/
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
_nm_setting_class_add_dbus_only_property (setting_class,
|
|
|
|
"address-data",
|
|
|
|
G_VARIANT_TYPE ("aa{sv}"),
|
|
|
|
ip6_address_data_get,
|
|
|
|
ip6_address_data_set);
|
|
|
|
|
2014-11-16 20:36:18 +00:00
|
|
|
/* ---dbus---
|
|
|
|
* property: routes
|
|
|
|
* format: array of legacy IPv6 route struct (a(ayuayu))
|
|
|
|
* description: Deprecated in favor of the 'route-data' property, but this
|
|
|
|
* can be used for backward-compatibility with older daemons. Note that if
|
|
|
|
* you send this property the daemon will ignore 'route-data'.
|
|
|
|
*
|
|
|
|
* Array of IPv6 route structures. Each IPv6 route structure is
|
|
|
|
* composed of an IPv6 address, a prefix length (1 - 128), an IPv6
|
|
|
|
* next hop address (which may be zeroed out if there is no next hop),
|
|
|
|
* and a metric. If the metric is 0, NM will choose an appropriate
|
|
|
|
* default metric for the device.
|
|
|
|
* ---end---
|
|
|
|
*/
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
_nm_setting_class_override_property (setting_class,
|
|
|
|
NM_SETTING_IP_CONFIG_ROUTES,
|
|
|
|
G_VARIANT_TYPE ("a(ayuayu)"),
|
|
|
|
ip6_routes_get,
|
|
|
|
ip6_routes_set,
|
|
|
|
NULL);
|
|
|
|
|
2014-11-16 20:36:18 +00:00
|
|
|
/* ---dbus---
|
|
|
|
* property: route-data
|
|
|
|
* format: array of vardict
|
|
|
|
* description: Array of IPv6 routes. Each route dictionary contains at
|
|
|
|
* least 'dest' and 'prefix' entries, containing the destination IP
|
|
|
|
* address as a string, and the prefix length as a uint32. Most routes
|
|
|
|
* will also have a 'next-hop' entry, containing the next hop IP address as
|
|
|
|
* a string. If the route has a 'metric' entry (containing a uint32), that
|
|
|
|
* will be used as the metric for the route (otherwise NM will pick a
|
|
|
|
* default value appropriate to the device). Additional attributes may
|
|
|
|
* also exist on some routes.
|
|
|
|
* ---end---
|
|
|
|
*/
|
libnm-core, libnm, core: add AddressData and RouteData properties
Add AddressData and RouteData properties to NMSettingIPConfig and
NMIP[46]Config. These are like the existing "addresses" and "routes"
properties, but using strings and containing additional attributes,
like NMIPAddress and NMIPRoute.
This only affects the D-Bus representations; there are no API changes
to NMSettingIP{,4,6}Config or NMIP{4,6}Config as a result of this; the
additional information is just added to the existing 'addresses' and
'routes' properties.
NMSettingIP4Config and NMSettingIP6Config now always generate both
old-style data ('addresses', 'address-labels', 'routes') and new-style
data ('address-data', 'gateway', 'route-data') when serializing to
D-Bus, for backward compatibility. When deserializing, they will fill
in the 'addresses' and 'routes' properties from the new-style data if
it is present (ignoring the old-style data), or from the old-style
data if the new-style isn't present.
The daemon-side NMIP4Config and NMIP6Config always emit changes for
both 'Addresses'/'Routes' and 'AddressData'/'RouteData'. The
libnm-side classes initially listen for changes on both properties,
but start ignoring the 'Addresses' and 'Routes' properties once they
know the daemon is also providing 'AddressData' and 'RouteData'.
2014-10-21 12:33:18 +00:00
|
|
|
_nm_setting_class_add_dbus_only_property (setting_class,
|
|
|
|
"route-data",
|
|
|
|
G_VARIANT_TYPE ("aa{sv}"),
|
|
|
|
ip6_route_data_get,
|
|
|
|
ip6_route_data_set);
|
2014-07-24 12:53:33 +00:00
|
|
|
}
|