Fix generation of IA_PD and IA_NA attributes

[odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index f1a5f7fdb5747d0160283adff8a2dc9c43db12b1..b249288279955446ecf59e061a4015b0314b3302 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -125,7 +125,7 @@ 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 *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);
@@ -157,7 +157,7 @@ bool ra_rtnl_process(void)
                        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)