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

platform: set IPv4 broadcast address too (rh #1032819)

Browse Source 
When moving over the platform, setting of the IPv4 broadcast address
got lost.  Bring it back.

https://bugzilla.redhat.com/show_bug.cgi?id=1032819
This commit is contained in:
Dan Williams
2013-12-03 11:42:28 -06:00
parent ebace3def5
commit 7eb12a5b21
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2217,6 +2217,25 @@ 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));
}
}
static struct nl_object * static struct nl_object *
build_rtnl_addr (int family, build_rtnl_addr (int family,
int ifindex, int ifindex,
@@ -2234,10 +2253,23 @@ build_rtnl_addr (int family,
g_assert (rtnladdr && nladdr); g_assert (rtnladdr && nladdr);
/* IP address */
rtnl_addr_set_ifindex (rtnladdr, ifindex); rtnl_addr_set_ifindex (rtnladdr, ifindex);
nle = rtnl_addr_set_local (rtnladdr, nladdr); nle = rtnl_addr_set_local (rtnladdr, nladdr);
g_assert (!nle); g_assert (!nle);
/* IPv4 Broadcast address */
if (family == AF_INET) {
struct in_addr bcast;
auto_nl_addr struct nl_addr *bcaddr;
addr4_to_broadcast (&bcast, addr, plen);
bcaddr = nl_addr_build (family, &bcast, addrlen);
g_assert (bcaddr);
rtnl_addr_set_broadcast (rtnladdr, bcaddr);
}
/* Peer/point-to-point address */
if (peer_addr) { if (peer_addr) {
auto_nl_addr struct nl_addr *nlpeer = nl_addr_build (family, peer_addr, addrlen); auto_nl_addr struct nl_addr *nlpeer = nl_addr_build (family, peer_addr, addrlen);