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

shared: add nm_utils_ipaddr_is_valid()/nm_utils_ipaddr_is_normalized() helpers

Browse source
This commit is contained in:
Thomas Haller 2020-01-09 12:01:34 +01:00
parent 0f9664f417
commit cdfbbe651b
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
shared/nm-glib-aux/nm-shared-utils.c
View file

@ -882,6 +882,43 @@ nm_utils_parse_inaddr_prefix (int addr_family,
/*****************************************************************************/
gboolean
nm_utils_ipaddr_is_valid (int addr_family,
const char *str_addr)
{
nm_assert (NM_IN_SET (addr_family, AF_UNSPEC, AF_INET, AF_INET6));
return str_addr
&& nm_utils_parse_inaddr_bin (addr_family,
str_addr,
NULL,
NULL);
}
gboolean
nm_utils_ipaddr_is_normalized (int addr_family,
const char *str_addr)
{
NMIPAddr addr;
char sbuf[NM_UTILS_INET_ADDRSTRLEN];
nm_assert (NM_IN_SET (addr_family, AF_UNSPEC, AF_INET, AF_INET6));
if (!str_addr)
return FALSE;
if (!nm_utils_parse_inaddr_bin (addr_family,
str_addr,
&addr_family,
&addr))
return FALSE;
nm_utils_inet_ntop (addr_family, &addr, sbuf);
return nm_streq (sbuf, str_addr);
}
/*****************************************************************************/
/* _nm_utils_ascii_str_to_int64:
*
* A wrapper for g_ascii_strtoll, that checks whether the whole string

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

@ -216,6 +216,14 @@ nm_utils_inet6_ntop_dup (const struct in6_addr *addr)
/*****************************************************************************/
gboolean nm_utils_ipaddr_is_valid (int addr_family,
const char *str_addr);
gboolean nm_utils_ipaddr_is_normalized (int addr_family,
const char *str_addr);
/*****************************************************************************/
#define NM_CMP_RETURN(c) \
G_STMT_START { \
const int _cc = (c); \