Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Netlink: Handle interfaces with missing broadcast addresses

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2020-03-05 23:51:28 +01:00
parent 1ad98965c5
commit e2630a494e
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sysdep/linux/netlink.c
View file

@ -953,18 +953,15 @@ nl_parse_addr4(struct ifaddrmsg *i, int scan, int new)
if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH - 2) if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH - 2)
ifa.opposite = ipa_opposite_m2(ifa.ip); ifa.opposite = ipa_opposite_m2(ifa.ip);
if ((ifi->flags & IF_BROADCAST) && a[IFA_BROADCAST]) if (ifi->flags & IF_BROADCAST)
{ {
ip4_addr xbrd = rta_get_ip4(a[IFA_BROADCAST]); /* If kernel offers us a broadcast address, we trust it */
ip4_addr ybrd = ip4_or(ipa_to_ip4(ifa.ip), ip4_not(ip4_mkmask(i->ifa_prefixlen))); if (a[IFA_BROADCAST])
ifa.brd = ipa_from_ip4(rta_get_ip4(a[IFA_BROADCAST]));
if (ip4_equal(xbrd, net4_prefix(&ifa.prefix)) || ip4_equal(xbrd, ybrd)) /* Otherwise we create one (except for /31) */
ifa.brd = ipa_from_ip4(xbrd); else if (i->ifa_prefixlen < (IP4_MAX_PREFIX_LENGTH - 1))
else if (ifi->flags & IF_TMP_DOWN) /* Complain only during the first scan */ ifa.brd = ipa_from_ip4(ip4_or(ipa_to_ip4(ifa.ip),
{ ip4_not(ip4_mkmask(i->ifa_prefixlen))));
log(L_ERR "KIF: Invalid broadcast address %I4 for %s", xbrd, ifi->name);
ifa.brd = ipa_from_ip4(ybrd);
}
} }
} }