From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 16 Nov 2015 18:15:00 +0000 (+0000)
Subject: musl: fix handling of point-to-point interfaces in getifaddrs()
X-Git-Tag: reboot~1539
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ab11edcd4c2325e62ea0e02c80f7630b8d191300;p=oweals%2Fopenwrt.git

musl: fix handling of point-to-point interfaces in getifaddrs()

Current musl reports the peer (remote) address of a point-to-point
interface and does not store the local address at all.

Apply the same special treatment of IFA_LOCAL to musl's getifaddrs() which
is also used in glibc and uclibc.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47488
---

diff --git a/toolchain/musl/patches/920-getifaddrs_ptp_fix.patch b/toolchain/musl/patches/920-getifaddrs_ptp_fix.patch
new file mode 100644
index 0000000000..3e65232563
--- /dev/null
+++ b/toolchain/musl/patches/920-getifaddrs_ptp_fix.patch
@@ -0,0 +1,18 @@
+--- a/src/network/getifaddrs.c
++++ b/src/network/getifaddrs.c
+@@ -161,6 +161,15 @@ static int netlink_msg_to_ifaddr(void *p
+ 		ifs->ifa.ifa_flags = ifs0->ifa.ifa_flags;
+ 		for (rta = NLMSG_RTA(h, sizeof(*ifa)); NLMSG_RTAOK(rta, h); rta = RTA_NEXT(rta)) {
+ 			switch (rta->rta_type) {
++			case IFA_LOCAL:
++				/* If ifa_addr is set and we get IFA_LOCAL, assume we have
++				 * a point-to-point network. Move address to correct field.  */
++				if (ifs->ifa.ifa_addr != NULL) {
++					ifs->ifu = ifs->addr;
++					ifs->ifa.ifa_broadaddr = &ifs->ifu.sa;
++					memset(&ifs->addr, 0, sizeof(ifs->addr));
++				}
++				/* fall through */
+ 			case IFA_ADDRESS:
+ 				copy_addr(&ifs->ifa.ifa_addr, ifa->ifa_family, &ifs->addr, RTA_DATA(rta), RTA_DATALEN(rta), ifa->ifa_index);
+ 				break;