diff options
| author | Erik Kline <ek@google.com> | 2016-03-31 07:10:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-31 07:10:47 +0000 |
| commit | 91bc2c9084cd02b8e7ae64696e12ee89ec597568 (patch) | |
| tree | 6b9d0a400c59beb875f2465048cae900c15ec75e /libnetutils | |
| parent | 7ffe19e34bd13c3605911e69a98a355b417bd772 (diff) | |
| parent | 012d35b7f046f42d97dadd831c8201ecda2daa55 (diff) | |
| download | core-91bc2c9084cd02b8e7ae64696e12ee89ec597568.tar.gz | |
Merge "Set IFA_BROADCAST during IPv4 RTM_NEWADDRs" am: d709914
am: 012d35b
* commit '012d35b7f046f42d97dadd831c8201ecda2daa55':
Set IFA_BROADCAST during IPv4 RTM_NEWADDRs
Change-Id: Ib4ac0486a06551dce8d79fb1e738e9c567328610
Diffstat (limited to 'libnetutils')
| -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 85ff070a7..eae32ce36 100644 --- a/libnetutils/ifc_utils.c +++ b/libnetutils/ifc_utils.c @@ -267,10 +267,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; @@ -325,6 +327,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; |