diff options
Diffstat (limited to 'libnm-core/nm-setting-ip6-config.c')
| -rw-r--r-- | libnm-core/nm-setting-ip6-config.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 429f27c9..cc6381f0 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -52,7 +52,7 @@ **/ G_DEFINE_TYPE_WITH_CODE (NMSettingIP6Config, nm_setting_ip6_config, NM_TYPE_SETTING_IP_CONFIG, - _nm_register_setting (IP6_CONFIG, 4)) + _nm_register_setting (IP6_CONFIG, NM_SETTING_PRIORITY_IP)) 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)) @@ -224,7 +224,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **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); + g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE); return FALSE; } @@ -653,6 +653,14 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) */ /* ---ifcfg-rh--- + * property: route-table + * variable: IPV6_ROUTE_TABLE(+) + * default: 0 + * description: IPV6_ROUTE_TABLE enables policy-routing and sets the default routing table. + * ---end--- + */ + + /* ---ifcfg-rh--- * property: dns-priority * variable: IPV6_DNS_PRIORITY(+) * description: The priority for DNS servers of this connection. Lower values have higher priority. @@ -707,16 +715,17 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * NMSettingIP6Config:addr-gen-mode: * * Configure method for creating the address for use with RFC4862 IPv6 - * Stateless Address Autoconfiguration. The permitted values are: "eui64", - * or "stable-privacy". + * Stateless Address Autoconfiguration. The permitted values are: + * %NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 or + * %NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY. * - * If the property is set to "eui64", the addresses will be generated - * using the interface tokens derived from hardware address. This makes + * 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 + * The value of stable-privacy enables use of cryptographically * secure hash of a secret host-specific key along with the connection's * stable-id and the network address as specified by RFC7217. * This makes it impossible to use the address track host's presence, @@ -724,8 +733,8 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * replaced. * * 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 + * 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. * * Note that this setting is distinct from the Privacy Extensions as |