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

dhcp: improve error message in assertion of NMDhcpOption data

Browse source 
We have global data NMDhcpOption that describes the DHCP meta data.
There is a consistency check with NM_MORE_ASSERTS.

Improve the error message when the meta data is inconsistent to
help finding the bug.
This commit is contained in:
Thomas Haller 2022-02-01 15:35:47 +01:00
parent 3034b99c00
commit dd85cb1958
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/dhcp/nm-dhcp-options.c
View file

@ -247,7 +247,7 @@ _sorted_options_generate_sort(gconstpointer pa, gconstpointer pb, gpointer user_
const NMDhcpOption *const *b = pb;
NM_CMP_DIRECT((*a)->option_num, (*b)->option_num);
return nm_assert_unreachable_val(0);
return 0;
}
static char *
@ -283,6 +283,16 @@ _ASSERT_sorted(int IS_IPv4, const NMDhcpOption *const *const sorted, int n)
for (i = 0; i < n; i++) {
const NMDhcpOption *opt = sorted[i];
if (!opt || opt < options || opt >= &options[n]) {
g_error("%s:%d: _sorted_options_%c[%d] must be a valid pointer into "
"_nm_dhcp_option_dhcp%c_options, but is %p",
__FILE__,
__LINE__,
IS_IPv4 ? '4' : '6',
i,
IS_IPv4 ? '4' : '6',
opt);
}
g_assert(opt);
g_assert(opt >= options);
g_assert(opt < &options[n]);
@ -291,7 +301,7 @@ _ASSERT_sorted(int IS_IPv4, const NMDhcpOption *const *const sorted, int n)
const NMDhcpOption *opt2 = sorted[j];
if (opt == opt2) {
g_error("%s:%d: the _sorted_options_%c at [%d] (opt=%u, %s) is duplicated at "
g_error("%s:%d: _sorted_options_%c[%d] (opt=%u, %s) is duplicated at "
"[%d] (SORT: %s)",
__FILE__,
__LINE__,
@ -308,7 +318,7 @@ _ASSERT_sorted(int IS_IPv4, const NMDhcpOption *const *const sorted, int n)
const NMDhcpOption *opt2 = sorted[i - 1];
if (opt2->option_num >= opt->option_num) {
g_error("%s:%d: the _sorted_options_%c at [%d] (opt=%u, %s) should come before "
g_error("%s:%d: _sorted_options_%c[%d] (opt=%u, %s) should come before "
"[%d] (opt=%u, %s) (SORT: %s)",
__FILE__,
__LINE__,