platform: fix capturing IPv4 addresses from platform for assuming after restart
Related: #1916192 Signed-off-by: Wen Liang <wenliang@redhat.com>
This commit is contained in:
Wen Liang
parent
72aafef318
commit
bd7882e37c
|
|
@ -0,0 +1,48 @@
|
|||
From af06ca8b1190240146f746f8aeca6fd11bfbe6ad Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Thu, 19 Aug 2021 13:35:27 +0200
|
||||
Subject: [PATCH] platform: fix capturing addresses from platform for assuming
|
||||
after restart
|
||||
|
||||
Commit c631aa48f034 ('platform: capture NMIP[46]Config from platform
|
||||
with correct (reversed) order of IP addresses') changed this for IPv6
|
||||
and IPv4, but it's not correct for IPv4.
|
||||
|
||||
For IPv6, later `ip addr add` calls adds a new primary address, which
|
||||
is also listed in `ip addr show` first. Hence, as NMIP6Config tracks
|
||||
addresses in increasing priority, while NMPlatform tracks them as
|
||||
exposed by kernel, the order when appending addresses form platform
|
||||
to NMIP6Config must be reversed.
|
||||
|
||||
That is not the case for IPv4. For IPv4, later `ip addr add` calls
|
||||
add a secondary IP address. Also, in `ip addr show` output they are
|
||||
appended. Consequently, IPv4 addresses are tracked by NMPlatform with
|
||||
decreasing priority (in the reverse order than for IPv6).
|
||||
|
||||
Fix constructing the NMIP4Config by fixing the address order. This is
|
||||
important, because during restart devices get assumed and our code would
|
||||
configure the order of addresses as it finds them.
|
||||
|
||||
Fixes: c631aa48f034 ('platform: capture NMIP[46]Config from platform with correct (reversed) order of IP addresses')
|
||||
(cherry picked from commit c380893dc6757e30b429f968bc90bc1edda68998)
|
||||
(cherry picked from commit 605373b38ab463826bd7eb80408fb2cfae07ee91)
|
||||
---
|
||||
src/core/nm-ip4-config.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c
|
||||
index 90531d0291..52a8faa791 100644
|
||||
--- a/src/core/nm-ip4-config.c
|
||||
+++ b/src/core/nm-ip4-config.c
|
||||
@@ -543,7 +543,7 @@ nm_ip4_config_capture(NMDedupMultiIndex *multi_idx, NMPlatform *platform, int if
|
||||
|
||||
head_entry = nm_platform_lookup_object(platform, NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex);
|
||||
if (head_entry) {
|
||||
- nmp_cache_iter_for_each_reverse (&iter, head_entry, &plobj) {
|
||||
+ nmp_cache_iter_for_each (&iter, head_entry, &plobj) {
|
||||
if (!_nm_ip_config_add_obj(priv->multi_idx,
|
||||
&priv->idx_ip4_addresses_,
|
||||
ifindex,
|
||||
--
|
||||
2.26.3
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
From d0ba892917461659b5b1e429fb217218ff204379 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Thu, 19 Aug 2021 13:53:29 +0200
|
||||
Subject: [PATCH] nmcli/docs: fix address order in ipv46.addresses
|
||||
documentation for `man nm-settings-nmcli`
|
||||
|
||||
For IPv4, the order is not like for IPv6. Of course not.
|
||||
|
||||
Fixes: 7aa4ad0fa22c ('nmcli/docs: better describe ipv[46].addresses in `man nm-settings-nmcli`')
|
||||
(cherry picked from commit 2f3c2647d2263bf565fd21d14a3db56f6a063b91)
|
||||
(cherry picked from commit dd8bc31fdb37acc2780f94defeb54e80bb1acf53)
|
||||
---
|
||||
src/libnm-core-impl/nm-setting-ip4-config.c | 2 +-
|
||||
src/libnmc-setting/settings-docs.h.in | 2 +-
|
||||
src/nmcli/generate-docs-nm-settings-nmcli.xml.in | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c
|
||||
index b3a18bcae7..a24ebcfb5c 100644
|
||||
--- a/src/libnm-core-impl/nm-setting-ip4-config.c
|
||||
+++ b/src/libnm-core-impl/nm-setting-ip4-config.c
|
||||
@@ -967,7 +967,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
|
||||
* format: a comma separated list of addresses
|
||||
* description: A list of IPv4 addresses and their prefix length. Multiple addresses
|
||||
* can be separated by comma. For example "192.168.1.5/24, 10.1.0.5/24".
|
||||
- * The addresses are listed in increasing priority, meaning the last address will
|
||||
+ * The addresses are listed in decreasing priority, meaning the first address will
|
||||
* be the primary address.
|
||||
* ---end---
|
||||
*/
|
||||
diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in
|
||||
index 12625d4459..85c5aca1e4 100644
|
||||
--- a/src/libnmc-setting/settings-docs.h.in
|
||||
+++ b/src/libnmc-setting/settings-docs.h.in
|
||||
@@ -226,7 +226,7 @@
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_REMOTE N_("The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TOS N_("The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
|
||||
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"192.168.1.5/24, 10.1.0.5/24\". The addresses are listed in increasing priority, meaning the last address will be the primary address.")
|
||||
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"192.168.1.5/24, 10.1.0.5/24\". The addresses are listed in decreasing priority, meaning the first address will be the primary address.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier 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 \"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 stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
|
||||
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
index 88803094d6..ca5225ba28 100644
|
||||
--- a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
+++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
@@ -650,7 +650,7 @@
|
||||
description="DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the "rotate" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured." />
|
||||
<property name="addresses"
|
||||
alias="ip4"
|
||||
- description="A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example "192.168.1.5/24, 10.1.0.5/24". The addresses are listed in increasing priority, meaning the last address will be the primary address." />
|
||||
+ description="A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example "192.168.1.5/24, 10.1.0.5/24". The addresses are listed in decreasing priority, meaning the first address will be the primary address." />
|
||||
<property name="gateway"
|
||||
alias="gw4"
|
||||
description="The gateway associated with this configuration. This is only meaningful if "addresses" is also set. The gateway's main purpose is to control the next hop of the standard default route on the device. Hence, the gateway property conflicts with "never-default" and will be automatically dropped if the IP configuration is set to never-default. As an alternative to set the gateway, configure a static default route with /0 as prefix length." />
|
||||
--
|
||||
2.26.3
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
%global epoch_version 1
|
||||
%global rpm_version 1.32.10
|
||||
%global real_version 1.32.10
|
||||
%global release_version 1
|
||||
%global release_version 2
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
|
||||
|
|
@ -191,7 +191,8 @@ Source6: 70-nm-connectivity.conf
|
|||
# the next rebase of the source tarball.
|
||||
|
||||
# Bugfixes that are only relevant until next rebase of the package.
|
||||
#Patch1000: 1000-some.patch
|
||||
Patch1000: 1000-platform-fix-capturing-addresses-from-platform-for-assuming-after-restart.patch
|
||||
Patch1001: 1001-nmcli-docs-fix-address-order-in-ipv46-addresses-documentation-for-nm-settings-nmcli.patch
|
||||
|
||||
# The pregenerated docs contain default values and paths that depend
|
||||
# on the configure options when creating the source tarball.
|
||||
|
|
@ -1161,6 +1162,9 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 19 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.10-2
|
||||
- platform: fix capturing IPv4 addresses from platform for assuming after restart
|
||||
|
||||
* Thu Aug 19 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.10-1
|
||||
- Upgrade to 1.32.10 release
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue