static FILE *fp_route = NULL;
#define RA_IOV_LEN 6
+#define TIME_LEFT(t1, now) ((t1) != UINT32_MAX ? (t1) - (now) : UINT32_MAX)
int init_router(void)
{
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))
// Construct Prefix Information options
size_t cnt = 0;
- struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref;
- uint32_t dns_time = 0;
+ struct in6_addr dns_pref, *dns_addr = &dns_pref;
size_t dns_cnt = 1;
+ odhcpd_get_linklocal_interface_address(iface->ifindex, &dns_pref);
+
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
- if (addr->prefix > 96 || addr->valid <= now)
+ if (addr->prefix > 96 || addr->valid <= (uint32_t)now)
continue; // Address not suitable
struct nd_opt_prefix_info *p = NULL;
p = &adv.prefix[cnt++];
}
- if (addr->preferred > now &&
- minvalid > 1000LL * (addr->valid - now))
- minvalid = 1000LL * (addr->valid - now);
-
- if (maxvalid < 1000LL * (addr->valid - now))
- maxvalid = 1000LL * (addr->valid - now);
+ if (addr->preferred > (uint32_t)now &&
+ minvalid > 1000LL * TIME_LEFT(addr->valid, now))
+ minvalid = 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) < addr->valid - now)
- adv.h.nd_ra_router_lifetime = htons(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_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(addr->valid - now);
- if (addr->preferred > now)
- p->nd_opt_pi_preferred_time = htonl(addr->preferred - now);
-
-
- if (addr->preferred - now > dns_time) {
- dns_time = addr->preferred - now;
- dns_pref = addr->addr;
- }
+ 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;
}
- 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;
if (iface->dns_cnt > 0) {
dns_addr = iface->dns;
dns_cnt = iface->dns_cnt;
- dns_time = 0;
}
if (!dns_addr || IN6_IS_ADDR_UNSPECIFIED(dns_addr))
uint8_t pad;
uint8_t pad2;
uint32_t lifetime;
- } dns = {ND_OPT_RECURSIVE_DNS, (1 + (2 * dns_cnt)), 0, 0, htonl(dns_time)};
+ } dns = {ND_OPT_RECURSIVE_DNS, (1 + (2 * dns_cnt)), 0, 0, 0};
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
- if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= now ||
+ if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now ||
(addr->dprefix == 64 && addr->prefix == 64)) {
continue; // Address not suitable
} else if (addr->dprefix > 32) {
routes[routes_cnt].flags |= ND_RA_PREF_LOW;
else if (iface->route_preference > 0)
routes[routes_cnt].flags |= ND_RA_PREF_HIGH;
- routes[routes_cnt].lifetime = htonl(addr->valid - now);
+ routes[routes_cnt].lifetime = htonl(TIME_LEFT(addr->valid, now));
routes[routes_cnt].addr[0] = addr->addr.s6_addr32[0];
routes[routes_cnt].addr[1] = addr->addr.s6_addr32[1];
routes[routes_cnt].addr[2] = 0;
minival = (maxival * 3) / 4;
- search->lifetime = htonl(maxvalid / 1000);
-
- if (!dns.lifetime)
- dns.lifetime = search->lifetime;
+ search->lifetime = htonl(maxival / 100);
+ dns.lifetime = search->lifetime;
odhcpd_urandom(&msecs, sizeof(msecs));
msecs = (labs(msecs) % (maxival - minival)) + minival;
size_t rewrite_cnt = iface->dns_cnt;
if (rewrite_cnt == 0) {
- if (odhcpd_get_preferred_interface_address(iface->ifindex, &addr) < 1)
+ if (odhcpd_get_linklocal_interface_address(iface->ifindex, &addr))
continue; // Unable to comply
rewrite = &addr;