fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 19:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: accept ipv[46].dhcp-iaid as hexstr

Browse source 
dhclient exports the currently used IAID in the environment as
hex string. We expose this environment in our API, so this is also
the format that NetworkManager uses.

Accept setting the ipv[46].dhcp-iaid as hex string, so that the same
format is accepted on the profile.

While at it, also accept a hex number (0x) because it is also
convenient, and this change already introduces the precedent that the
IAID string is not unique/normalized.

(cherry picked from commit e5dc489197)
(cherry picked from commit 0b4446e252)
This commit is contained in:
Thomas Haller 2023-02-20 15:58:20 +01:00
parent 5f8b0c4713
commit c45c5c37a4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libnm-core-impl/nm-utils.c
View file

@ -5592,7 +5592,8 @@ _nm_utils_bridge_vlan_verify_list(GPtrArray *vlans,
gboolean
_nm_utils_iaid_verify(const char *str, gint64 *out_value)
{
gint64 iaid;
gint64 i64;
guint32 u32;
NM_SET_OUT(out_value, -1);
@ -5602,10 +5603,16 @@ _nm_utils_iaid_verify(const char *str, gint64 *out_value)
if (NM_IAID_IS_SPECIAL(str))
return TRUE;
if (NM_STRCHAR_ALL(str, ch, ch >= '0' && ch <= '9') && (str[0] != '0' || str[1] == '\0')
&& (iaid = _nm_utils_ascii_str_to_int64(str, 10, 0, G_MAXUINT32, -1)) != -1) {
NM_SET_OUT(out_value, iaid);
return TRUE;
if (NM_STRCHAR_ALL(str, ch, g_ascii_isxdigit(ch) || NM_IN_SET(ch, 'x', ':'))) {
if ((i64 = _nm_utils_ascii_str_to_int64(str, 0, 0, G_MAXUINT32, -1)) != -1) {
NM_SET_OUT(out_value, i64);
return TRUE;
}
if (nm_dhcp_iaid_from_hexstr(str, &u32)) {
NM_SET_OUT(out_value, u32);
return TRUE;
}
}
return FALSE;