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

platform: refactor build_rtnl_addr() by replacing addr4_to_broadcast()

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-03-07 16:33:40 +01:00
parent 857e5e0b21
commit 38ffd3eb9b
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/platform/nm-linux-platform.c
View File

@@ -2953,25 +2953,6 @@ ip6_address_get_all (NMPlatform *platform, int ifindex)
return addresses; return addresses;
} }
static void
addr4_to_broadcast (struct in_addr *dst, const struct in_addr *src, guint8 plen)
{
guint nbytes = plen / 8;
guint nbits = plen % 8;
g_return_if_fail (plen <= 32);
g_assert (src);
g_assert (dst);
if (plen >= 32)
*dst = *src;
else {
dst->s_addr = 0xFFFFFFFF;
memcpy (dst, src, nbytes);
((guint8 *) dst)[nbytes] = (((const guint8 *) src)[nbytes] | (0xFF >> nbits));
}
}
#define IPV4LL_NETWORK (htonl (0xA9FE0000L)) #define IPV4LL_NETWORK (htonl (0xA9FE0000L))
#define IPV4LL_NETMASK (htonl (0xFFFF0000L)) #define IPV4LL_NETMASK (htonl (0xFFFF0000L))
@@ -3010,10 +2991,10 @@ build_rtnl_addr (int family,
/* IPv4 Broadcast address */ /* IPv4 Broadcast address */
if (family == AF_INET) { if (family == AF_INET) {
struct in_addr bcast; in_addr_t bcast;
auto_nl_addr struct nl_addr *bcaddr = NULL; auto_nl_addr struct nl_addr *bcaddr = NULL;
addr4_to_broadcast (&bcast, addr, plen); bcast = *((in_addr_t *) addr) | ~nm_utils_ip4_prefix_to_netmask (plen);
bcaddr = nl_addr_build (family, &bcast, addrlen); bcaddr = nl_addr_build (family, &bcast, addrlen);
g_assert (bcaddr); g_assert (bcaddr);
rtnl_addr_set_broadcast (rtnladdr, bcaddr); rtnl_addr_set_broadcast (rtnladdr, bcaddr);