system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 20:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

platform,glib-aux: move and rename nm_platform_ip4_broadcast_address_create()

Browse source
This commit is contained in:
Thomas Haller 2022-09-20 12:55:00 +02:00
parent cc36baa5c7
commit a8931585be
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/platform/tests/test-cleanup.c
View file

@ -73,7 +73,7 @@ test_cleanup_internal(void)
addr4,
plen4,
addr4,
nm_platform_ip4_broadcast_address_create(addr4, plen4),
nm_ip4_addr_get_broadcast_address(addr4, plen4),
lifetime,
preferred,
0,

21
src/core/platform/tests/test-route.c
View file

@ -691,17 +691,16 @@ test_ip4_route_options(gconstpointer test_data)
const NMPlatformIP4Address *a = &addr[i];
g_assert(a->ifindex == IFINDEX);
g_assert(nm_platform_ip4_address_add(
NM_PLATFORM_GET,
a->ifindex,
a->address,
a->plen,
a->peer_address,
nm_platform_ip4_broadcast_address_create(a->address, a->plen),
a->lifetime,
a->preferred,
a->n_ifa_flags,
a->label));
g_assert(nm_platform_ip4_address_add(NM_PLATFORM_GET,
a->ifindex,
a->address,
a->plen,
a->peer_address,
nm_ip4_addr_get_broadcast_address(a->address, a->plen),
a->lifetime,
a->preferred,
a->n_ifa_flags,
a->label));
if (a->peer_address == a->address)
_wait_for_ipv4_addr_device_route(NM_PLATFORM_GET, 200, a->ifindex, a->address, a->plen);
}

6
src/libnm-glib-aux/nm-inet-utils.h
View file

@ -174,6 +174,12 @@ nm_ip4_addr_netmask_from_prefix(guint32 prefix)
guint32 nm_ip4_addr_get_default_prefix0(in_addr_t ip);
guint32 nm_ip4_addr_get_default_prefix(in_addr_t ip);
static inline in_addr_t
nm_ip4_addr_get_broadcast_address(in_addr_t address, guint8 plen)
{
return address | ~nm_ip4_addr_netmask_from_prefix(plen);
}
gconstpointer
nm_ip_addr_clear_host_address(int family, gpointer dst, gconstpointer src, guint32 plen);

8
src/libnm-platform/nm-platform.h
View file

@ -1422,12 +1422,6 @@ GType nm_platform_get_type(void);
/*****************************************************************************/
static inline in_addr_t
nm_platform_ip4_broadcast_address_create(in_addr_t address, guint8 plen)
{
return address | ~nm_ip4_addr_netmask_from_prefix(plen);
}
static inline in_addr_t
nm_platform_ip4_broadcast_address_from_addr(const NMPlatformIP4Address *addr)
{
@ -1439,7 +1433,7 @@ nm_platform_ip4_broadcast_address_from_addr(const NMPlatformIP4Address *addr)
/* the set broadcast-address gets ignored, and we determine a default brd base
* on the peer IFA_ADDRESS. */
if (addr->peer_address != 0u && addr->plen < 31 /* RFC3021 */)
return nm_platform_ip4_broadcast_address_create(addr->peer_address, addr->plen);
return nm_ip4_addr_get_broadcast_address(addr->peer_address, addr->plen);
return 0u;
}