mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-29 09:10:10 +01:00
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'.
429 lines
14 KiB
C
429 lines
14 KiB
C
/* -*- 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.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <glib/gi18n.h>
|
|
|
|
#include "nm-setting-ip6-config.h"
|
|
#include "nm-setting-private.h"
|
|
#include "nm-core-enum-types.h"
|
|
|
|
/**
|
|
* 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
|
|
*
|
|
* #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.
|
|
**/
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING_IP_CONFIG,
|
|
_nm_register_setting (IP6_CONFIG, 4))
|
|
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;
|
|
} NMSettingIP6ConfigPrivate;
|
|
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_IP6_PRIVACY,
|
|
|
|
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;
|
|
}
|
|
|
|
static gboolean
|
|
verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|
{
|
|
NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
|
|
NMSettingVerifyResult ret;
|
|
const char *method;
|
|
|
|
ret = NM_SETTING_CLASS (nm_setting_ip6_config_parent_class)->verify (setting, connection, error);
|
|
if (ret != NM_SETTING_VERIFY_SUCCESS)
|
|
return ret;
|
|
|
|
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) {
|
|
g_set_error (error,
|
|
NM_CONNECTION_ERROR,
|
|
NM_CONNECTION_ERROR_MISSING_PROPERTY,
|
|
_("this property cannot be empty for '%s=%s'"),
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_ADDRESSES);
|
|
return FALSE;
|
|
}
|
|
} 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) {
|
|
g_set_error (error,
|
|
NM_CONNECTION_ERROR,
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
_("'%s' not allowed for %s=%s"),
|
|
_("this property is not allowed for '%s=%s'"),
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_DNS);
|
|
return FALSE;
|
|
}
|
|
|
|
if (nm_setting_ip_config_get_num_dns_searches (s_ip) > 0) {
|
|
g_set_error (error,
|
|
NM_CONNECTION_ERROR,
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
_("this property is not allowed for '%s=%s'"),
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_DNS_SEARCH);
|
|
return FALSE;
|
|
}
|
|
|
|
if (nm_setting_ip_config_get_num_addresses (s_ip) > 0) {
|
|
g_set_error (error,
|
|
NM_CONNECTION_ERROR,
|
|
NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
_("this property is not allowed for '%s=%s'"),
|
|
NM_SETTING_IP_CONFIG_METHOD, method);
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_ADDRESSES);
|
|
return FALSE;
|
|
}
|
|
} else if ( !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)
|
|
|| !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
|
|
/* nothing to do */
|
|
} else {
|
|
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;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
static void
|
|
nm_setting_ip6_config_init (NMSettingIP6Config *setting)
|
|
{
|
|
}
|
|
|
|
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 *
|
|
ip6_addresses_get (NMSetting *setting,
|
|
const char *property)
|
|
{
|
|
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;
|
|
}
|
|
|
|
static void
|
|
ip6_addresses_set (NMSetting *setting,
|
|
GVariant *connection_dict,
|
|
const char *property,
|
|
GVariant *value)
|
|
{
|
|
GPtrArray *addrs;
|
|
GVariant *s_ip6;
|
|
char *gateway = NULL;
|
|
|
|
s_ip6 = g_variant_lookup_value (connection_dict, NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_VARIANT_TYPE_SETTING);
|
|
/* If 'address-data' is set then ignore 'addresses' */
|
|
if (g_variant_lookup (s_ip6, "address-data", "aa{sv}", NULL)) {
|
|
g_variant_unref (s_ip6);
|
|
return;
|
|
}
|
|
|
|
addrs = nm_utils_ip6_addresses_from_variant (value, &gateway);
|
|
|
|
if (gateway && !g_variant_lookup (s_ip6, "gateway", "s", NULL)) {
|
|
g_object_set (setting,
|
|
NM_SETTING_IP_CONFIG_GATEWAY, gateway,
|
|
NULL);
|
|
}
|
|
g_free (gateway);
|
|
|
|
g_variant_unref (s_ip6);
|
|
|
|
g_object_set (setting, property, addrs, NULL);
|
|
g_ptr_array_unref (addrs);
|
|
}
|
|
|
|
static GVariant *
|
|
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;
|
|
}
|
|
|
|
static void
|
|
ip6_address_data_set (NMSetting *setting,
|
|
GVariant *connection_dict,
|
|
const char *property,
|
|
GVariant *value)
|
|
{
|
|
GPtrArray *addrs;
|
|
|
|
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);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void
|
|
ip6_routes_set (NMSetting *setting,
|
|
GVariant *connection_dict,
|
|
const char *property,
|
|
GVariant *value)
|
|
{
|
|
GPtrArray *routes;
|
|
GVariant *s_ip6;
|
|
|
|
s_ip6 = g_variant_lookup_value (connection_dict, NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_VARIANT_TYPE_SETTING);
|
|
/* If 'route-data' is set then ignore 'routes' */
|
|
if (g_variant_lookup (s_ip6, "route-data", "aa{sv}", NULL)) {
|
|
g_variant_unref (s_ip6);
|
|
return;
|
|
}
|
|
g_variant_unref (s_ip6);
|
|
|
|
routes = nm_utils_ip6_routes_from_variant (value);
|
|
g_object_set (setting, property, routes, NULL);
|
|
g_ptr_array_unref (routes);
|
|
}
|
|
|
|
static GVariant *
|
|
ip6_route_data_get (NMSetting *setting,
|
|
NMConnection *connection,
|
|
const char *property)
|
|
{
|
|
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;
|
|
}
|
|
|
|
static void
|
|
ip6_route_data_set (NMSetting *setting,
|
|
GVariant *connection_dict,
|
|
const char *property,
|
|
GVariant *value)
|
|
{
|
|
GPtrArray *routes;
|
|
|
|
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);
|
|
}
|
|
|
|
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:
|
|
priv->ip6_privacy = g_value_get_enum (value);
|
|
break;
|
|
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:
|
|
g_value_set_enum (value, priv->ip6_privacy);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (ip6_class);
|
|
NMSettingClass *setting_class = NM_SETTING_CLASS (ip6_class);
|
|
|
|
g_type_class_add_private (ip6_class, sizeof (NMSettingIP6ConfigPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->set_property = set_property;
|
|
object_class->get_property = get_property;
|
|
setting_class->verify = verify;
|
|
|
|
/* Properties */
|
|
/**
|
|
* 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
|
|
* applications, on the other hand. The permitted values are: 0: disabled,
|
|
* 1: enabled (prefer public address), 2: enabled (prefer temporary
|
|
* addresses).
|
|
**/
|
|
g_object_class_install_property
|
|
(object_class, PROP_IP6_PRIVACY,
|
|
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));
|
|
|
|
/* IP6-specific property overrides */
|
|
_nm_setting_class_transform_property (setting_class,
|
|
NM_SETTING_IP_CONFIG_DNS,
|
|
G_VARIANT_TYPE ("aay"),
|
|
ip6_dns_to_dbus,
|
|
ip6_dns_from_dbus);
|
|
|
|
_nm_setting_class_override_property (setting_class,
|
|
NM_SETTING_IP_CONFIG_ADDRESSES,
|
|
G_VARIANT_TYPE ("a(ayuay)"),
|
|
ip6_addresses_get,
|
|
ip6_addresses_set,
|
|
NULL);
|
|
|
|
_nm_setting_class_add_dbus_only_property (setting_class,
|
|
"address-data",
|
|
G_VARIANT_TYPE ("aa{sv}"),
|
|
ip6_address_data_get,
|
|
ip6_address_data_set);
|
|
|
|
_nm_setting_class_override_property (setting_class,
|
|
NM_SETTING_IP_CONFIG_ROUTES,
|
|
G_VARIANT_TYPE ("a(ayuayu)"),
|
|
ip6_routes_get,
|
|
ip6_routes_set,
|
|
NULL);
|
|
|
|
_nm_setting_class_add_dbus_only_property (setting_class,
|
|
"route-data",
|
|
G_VARIANT_TYPE ("aa{sv}"),
|
|
ip6_route_data_get,
|
|
ip6_route_data_set);
|
|
}
|