diff options
Diffstat (limited to 'libnm-core/nm-setting-ip4-config.c')
| -rw-r--r-- | libnm-core/nm-setting-ip4-config.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 46579ba9..20fbc017 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -1,9 +1,9 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Copyright (C) 2014 Red Hat, Inc. */ -#include "nm-default.h" +#include "libnm-core/nm-default-libnm-core.h" #include "nm-setting-ip4-config.h" @@ -594,7 +594,7 @@ nm_setting_ip4_config_init(NMSettingIP4Config *setting) NMSetting * nm_setting_ip4_config_new(void) { - return (NMSetting *) g_object_new(NM_TYPE_SETTING_IP4_CONFIG, NULL); + return g_object_new(NM_TYPE_SETTING_IP4_CONFIG, NULL); } static void @@ -667,7 +667,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) * ---end--- * ---ifcfg-rh--- * property: addresses - * variable: IPADDR, PREFIX, IPADDR1, PREFIX1, ... + * variable: IPADDR, PREFIX (NETMASK), IPADDR1, PREFIX1 (NETMASK1), ... * description: List of static IP addresses. * example: IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16 * ---end--- @@ -808,8 +808,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) * with type ethernet (01). Currently, these options only work for ethernet * type of links. * + * The special value "ipv6-duid" uses the DUID from "ipv6.dhcp-duid" property as + * an RFC4361-compliant client identifier. As IAID it uses "ipv4.dhcp-iaid" + * and falls back to "ipv6.dhcp-iaid" if unset. + * * The special value "duid" generates a RFC4361-compliant client identifier based - * on a hash of the interface name as IAID and /etc/machine-id. + * on "ipv4.dhcp-iaid" and uses a DUID generated by hashing /etc/machine-id. * * The special value "stable" is supported to generate a type 0 client identifier based * on the stable-id (see connection.stable-id) and a per-host key. If you set the |