tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Set IFA_BROADCAST during IPv4 RTM_NEWADDRs"

Browse source 
am: d709914

* commit 'd70991477392eb94c77c1680483cabd26befb50a':
  Set IFA_BROADCAST during IPv4 RTM_NEWADDRs

Change-Id: Id3b47656b716b2adfa531f857c4fa0cb325a971d
This commit is contained in:
Erik Kline 2016-03-31 07:08:08 +00:00 committed by android-build-merger
commit 012d35b7f0
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libnetutils/ifc_utils.c
View file

@ -259,10 +259,12 @@ int ifc_act_on_address(int action, const char *name, const char *address,
struct {
struct nlmsghdr n;
struct ifaddrmsg r;
// Allow for IPv6 address, headers, and padding.
// Allow for IPv6 address, headers, IPv4 broadcast addr and padding.
char attrbuf[NLMSG_ALIGN(sizeof(struct nlmsghdr)) +
NLMSG_ALIGN(sizeof(struct rtattr)) +
NLMSG_ALIGN(INET6_ADDRLEN)];
NLMSG_ALIGN(INET6_ADDRLEN) +
NLMSG_ALIGN(sizeof(struct rtattr)) +
NLMSG_ALIGN(INET_ADDRLEN)];
} req;
struct rtattr *rta;
struct nlmsghdr *nh;
@ -317,6 +319,16 @@ int ifc_act_on_address(int action, const char *name, const char *address,
req.n.nlmsg_len = NLMSG_ALIGN(req.n.nlmsg_len) + RTA_LENGTH(addrlen);
memcpy(RTA_DATA(rta), addr, addrlen);
// Add an explicit IFA_BROADCAST for IPv4 RTM_NEWADDRs.
if (ss.ss_family == AF_INET && action == RTM_NEWADDR) {
rta = (struct rtattr *) (((char *) &req) + NLMSG_ALIGN(req.n.nlmsg_len));
rta->rta_type = IFA_BROADCAST;
rta->rta_len = RTA_LENGTH(addrlen);
req.n.nlmsg_len = NLMSG_ALIGN(req.n.nlmsg_len) + RTA_LENGTH(addrlen);
((struct in_addr *)addr)->s_addr |= htonl((1<<(32-prefixlen))-1);
memcpy(RTA_DATA(rta), addr, addrlen);
}
s = socket(PF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
if (s < 0) {
return -errno;