From: Steven Barth <steven@midlink.org>
Date: Fri, 1 Feb 2013 11:05:33 +0000 (+0100)
Subject: Detect more DADFAILED cases
X-Git-Tag: debian/1.1+git20160131-1~185
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e69df66491b6d6d244c3274ae36f7b640bd07a5e;p=odhcp6c.git

Detect more DADFAILED cases
---

diff --git a/src/ra.c b/src/ra.c
index 47a2a8d..f1a5f7f 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -149,9 +149,9 @@ bool ra_rtnl_process(void)
 					nh = NLMSG_NEXT(nh, len)) {
 			struct ifaddrmsg *ifa = NLMSG_DATA(nh);
 			struct in6_addr *addr = NULL;
-			if (nh->nlmsg_type != RTM_NEWADDR || NLMSG_PAYLOAD(nh, 0) < sizeof(*ifa) ||
-					!(ifa->ifa_flags & IFA_F_DADFAILED) ||
-					ifa->ifa_index != if_index)
+			if (NLMSG_PAYLOAD(nh, 0) < sizeof(*ifa) || ifa->ifa_index != if_index ||
+					(nh->nlmsg_type == RTM_NEWADDR && !(ifa->ifa_flags & IFA_F_DADFAILED)) ||
+					(nh->nlmsg_type == RTM_DELADDR && !(ifa->ifa_flags & IFA_F_TENTATIVE)))
 				continue;
 
 			ssize_t alen = NLMSG_PAYLOAD(nh, sizeof(*ifa));