colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/config: fix duplicate entires in NetworkManager --print-config output

Browse Source 
_nm_config_data_log_sort() is used for sorting the groups in the
keyfile during nm_config_data_log(). The idea is to present the keyfile
in a defined, but useful order.

However, it is not a total order. That is, it will return c=0 (equal) for
certain groups, if the pre-existing order in the GKeyFile should be
honored. For example, we want to sort all [device*] sections close to
each other, but we want to preserve their relative order. In that case,
the function would return 0 although the group names differed.

Also, _nm_config_data_log_sort() does not expect to receive duplicate names.
It would return c!=0 for comparing "device" and "device".

This means, _nm_config_data_log_sort() is fine for sorting the input as
we have it. However, it cannot be used to binary search the groups. This
caused that some sections might be duplicated in the `NetworkManager
--print-config` output. Otherwise, it had no bad effects.

Fixes(no-backport): 78d34d7c2e ('config: fix printing default values for missing sections')
This commit is contained in:
Thomas Haller
2022-09-08 16:56:16 +02:00
parent e7f76d025f
commit f6345180b1
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/nm-config-data.c
View File

@@ -634,6 +634,8 @@ _nm_config_data_log_sort(const char **pa, const char **pb, gpointer dummy)
const char *a = *pa;
const char *b = *pb;
nm_assert(a && b && !nm_streq(a, b));
/* we sort intern groups to the end. */
a_is_intern = g_str_has_prefix(a, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
b_is_intern = g_str_has_prefix(b, NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN);
@@ -770,27 +772,48 @@ nm_config_data_log(const NMConfigData *self,
groups_full = g_ptr_array_sized_new(ngroups + 5);
if (ngroups) {
/* g_key_file_get_groups() can return duplicates ( :( ), but the
* keyfile that we constructed should not have any. Assert for that. */
nm_assert(!nm_strv_has_duplicate((const char *const *) groups, ngroups, FALSE));
g_ptr_array_set_size(groups_full, ngroups);
memcpy(groups_full->pdata, groups, sizeof(groups[0]) * ngroups);
g_ptr_array_sort_with_data(groups_full, (GCompareDataFunc) _nm_config_data_log_sort, NULL);
}
if (print_default) {
for (g = 0; g < G_N_ELEMENTS(default_values); g++) {
const char *group = default_values[g].group;
gssize idx;
guint g2;
idx = nm_utils_array_find_binary_search((gconstpointer *) groups_full->pdata,
sizeof(char *),
groups_full->len,
&group,
(GCompareDataFunc) _nm_config_data_log_sort,
NULL);
if (idx < 0)
g_ptr_array_insert(groups_full, (~idx), (gpointer) group);
if (g > 0) {
if (nm_streq(group, default_values[g - 1].group)) {
/* Repeated values. We already added this one. Skip */
continue;
}
if (NM_MORE_ASSERT_ONCE(20)) {
/* We require that the default values are grouped by their "group".
* That is, all default values for a certain "group" are close to
* each other in the list. Assert for that. */
for (g2 = g + 1; g2 < groups_full->len; g2++) {
nm_assert(!nm_streq(default_values[g - 1].group, default_values[g2].group));
}
}
}
for (g2 = 0; g2 < groups_full->len; g2++) {
if (nm_streq(group, groups_full->pdata[g2]))
goto next;
}
g_ptr_array_add(groups_full, (gpointer) group);
next:
(void) 0;
}
}
g_ptr_array_sort_with_data(groups_full, (GCompareDataFunc) _nm_config_data_log_sort, NULL);
if (!stream)
_LOG(stream, prefix, "config-data[%p]: %u groups", self, groups_full->len);