} else if (iface->ra == RELAYD_SERVER && !iface->master) {
iface->timer_rs.cb = trigger_router_advert;
uloop_timeout_set(&iface->timer_rs, 1000);
+ ndp_rqs_addr6_dump();
}
if (iface->ra == RELAYD_RELAY || (iface->ra == RELAYD_SERVER && !iface->master))
minival = (*maxival >= 9 ? *maxival/3 : *maxival);
odhcpd_urandom(&msecs, sizeof(msecs));
- msecs = (labs(msecs) % ((*maxival - minival)*1000)) + minival*1000;
+ msecs = (labs(msecs) % ((*maxival != minival) ? (*maxival - minival)*1000 : 500)) +
+ minival*1000;
return msecs;
}
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
+ uint32_t preferred = 0;
+ uint32_t valid = 0;
if (addr->prefix > 96 || addr->valid <= (uint32_t)now) {
char namebuf[INET6_ADDRSTRLEN];
p = &adv.prefix[cnt++];
}
- if (addr->preferred > (uint32_t)now &&
- minvalid > TIME_LEFT(addr->valid, now))
- minvalid = TIME_LEFT(addr->valid, now);
+ if (addr->preferred > (uint32_t)now) {
+ preferred = TIME_LEFT(addr->preferred, now);
+
+ if (iface->ra_useleasetime &&
+ preferred > iface->dhcpv4_leasetime)
+ preferred = iface->dhcpv4_leasetime;
+ }
+
+ valid = TIME_LEFT(addr->valid, now);
+ if (iface->ra_useleasetime && valid > iface->dhcpv4_leasetime)
+ valid = iface->dhcpv4_leasetime;
+
+ if (minvalid > valid)
+ minvalid = valid;
if (!IN6_IS_ADDR_ULA(&addr->addr) || iface->default_router)
valid_prefix = true;
p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_AUTO;
if (iface->ra_advrouter)
p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_RADDR;
- p->nd_opt_pi_valid_time = htonl(TIME_LEFT(addr->valid, now));
- if (addr->preferred > (uint32_t)now)
- p->nd_opt_pi_preferred_time = htonl(TIME_LEFT(addr->preferred, now));
- else if (addr->valid - now < 7200)
- p->nd_opt_pi_valid_time = 0;
+ p->nd_opt_pi_preferred_time = htonl(preferred);
+ p->nd_opt_pi_valid_time = htonl(valid);
}
// Calculate periodic transmit