summary refs log tree commit diff
path: root/libnm-core/nm-core-internal.h
diff options
context:
space:
mode:
authorAron Xu <aron@debian.org>2016-12-20 20:07:38 +0800
committerAron Xu <aron@debian.org>2016-12-20 20:07:38 +0800
commit3bf5cabfc7d7a3c7fdb4e2bc3d771d2a07db8bc0 (patch)
tree1ac587c7e73af842b847599dc29b44430bf112ff /libnm-core/nm-core-internal.h
parent1836daa45f4f0d8d0b791ed020774b915e9dd92d (diff)
parent45cb5bb3c0e6edb887cf69b417fcaf7053814a9b (diff)
Merge tag 'upstream/1.4.4'
Upstream version 1.4.4
Diffstat (limited to 'libnm-core/nm-core-internal.h')
-rw-r--r--libnm-core/nm-core-internal.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index e491bce6..5d3c190a 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -123,7 +123,10 @@ guint32 _nm_setting_get_setting_priority (NMSetting *setting);
 
 gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue *value);
 
-guint _nm_utils_hwaddr_length (const char *asc);
+#define NM_UTILS_HWADDR_LEN_MAX_STR (NM_UTILS_HWADDR_LEN_MAX * 3)
+
+guint8 *_nm_utils_hwaddr_aton (const char *asc, gpointer buffer, gsize buffer_length, gsize *out_length);
+const char *nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_case, char *buf, gsize buf_len);
 
 char *_nm_utils_bin2str (gconstpointer addr, gsize length, gboolean upper_case);