static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6};
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)
{
forward_router_solicitation(iface);
} else if (iface->ra == RELAYD_SERVER && !iface->master) {
iface->timer_rs.cb = trigger_router_advert;
- trigger_router_advert(&iface->timer_rs);
+ uloop_timeout_set(&iface->timer_rs, 1000);
}
if (iface->ra == RELAYD_RELAY || (iface->ra == RELAYD_SERVER && !iface->master))
return found_default;
}
-
// Router Advert server mode
static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from)
{
- int mtu = odhcpd_get_interface_mtu(iface->ifname);
- if (mtu < 0)
- mtu = 1500;
+ time_t now = odhcpd_time();
+ int mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
+ int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
+
+ if (mtu < 1280)
+ mtu = 1280;
struct {
struct nd_router_advert h;
struct icmpv6_opt lladdr;
struct nd_opt_mtu mtu;
- struct nd_opt_prefix_info prefix[RELAYD_MAX_PREFIXES];
+ struct nd_opt_prefix_info prefix[sizeof(iface->ia_addr) / sizeof(*iface->ia_addr)];
} adv = {
.h = {{.icmp6_type = ND_ROUTER_ADVERT, .icmp6_code = 0}, 0, 0},
.lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
.mtu = {ND_OPT_MTU, 1, 0, htonl(mtu)},
};
+ if (hlim > 0)
+ adv.h.nd_ra_curhoplimit = hlim;
+
if (iface->dhcpv6)
adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
odhcpd_get_mac(iface, adv.lladdr.data);
// If not currently shutting down
- struct odhcpd_ipaddr addrs[RELAYD_MAX_PREFIXES];
+ struct odhcpd_ipaddr addrs[8];
ssize_t ipcnt = 0;
- uint64_t maxpreferred = 0;
+ int64_t minvalid = INT64_MAX;
// If not shutdown
if (iface->timer_rs.cb) {
- ipcnt = odhcpd_get_interface_addresses(iface->ifindex,
- addrs, ARRAY_SIZE(addrs));
+ ipcnt = iface->ia_addr_len;
+ memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
// Check default route
- if (parse_routes(addrs, ipcnt) || iface->default_router > 1)
- adv.h.nd_ra_router_lifetime =
- htons(3 * MaxRtrAdvInterval);
+ 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);
}
// Construct Prefix Information options
- bool have_public = false;
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)
+ if (addr->prefix > 96 || addr->valid <= (uint32_t)now)
continue; // Address not suitable
- if (addr->preferred > MaxPreferredTime)
- addr->preferred = MaxPreferredTime;
-
- if (addr->valid > MaxValidTime)
- addr->valid = MaxValidTime;
-
struct nd_opt_prefix_info *p = NULL;
for (size_t i = 0; i < cnt; ++i) {
if (addr->prefix == adv.prefix[i].nd_opt_pi_prefix_len &&
p = &adv.prefix[cnt++];
}
- if ((addr->addr.s6_addr[0] & 0xfe) != 0xfc && addr->preferred > 0) {
- have_public = true;
+ if (addr->preferred > (uint32_t)now &&
+ minvalid > 1000LL * TIME_LEFT(addr->valid, now))
+ minvalid = 1000LL * TIME_LEFT(addr->valid, now);
- if (maxpreferred < 1000 * addr->preferred)
- maxpreferred = 1000 * addr->preferred;
- }
+ 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));
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);
- p->nd_opt_pi_preferred_time = htonl(addr->preferred);
-
- if (addr->preferred > dns_time) {
- dns_time = addr->preferred;
- 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 (!have_public && !iface->default_router && adv.h.nd_ra_router_lifetime) {
+ if (!iface->default_router && ntohs(adv.h.nd_ra_router_lifetime) == 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 = 2 * MaxRtrAdvInterval;
}
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};
search->len = search_len ? ((sizeof(*search) + search_padded) / 8) : 0;
search->pad = 0;
search->pad2 = 0;
- search->lifetime = htonl(2 * MaxRtrAdvInterval);;
memcpy(search->name, search_domain, search_len);
memset(&search->name[search_len], 0, search_padded - search_len);
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
- if (addr->dprefix > 64 || addr->dprefix == 0 ||
+ 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);
+ 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;
// Calculate periodic transmit
int msecs = 0;
- uint32_t maxival = MaxRtrAdvInterval * 1000;
- uint32_t minival = MinRtrAdvInterval * 1000;
+ uint32_t maxival = iface->ra_maxinterval * 1000;
+ uint32_t minival;
+
+ if (maxival < 4000 || maxival > MaxRtrAdvInterval * 1000)
+ maxival = MaxRtrAdvInterval * 1000;
+
+ if (maxival > minvalid / 3) {
+ maxival = minvalid / 3;
- if (maxpreferred > 0 && maxival > maxpreferred / 2) {
- maxival = maxpreferred / 2;
if (maxival < 4000)
maxival = 4000;
-
- if (maxival >= 9000)
- minival = maxival / 3;
- else
- minival = (maxival * 3) / 4;
}
+ minival = (maxival * 3) / 4;
+
+ search->lifetime = maxival / 100;
+ dns.lifetime = search->lifetime;
+
odhcpd_urandom(&msecs, sizeof(msecs));
msecs = (labs(msecs) % (maxival - minival)) + minival;
.data = {0, 0, maxival >> 24, maxival >> 16, maxival >> 8, maxival}
};
- struct iovec iov[] = {{&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv},
+ struct iovec iov[RA_IOV_LEN] = {
+ {&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv},
{&routes, routes_cnt * sizeof(*routes)},
{&dns, (dns_cnt) ? sizeof(dns) : 0},
{dns_addr, dns_cnt * sizeof(*dns_addr)},
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;
projects / project / odhcpd.git / blobdiff