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

shared: add NM_IP_ADDR_ZERO macro for initializing NMIPAddr to zero

Browse source
This commit is contained in:
Thomas Haller 2020-01-09 12:32:28 +01:00
parent 8f3b43f009
commit b9c5c07c4d
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8334,6 +8334,9 @@ test_nm_ip_addr_zero (void)
in_addr_t a4 = nmtst_inet4_from_string ("0.0.0.0");
struct in6_addr a6 = *nmtst_inet6_from_string ("::");
char buf[NM_UTILS_INET_ADDRSTRLEN];
NMIPAddr a = NM_IP_ADDR_INIT;
g_assert (memcmp (&a, &nm_ip_addr_zero, sizeof (a)) == 0);
g_assert (IN6_IS_ADDR_UNSPECIFIED (&nm_ip_addr_zero.addr6));
g_assert (memcmp (&nm_ip_addr_zero.addr6, &in6addr_any, sizeof (in6addr_any)) == 0);
@ -8346,6 +8349,8 @@ test_nm_ip_addr_zero (void)
g_assert_cmpstr (nm_utils_inet_ntop (AF_INET, &nm_ip_addr_zero, buf), ==, "0.0.0.0");
g_assert_cmpstr (nm_utils_inet_ntop (AF_INET6, &nm_ip_addr_zero, buf), ==, "::");
G_STATIC_ASSERT_EXPR (sizeof (a) == sizeof (a.array));
}
/*****************************************************************************/

4
shared/nm-glib-aux/nm-shared-utils.h
View file

@ -115,9 +115,13 @@ typedef struct {
* However, as ethernet addresses fit in here nicely, use
* it also for an ethernet MAC address. */
guint8 addr_eth[6 /*ETH_ALEN*/];
guint8 array[sizeof (struct in6_addr)];
};
} NMIPAddr;
#define NM_IP_ADDR_INIT { .array = { 0 } }
extern const NMIPAddr nm_ip_addr_zero;
static inline gboolean