- if (((addr->addr.s6_addr[0] & 0xfe) != 0xfc || iface->default_router)
- && ntohs(adv.h.nd_ra_router_lifetime) < TIME_LEFT(addr->valid, now))
- adv.h.nd_ra_router_lifetime = htons(TIME_LEFT(addr->valid, now));
+ uint32_t this_lifetime = TIME_LEFT(addr->valid, now);
+ if (this_lifetime > UINT16_MAX)
+ this_lifetime = UINT16_MAX;
+ if ((!IN6_IS_ADDR_ULA(&addr->addr) || iface->default_router)
+ && adv.h.nd_ra_router_lifetime
+ && ntohs(adv.h.nd_ra_router_lifetime) < this_lifetime) {
+ adv.h.nd_ra_router_lifetime = htons(this_lifetime);
+
+ syslog(LOG_INFO, "Updating RA router lifetime to %d on %s", this_lifetime, iface->ifname);
+ }