colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib-aux: add _nm_utils_ip4_netmask_to_prefix() helper

Browse Source 
nm_utils_ip4_netmask_to_prefix() and nm_utils_ip4_prefix_to_netmask()
are public API in libnm.

We thus already have an internal implementation _nm_utils_ip4_prefix_to_netmask(),
for non-libnm users. Internally, we should never use the libnm variant.

For consistency and so that we have the helper available in
libnm-glib-aux, add _nm_utils_ip4_netmask_to_prefix().
This commit is contained in:
Thomas Haller
2022-06-23 07:39:59 +02:00
parent 7a33870bf1
commit 05014b328f
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libnm-core-impl/nm-utils.c
View File

@@ -1571,12 +1571,7 @@ nm_utils_ip4_routes_from_variant(GVariant *value)
guint32 guint32
nm_utils_ip4_netmask_to_prefix(guint32 netmask) nm_utils_ip4_netmask_to_prefix(guint32 netmask)
{ {
G_STATIC_ASSERT_EXPR(__SIZEOF_INT__ == 4); return _nm_utils_ip4_netmask_to_prefix(netmask);
G_STATIC_ASSERT_EXPR(sizeof(int) == 4);
G_STATIC_ASSERT_EXPR(sizeof(guint) == 4);
G_STATIC_ASSERT_EXPR(sizeof(netmask) == 4);
return ((netmask != 0u) ? (guint32) (32 - __builtin_ctz(ntohl(netmask))) : 0u);
} }
/** /**

11
src/libnm-glib-aux/nm-shared-utils.h
View File

@@ -389,6 +389,17 @@ gboolean nm_utils_get_ipv6_interface_identifier(NMLinkType link_type,
/*****************************************************************************/ /*****************************************************************************/
static inline guint32
_nm_utils_ip4_netmask_to_prefix(in_addr_t subnetmask)
{
G_STATIC_ASSERT_EXPR(__SIZEOF_INT__ == 4);
G_STATIC_ASSERT_EXPR(sizeof(int) == 4);
G_STATIC_ASSERT_EXPR(sizeof(guint) == 4);
G_STATIC_ASSERT_EXPR(sizeof(subnetmask) == 4);
return ((subnetmask != 0u) ? (guint32) (32 - __builtin_ctz(ntohl(subnetmask))) : 0u);
}
/** /**
* _nm_utils_ip4_prefix_to_netmask: * _nm_utils_ip4_prefix_to_netmask:
* @prefix: a CIDR prefix * @prefix: a CIDR prefix