|
 |
f817d2 |
From 0214ea3f7df5b05e8852bd101f41eb0a90d2b510 Mon Sep 17 00:00:00 2001
|
|
|
ce53a8 |
From: Thomas Haller <thaller@redhat.com>
|
|
|
ce53a8 |
Date: Thu, 9 Jun 2022 10:00:47 +0200
|
|
|
ce53a8 |
Subject: [PATCH 1/1] platform: workaround for preserving IPv6 address order
|
|
|
ce53a8 |
|
|
|
ce53a8 |
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/ ## 1021
|
|
|
ce53a8 |
---
|
|
|
f817d2 |
src/libnm-platform/nm-platform.c | 25 ++++++++++++++++++++-----
|
|
|
f817d2 |
1 file changed, 20 insertions(+), 5 deletions(-)
|
|
|
ce53a8 |
|
|
|
ce53a8 |
diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c
|
|
|
f817d2 |
index b1ae168f6687..c654bd45254d 100644
|
|
|
ce53a8 |
--- a/src/libnm-platform/nm-platform.c
|
|
|
ce53a8 |
+++ b/src/libnm-platform/nm-platform.c
|
|
|
f817d2 |
@@ -3978,11 +3978,26 @@ nm_platform_ip_address_sync(NMPlatform *self,
|
|
|
ce53a8 |
/* @plat_addresses for IPv6 must be sorted in decreasing priority order (highest priority addresses first).
|
|
|
ce53a8 |
* IPv4 are probably unsorted or sorted with lowest priority first, but their order doesn't matter because
|
|
|
ce53a8 |
* we check the "secondary" flag. */
|
|
|
f817d2 |
- plat_addresses = nm_platform_lookup_clone(
|
|
|
f817d2 |
- self,
|
|
|
f817d2 |
- nmp_lookup_init_object(&lookup, NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4), ifindex),
|
|
|
f817d2 |
- NULL,
|
|
|
f817d2 |
- NULL);
|
|
|
ce53a8 |
+ if (IS_IPv4) {
|
|
|
f817d2 |
+ plat_addresses = nm_platform_lookup_clone(
|
|
|
f817d2 |
+ self,
|
|
|
f817d2 |
+ nmp_lookup_init_object(&lookup, NMP_OBJECT_TYPE_IP_ADDRESS(IS_IPv4), ifindex),
|
|
|
f817d2 |
+ NULL,
|
|
|
f817d2 |
+ NULL);
|
|
|
ce53a8 |
+ } else {
|
|
|
ce53a8 |
+ /* HACK: early 1.36 versions had a bug of not actually reordering the IPv6 addresses.
|
|
|
ce53a8 |
+ * This was fixed by commit cd4601802de5 ('platform: fix address order in
|
|
|
ce53a8 |
+ * nm_platform_ip_address_sync()').
|
|
|
ce53a8 |
+ *
|
|
|
ce53a8 |
+ * However, also in 1.36, the actually implemented order of IPv6 addresses is not
|
|
|
ce53a8 |
+ * the one we want ([1]). So disable the fix again, to not reorder IPv6 addresses.
|
|
|
ce53a8 |
+ *
|
|
|
ce53a8 |
+ * The effect is, that DHCPv6 addresses end up being preferred over SLAAC, because
|
|
|
ce53a8 |
+ * they get added later during activation. Of course, if any address gets added
|
|
|
ce53a8 |
+ * even later (like a new router appearing), then the order will be wrong again.
|
|
|
ce53a8 |
+ *
|
|
|
ce53a8 |
+ * [1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1021 */
|
|
|
ce53a8 |
+ }
|
|
|
ce53a8 |
|
|
|
ce53a8 |
if (nm_g_ptr_array_len(plat_addresses) > 0) {
|
|
|
ce53a8 |
/* Delete addresses that interfere with our intended order. */
|
|
|
ce53a8 |
--
|
|
|
ce53a8 |
2.36.1
|
|
|
f817d2 |
|