diff --git a/TODO b/TODO index f829e831..51802994 100644 --- a/TODO +++ b/TODO @@ -27,8 +27,6 @@ Core - proto: Don't show repeated `Changed state to ...' messages if only internal states change -- iface: Don't complain about missing broadcast addresses. - Documentation ~~~~~~~~~~~~~ - write doctool diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c index db744135..70abdd73 100644 --- a/sysdep/linux/netlink/netlink.c +++ b/sysdep/linux/netlink/netlink.c @@ -374,6 +374,7 @@ nl_parse_addr(struct nlmsghdr *h) } else { + ip_addr netmask = ipa_mkmask(ifa.pxlen); #ifndef IPV6 if (i->ifa_prefixlen == BITS_PER_IP_ADDRESS - 2) ifa.opposite = ipa_opposite(ifa.ip); @@ -382,8 +383,10 @@ nl_parse_addr(struct nlmsghdr *h) memcpy(&ifa.brd, RTA_DATA(a[IFA_BROADCAST]), sizeof(ifa.brd)); ipa_ntoh(ifa.brd); } + else + ifa.brd = ipa_or(ifa.ip, ipa_not(netmask)); #endif - ifa.prefix = ipa_and(ifa.ip, ipa_mkmask(ifa.pxlen)); + ifa.prefix = ipa_and(ifa.ip, netmask); } DBG("KIF: IF%d(%s): %s IPA %I, flg %x, net %I/%d, brd %I, opp %I\n",