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

dns/resolved: sort dirty interfaces to prune in "nm-dns-systemd-resolved.c"

Browse source 
When we do something where the order makes a visible difference,
we should do it in a consistent way, that does not depend on arbitray
things. Sort the ifindexes from dirty_interfaces hash table.
This commit is contained in:
Thomas Haller 2022-02-11 18:48:26 +01:00
parent 39b68d72d3
commit 51cec67253
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/core/dns/nm-dns-systemd-resolved.c
View file

@ -569,6 +569,7 @@ update(NMDnsPlugin *plugin,
gpointer pointer;
NMDnsConfigIPData *ip_data;
GHashTableIter iter;
gs_unref_array GArray *dirty_array = NULL;
guint i;
/* Group configs by ifindex/interfaces. */
@ -611,22 +612,33 @@ update(NMDnsPlugin *plugin,
* reset the resolved configuration for that ifindex. */
g_hash_table_iter_init(&iter, priv->dirty_interfaces);
while (g_hash_table_iter_next(&iter, &pointer, NULL)) {
int ifindex = GPOINTER_TO_INT(pointer);
InterfaceConfig ic;
int ifindex = GPOINTER_TO_INT(pointer);
if (g_hash_table_contains(interfaces, GINT_TO_POINTER(ifindex))) {
/* the interface is still tracked and still dirty. Keep. */
continue;
}
_LOGT("clear previously configured ifindex %d", ifindex);
ic = (InterfaceConfig){
.ifindex = ifindex,
.configs_lst_head = C_LIST_INIT(ic.configs_lst_head),
};
prepare_one_interface(self, &ic);
if (!dirty_array)
dirty_array = g_array_new(FALSE, FALSE, sizeof(int));
g_array_append_val(dirty_array, ifindex);
g_hash_table_iter_remove(&iter);
}
if (dirty_array) {
g_array_sort_with_data(dirty_array, nm_cmp_int2ptr_p_with_data, NULL);
for (i = 0; i < dirty_array->len; i++) {
int ifindex = g_array_index(dirty_array, int, i);
InterfaceConfig ic;
_LOGT("clear previously configured ifindex %d", ifindex);
ic = (InterfaceConfig){
.ifindex = ifindex,
.configs_lst_head = C_LIST_INIT(ic.configs_lst_head),
};
prepare_one_interface(self, &ic);
}
}
priv->send_updates_waiting = TRUE;
send_updates(self);