odhcpd_get_mac(iface, adv.lladdr.data);
// If not currently shutting down
- struct odhcpd_ipaddr *addrs = NULL;
+ struct odhcpd_ipaddr addrs[8];
ssize_t ipcnt = 0;
int64_t minvalid = INT64_MAX;
- int64_t maxvalid = 0;
// If not shutdown
if (iface->timer_rs.cb) {
- addrs = iface->ia_addr;
ipcnt = iface->ia_addr_len;
+ memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
// Check default route
if (parse_routes(addrs, ipcnt))
minvalid > 1000LL * TIME_LEFT(addr->valid, now))
minvalid = 1000LL * TIME_LEFT(addr->valid, now);
- if (maxvalid < 1000LL * TIME_LEFT(addr->valid, now))
- maxvalid = 1000LL * TIME_LEFT(addr->valid, now);
-
+ uint32_t this_lifetime = TIME_LEFT(addr->valid, now);
+ if (this_lifetime > UINT16_MAX)
+ this_lifetime = UINT16_MAX;
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));
+ && adv.h.nd_ra_router_lifetime
+ && ntohs(adv.h.nd_ra_router_lifetime) < this_lifetime)
+ adv.h.nd_ra_router_lifetime = htons(this_lifetime);
odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
(iface->ra_advrouter) ? 128 : addr->prefix);
p->nd_opt_pi_valid_time = 0;
}
- if (!iface->default_router && ntohs(adv.h.nd_ra_router_lifetime) == 1) {
+ if (!iface->default_router && adv.h.nd_ra_router_lifetime == htons(1)) {
syslog(LOG_WARNING, "A default route is present but there is no public prefix "
"on %s thus we don't announce a default route!", iface->ifname);
adv.h.nd_ra_router_lifetime = 0;
minival = (maxival * 3) / 4;
- search->lifetime = htonl(maxvalid / 1000);
+ search->lifetime = htonl(maxival / 100);
dns.lifetime = search->lifetime;
odhcpd_urandom(&msecs, sizeof(msecs));