Detect more DADFAILED cases

[odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index 602191aef05d216bc9adcda602a80ef7d5650117..f1a5f7fdb5747d0160283adff8a2dc9c43db12b1 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -21,7 +21,7 @@
 static int sock = -1, rtnl_sock = -1;
 static unsigned if_index = 0;
 static char if_name[IF_NAMESIZE] = {0};
-static volatile int rs_attempt = 1;
+static volatile int rs_attempt = 0;
 static struct in6_addr lladdr = IN6ADDR_ANY_INIT;
 
 static void ra_send_rs(int signal __attribute__((unused)));
@@ -97,7 +97,7 @@ static void ra_send_rs(int signal __attribute__((unused)))
        const struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index};
        sendto(sock, &rs, sizeof(rs), MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
 
-       if (++rs_attempt < 3)
+       if (++rs_attempt <= 3)
                alarm(4);
 }
 
@@ -105,8 +105,8 @@ static void ra_send_rs(int signal __attribute__((unused)))
 static int16_t pref_to_priority(uint8_t flags)
 {
        flags = (flags >> 3) & 0x03;
-       return (flags == 0x00) ? 1024 : (flags == 0x01) ? 512 :
-                       (flags == 0x11) ? 2048 : -1;
+       return (flags == 0x0) ? 1024 : (flags == 0x1) ? 512 :
+                       (flags == 0x3) ? 2048 : -1;
 }
 
 
@@ -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;