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

We will need this in "shared/nm-platform", but we don't want
to include "libnm-core/nm-utils.h" for that.

3 files changed, 14 insertions, 3 deletions

diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 0d84d07a48..2210f9f1d9 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -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)
 {
diff --git a/shared/nm-base/nm-base.h b/shared/nm-base/nm-base.h
index c9f1c095bd..f0a5d345e6 100644
--- a/shared/nm-base/nm-base.h
+++ b/shared/nm-base/nm-base.h
@@ -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,
 
diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index a1b14b8679..f40059a049 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -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;