From 60ef3a3e5941399d87d893d51b6d03d6789600af Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 14 Feb 2020 15:37:28 +0100 Subject: [PATCH] ifcfg-rh: belatedly add support for "ipv6.dhcp-timeout" setting (cherry picked from commit 843c546b84832a1ac737cfe0732bd5651c7ce6fe) --- libnm-core/nm-setting-ip6-config.c | 8 ++++++++ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 7 ++++--- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 7 +++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 4cbda8304b..e7542b80ef 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -657,6 +657,14 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *klass) * ---end--- */ + /* ---ifcfg-rh--- + * property: dhcp-timeout + * variable: IPV6_DHCP_TIMEOUT(+) + * description: A timeout after which the DHCP transaction fails in case of no response. + * example: IPV6_DHCP_TIMEOUT=10 + * ---end--- + */ + /* ---ifcfg-rh--- * property: dhcp-hostname-flags * variable: DHCPV6_HOSTNAME_FLAGS diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 79e8e8a23f..5804d33c56 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -2159,9 +2159,10 @@ make_ip6_setting (shvarFile *ifcfg, if (v) g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, v, NULL); - g_object_set (s_ip6, NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, - svGetValueBoolean (ifcfg, "DHCPV6_SEND_HOSTNAME", TRUE), NULL); - + g_object_set (s_ip6, + NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, svGetValueBoolean (ifcfg, "DHCPV6_SEND_HOSTNAME", TRUE), + NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, (int) svGetValueInt64 (ifcfg, "IPV6_DHCP_TIMEOUT", 10, 0, G_MAXINT32, 0), + NULL); i64 = svGetValueInt64 (ifcfg, "DHCPV6_HOSTNAME_FLAGS", 10, 0, G_MAXUINT32, -1); if (i64 > -1) { diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index 7c3c3e085c..4700120e66 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -2767,6 +2767,7 @@ write_ip6_setting (NMConnection *connection, NMSettingIP6ConfigAddrGenMode addr_gen_mode; NMDhcpHostnameFlags flags; const char *hostname; + int timeout; NM_SET_OUT (out_route6_content, NULL); @@ -2844,6 +2845,12 @@ write_ip6_setting (NMConnection *connection, else svSetValueStr (ifcfg, "DHCPV6_SEND_HOSTNAME", "no"); + timeout = nm_setting_ip_config_get_dhcp_timeout (s_ip6); + svSetValueInt64_cond (ifcfg, + "IPV6_DHCP_TIMEOUT", + timeout != 0, + timeout); + flags = nm_setting_ip_config_get_dhcp_hostname_flags (s_ip6); svSetValueInt64_cond (ifcfg, "DHCPV6_HOSTNAME_FLAGS",