First hnet-based version.

[odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index 47a2a8d3e5d760ef9652b12ed2d6ca71b5db3229..580d4cdc3e9b185b3f685495379663c15647e74b 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -123,9 +123,9 @@ static void update_proc(const char *sect, const char *opt, uint32_t value)
 
 static bool ra_deduplicate(const struct in6_addr *any, uint8_t length)
 {
-       struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0};
+  struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0, 0};
        struct odhcp6c_entry *x = odhcp6c_find_entry(STATE_RA_PREFIX, &entry);
-       if (x) {
+       if (x && IN6_ARE_ADDR_EQUAL(&x->target, any)) {
                odhcp6c_random(&x->target.s6_addr32[2], 2 * sizeof(uint32_t));
        } else if (odhcp6c_find_entry(STATE_IA_NA, &entry)) {
                dhcpv6_request(DHCPV6_MSG_DECLINE);
@@ -149,15 +149,15 @@ 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));
                        for (struct rtattr *rta = (struct rtattr*)&ifa[1]; RTA_OK(rta, alen);
                                        rta = RTA_NEXT(rta, alen))
-                               if (rta->rta_type == IFA_LOCAL && RTA_PAYLOAD(rta) >= sizeof(*addr))
+                               if (rta->rta_type == IFA_ADDRESS && RTA_PAYLOAD(rta) >= sizeof(*addr))
                                        addr = RTA_DATA(rta);
 
                        if (addr)
@@ -173,7 +173,7 @@ bool ra_process(void)
        bool found = false;
        uint8_t buf[1500];
        struct nd_router_advert *adv = (struct nd_router_advert*)buf;
-       struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0};
+       struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
        const struct in6_addr any = IN6ADDR_ANY_INIT;
        odhcp6c_expire();
 
@@ -236,7 +236,7 @@ bool ra_process(void)
                                struct nd_opt_prefix_info *pinfo = (struct nd_opt_prefix_info*)opt;
                                entry.router = any;
                                entry.target = pinfo->nd_opt_pi_prefix;
-                               entry.priority = 0;
+                               entry.priority = 256;
                                entry.length = pinfo->nd_opt_pi_prefix_len;
                                entry.valid = ntohl(pinfo->nd_opt_pi_valid_time);
                                entry.preferred = ntohl(pinfo->nd_opt_pi_preferred_time);