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

libnm: cleanup nm_utils_hwaddr_canonical() and nm_utils_hwaddr_valid()

Browse source 
- only call hwaddr_aton() once per function. Also, pass it sizeof(buf)
  as buffer size, it seems more correct.

- the only downside is that we now would always first parse up to 20
  characters, before comparing the requested length. Previously, a
  MAC address that was too long was rejected earlier (and the parsing
  aborted earlier). But that is a tiny overhead, also we expect that
  in common cases the MAC addresses are in fact of the right size,
  then there is no difference.
This commit is contained in:
Thomas Haller 2020-09-23 11:49:17 +02:00
parent dc3a477884
commit d5d45c8ce6
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
libnm-core/nm-utils.c
View file

@ -4217,17 +4217,17 @@ nm_utils_hwaddr_valid (const char *asc, gssize length)
gsize l;
g_return_val_if_fail (asc != NULL, FALSE);
g_return_val_if_fail ( length >= -1
&& length <= NM_UTILS_HWADDR_LEN_MAX, FALSE);
if (length > 0 && length <= NM_UTILS_HWADDR_LEN_MAX) {
if (!hwaddr_aton (asc, buf, length, &l))
return FALSE;
return length == l;
} else if (length == -1)
return !!hwaddr_aton (asc, buf, sizeof (buf), &l);
else if (length == 0)
if (length == 0)
return FALSE;
else
g_return_val_if_reached (FALSE);
if (!hwaddr_aton (asc, buf, sizeof (buf), &l))
return FALSE;
return length == -1
|| length == (gssize) l;
}
/**
@ -4250,19 +4250,15 @@ nm_utils_hwaddr_canonical (const char *asc, gssize length)
gsize l;
g_return_val_if_fail (asc, NULL);
g_return_val_if_fail (length == -1 || (length > 0 && length <= NM_UTILS_HWADDR_LEN_MAX), NULL);
if (length > 0 && length <= NM_UTILS_HWADDR_LEN_MAX) {
if (!hwaddr_aton (asc, buf, length, &l))
return NULL;
if (l != length)
return NULL;
} else if (length == -1) {
if (!hwaddr_aton (asc, buf, NM_UTILS_HWADDR_LEN_MAX, &l))
return NULL;
} else
g_return_val_if_reached (NULL);
g_return_val_if_fail ( length == -1
|| ( length > 0
&& length <= NM_UTILS_HWADDR_LEN_MAX), NULL);
if (!hwaddr_aton (asc, buf, sizeof (buf), &l))
return NULL;
if ( length != -1
&& length != (gssize) l)
return NULL;
return nm_utils_hwaddr_ntoa (buf, l);
}