static void trigger_router_advert(struct uloop_timeout *event);
static void sigusr1_refresh(int signal);
-static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6};
+static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6, NULL};
static FILE *fp_route = NULL;
#define RA_IOV_LEN 6
uloop_timeout_cancel(&iface->timer_rs);
iface->timer_rs.cb = NULL;
+ if (iface->ifindex <= 0)
+ return -1;
+
setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
&all_nodes, sizeof(all_nodes));
setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
// Check default route
- if (parse_routes(addrs, ipcnt))
- adv.h.nd_ra_router_lifetime = htons(1);
if (iface->default_router > 1)
adv.h.nd_ra_router_lifetime = htons(iface->default_router);
+ else if (parse_routes(addrs, ipcnt))
+ adv.h.nd_ra_router_lifetime = htons(1);
}
// Construct Prefix Information options
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) < 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 = maxival / 100;
+ search->lifetime = htonl(maxival / 100);
dns.lifetime = search->lifetime;
odhcpd_urandom(&msecs, sizeof(msecs));