fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 15:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: add ascending/descending functions for ip6_address_scope_cmp*()

Browse source 
It seems easier to read, than passing a boolean parameter.

(cherry picked from commit 305f11069f)
This commit is contained in:
Thomas Haller 2022-03-28 21:36:16 +02:00
parent e9d3ba66df
commit 2e6d45cb4e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/libnm-platform/nm-platform.c
View file

@ -3942,21 +3942,19 @@ ip6_address_scope(const NMPlatformIP6Address *a)
}
static int
ip6_address_scope_cmp(gconstpointer p_a, gconstpointer p_b, gpointer increasing)
ip6_address_scope_cmp_ascending(gconstpointer p_a, gconstpointer p_b, gpointer unused)
{
const NMPlatformIP6Address *a;
const NMPlatformIP6Address *b;
if (!increasing)
NM_SWAP(&p_a, &p_b);
a = NMP_OBJECT_CAST_IP6_ADDRESS(*(const NMPObject *const *) p_a);
b = NMP_OBJECT_CAST_IP6_ADDRESS(*(const NMPObject *const *) p_b);
NM_CMP_DIRECT(ip6_address_scope(a), ip6_address_scope(b));
NM_CMP_DIRECT(ip6_address_scope(NMP_OBJECT_CAST_IP6_ADDRESS(*(const NMPObject *const *) p_a)),
ip6_address_scope(NMP_OBJECT_CAST_IP6_ADDRESS(*(const NMPObject *const *) p_b)));
return 0;
}
static int
ip6_address_scope_cmp_descending(gconstpointer p_a, gconstpointer p_b, gpointer unused)
{
return ip6_address_scope_cmp_ascending(p_b, p_a, NULL);
}
/**
* nm_platform_ip_address_sync:
* @self: platform instance
@ -4041,9 +4039,7 @@ nm_platform_ip_address_sync(NMPlatform *self,
* unnecessary change the order of addresses with different scopes. */
if (!IS_IPv4) {
if (known_addresses)
g_ptr_array_sort_with_data(known_addresses,
ip6_address_scope_cmp,
GINT_TO_POINTER(TRUE));
g_ptr_array_sort_with_data(known_addresses, ip6_address_scope_cmp_ascending, NULL);
}
if (!_addr_array_clean_expired(addr_family,
@ -4212,9 +4208,7 @@ nm_platform_ip_address_sync(NMPlatform *self,
/* For IPv6, we only compare addresses per-scope. Addresses in different
* scopes don't have a defined order. */
g_ptr_array_sort_with_data(plat_addresses,
ip6_address_scope_cmp,
GINT_TO_POINTER(FALSE));
g_ptr_array_sort_with_data(plat_addresses, ip6_address_scope_cmp_descending, NULL);
known_addresses_len = nm_g_ptr_array_len(known_addresses);