X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fra.c;h=f1a5f7fdb5747d0160283adff8a2dc9c43db12b1;hb=e69df66491b6d6d244c3274ae36f7b640bd07a5e;hp=2149a66b7ce929b81fc7bf44e4ab373d9ccead7d;hpb=29937f316f27e9ead2f8a0d9cb419aa810fa9d02;p=odhcp6c.git

diff --git a/src/ra.c b/src/ra.c
index 2149a66..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));
@@ -275,7 +275,7 @@ bool ra_process(void)
 
 		size_t ra_dns_len;
 		struct odhcp6c_entry *entry = odhcp6c_get_state(STATE_RA_DNS, &ra_dns_len);
-		for (size_t i = 0; i < len / sizeof(*entry); ++i)
+		for (size_t i = 0; i < ra_dns_len / sizeof(*entry); ++i)
 			if (IN6_ARE_ADDR_EQUAL(&entry[i].router, &from.sin6_addr) &&
 					entry[i].valid > router_valid)
 				entry[i].valid = router_valid;