fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-25 07:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: add duplicate for NM_UTILS_HWADDR_LEN_MAX to "nm-base/nm-base.h"

Browse source 
We will need this in "shared/nm-platform", but we don't want
to include "libnm-core/nm-utils.h" for that.
This commit is contained in:
Thomas Haller 2021-01-08 18:45:16 +01:00
parent 126681a965
commit 84d67d3a4f
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm-core/tests/test-general.c
View file

@ -75,6 +75,12 @@ G_STATIC_ASSERT(sizeof(bool) <= sizeof(int));
/*****************************************************************************/
/* NM_UTILS_HWADDR_LEN_MAX is public API of libnm(-core) and _NM_UTILS_HWADDR_LEN_MAX
* is internal API. They are the same, but the latter can be used without including libnm-core. */
G_STATIC_ASSERT(NM_UTILS_HWADDR_LEN_MAX == _NM_UTILS_HWADDR_LEN_MAX);
/*****************************************************************************/
static void
test_nm_ascii_spaces(void)
{

5
shared/nm-base/nm-base.h
View file

@ -8,6 +8,11 @@
/*****************************************************************************/
/* this must be the same as NM_UTILS_HWADDR_LEN_MAX from libnm. */
#define _NM_UTILS_HWADDR_LEN_MAX 20
/*****************************************************************************/
typedef enum {
NM_ETHTOOL_ID_UNKNOWN = -1,

6
src/platform/nm-platform-utils.c
View file

@ -1117,10 +1117,10 @@ nmp_utils_ethtool_get_permanent_address(int ifindex, guint8 *buf, size_t *length
{
struct {
struct ethtool_perm_addr e;
guint8 _extra_data[NM_UTILS_HWADDR_LEN_MAX + 1];
guint8 _extra_data[_NM_UTILS_HWADDR_LEN_MAX + 1];
} edata = {
.e.cmd = ETHTOOL_GPERMADDR,
.e.size = NM_UTILS_HWADDR_LEN_MAX,
.e.size = _NM_UTILS_HWADDR_LEN_MAX,
};
const guint8 *pdata;
@ -1131,7 +1131,7 @@ nmp_utils_ethtool_get_permanent_address(int ifindex, guint8 *buf, size_t *length
if (_ethtool_call_once(ifindex, &edata, sizeof(edata)) < 0)
return FALSE;
if (edata.e.size > NM_UTILS_HWADDR_LEN_MAX)
if (edata.e.size > _NM_UTILS_HWADDR_LEN_MAX)
return FALSE;
if (edata.e.size < 1)
return FALSE;