diff options
| author | Erik Kline <ek@google.com> | 2016-03-31 07:08:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-31 07:08:08 +0000 |
| commit | 012d35b7f046f42d97dadd831c8201ecda2daa55 (patch) | |
| tree | 32b9627ac752f70b6760e3e3cbe4fcee6018b6f4 | |
| parent | 79b5cd7a522b7d7de3958111fbae01798ec63177 (diff) | |
| parent | d70991477392eb94c77c1680483cabd26befb50a (diff) | |
| download | system_core-012d35b7f046f42d97dadd831c8201ecda2daa55.tar.gz system_core-012d35b7f046f42d97dadd831c8201ecda2daa55.tar.bz2 system_core-012d35b7f046f42d97dadd831c8201ecda2daa55.zip | |
Merge "Set IFA_BROADCAST during IPv4 RTM_NEWADDRs"
am: d709914
* commit 'd70991477392eb94c77c1680483cabd26befb50a':
Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
Change-Id: Id3b47656b716b2adfa531f857c4fa0cb325a971d
| -rw-r--r-- | libnetutils/ifc_utils.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c index e0a9f7f88..f9f62f8ce 100644 --- a/libnetutils/ifc_utils.c +++ b/libnetutils/ifc_utils.c @@ -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; |