X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=src%2Fra.c;h=4ed5371a160d4b63dc7e1ac80a6d74a38ba2e726;hb=920fda0ef9da478202fc330cc887e1ef3d703925;hp=e32670ecbba0124b8629d6205df36fb07149ea93;hpb=18c1cff36bd3b36b80321282fa7086d8752b63cc;p=odhcp6c.git diff --git a/src/ra.c b/src/ra.c index e32670e..4ed5371 100644 --- 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); @@ -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);