static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6};
static FILE *fp_route = NULL;
+#define RA_IOV_LEN 6
int init_router(void)
char line[512], ifname[16];
bool found_default = false;
- struct odhcpd_ipaddr p = {IN6ADDR_ANY_INIT, 0, 0, false, 0, 0, 0};
+ struct odhcpd_ipaddr p = {IN6ADDR_ANY_INIT, 0, 0, 0, 0};
while (fgets(line, sizeof(line), fp_route)) {
uint32_t rflags;
if (sscanf(line, "00000000000000000000000000000000 00 "
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;
+ 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;
.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;
// If not currently shutting down
struct odhcpd_ipaddr addrs[RELAYD_MAX_PREFIXES];
ssize_t ipcnt = 0;
- uint64_t maxpreferred = 0;
+ uint64_t minvalid = UINT64_MAX;
+ uint64_t maxvalid = 0;
// If not shutdown
if (iface->timer_rs.cb) {
// Check default route
if (parse_routes(addrs, ipcnt) || iface->default_router > 1)
- adv.h.nd_ra_router_lifetime =
- htons(3 * MaxRtrAdvInterval);
+ adv.h.nd_ra_router_lifetime = 1;
}
// Construct Prefix Information options
- bool have_public = false;
size_t cnt = 0;
struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref;
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
- if (addr->prefix > 96 || addr->has_class)
+ if (addr->prefix > 96)
continue; // Address not suitable
- if (addr->preferred > MaxPreferredTime)
- addr->preferred = MaxPreferredTime;
+ if (addr->preferred > MaxValidTime)
+ addr->preferred = MaxValidTime;
if (addr->valid > MaxValidTime)
addr->valid = MaxValidTime;
p = &adv.prefix[cnt++];
}
- if ((addr->addr.s6_addr[0] & 0xfe) != 0xfc && addr->preferred > 0) {
- have_public = true;
+ if (addr->preferred > 0) {
+ if (minvalid > 1000ULL * addr->valid)
+ minvalid = 1000ULL * addr->valid;
- if (maxpreferred < 1000 * addr->preferred)
- maxpreferred = 1000 * addr->preferred;
+ if (maxvalid < 1000ULL * addr->valid && (iface->default_router ||
+ (addr->addr.s6_addr[0] & 0xfe) != 0xfc))
+ maxvalid = 1000ULL * addr->valid;
}
- odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr, addr->prefix);
+
+ odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
+ (iface->ra_advrouter) ? 128 : addr->prefix);
p->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION;
p->nd_opt_pi_len = 4;
p->nd_opt_pi_prefix_len = (addr->prefix < 64) ? 64 : addr->prefix;
p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_ONLINK;
if (iface->managed < RELAYD_MANAGED_NO_AFLAG && addr->prefix <= 64)
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 (!have_public && !iface->default_router && adv.h.nd_ra_router_lifetime) {
+ if (!maxvalid && !iface->default_router && adv.h.nd_ra_router_lifetime) {
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;
++routes_cnt;
}
+ // Calculate periodic transmit
+ int msecs = 0;
+ uint32_t maxival = iface->ra_maxinterval * 1000;
+ uint32_t minival;
+
+ if (maxival < 4000 || maxival > MaxRtrAdvInterval * 1000)
+ maxival = MaxRtrAdvInterval * 1000;
+
+ if (minvalid < maxival / 3) {
+ maxival = minvalid / 3;
+
+ if (maxival < 4000)
+ maxival = 4000;
+ }
- struct iovec iov[] = {{&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv},
+ minival = (maxival * 3) / 4;
+ if (adv.h.nd_ra_router_lifetime)
+ adv.h.nd_ra_router_lifetime = htons(maxvalid / 1000);
+
+ odhcpd_urandom(&msecs, sizeof(msecs));
+ msecs = (labs(msecs) % (maxival - minival)) + minival;
+
+ struct icmpv6_opt adv_interval = {
+ .type = ND_OPT_RTR_ADV_INTERVAL,
+ .len = 1,
+ .data = {0, 0, maxival >> 24, maxival >> 16, maxival >> 8, maxival}
+ };
+
+ 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)},
- {search, search->len * 8}};
+ {search, search->len * 8},
+ {&adv_interval, adv_interval.len * 8}};
struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_NODES, 0};
if (from && !IN6_IS_ADDR_UNSPECIFIED(from))
odhcpd_send(router_event.uloop.fd,
&dest, iov, ARRAY_SIZE(iov), iface);
- return maxpreferred;
+ return msecs;
}
static void trigger_router_advert(struct uloop_timeout *event)
{
struct interface *iface = container_of(event, struct interface, timer_rs);
- uint64_t maxpreferred = send_router_advert(iface, NULL);
+ int msecs = send_router_advert(iface, NULL);
// Rearm timer if not shut down
- if (event->cb) {
- uint32_t maxinterval = MaxRtrAdvInterval * 1000;
- uint32_t mininterval = MinRtrAdvInterval * 1000;
-
- if (maxpreferred > 0 && maxinterval > maxpreferred / 2) {
- maxinterval = maxpreferred / 2;
- if (maxinterval < 4000)
- maxinterval = 4000;
-
- if (maxinterval >= 9000)
- mininterval = maxinterval / 3;
- else
- mininterval = (maxinterval * 3) / 4;
- }
-
- int msecs;
- odhcpd_urandom(&msecs, sizeof(msecs));
- msecs = (labs(msecs) % (maxinterval - mininterval)) + mininterval;
+ if (event->cb)
uloop_timeout_set(event, msecs);
- }
}
struct sockaddr_in6 all_nodes = {AF_INET6, 0, 0, ALL_IPV6_NODES, 0};
struct iovec iov = {data, len};
- struct odhcpd_ipaddr addr;
struct interface *iface;
list_for_each_entry(iface, &interfaces, head) {
if (iface->ra != RELAYD_RELAY || iface->master)
// If we have to rewrite DNS entries
if (iface->always_rewrite_dns && dns_ptr && dns_count > 0) {
const struct in6_addr *rewrite = iface->dns;
+ struct in6_addr addr;
size_t rewrite_cnt = iface->dns_cnt;
if (rewrite_cnt == 0) {
- if (odhcpd_get_interface_addresses(iface->ifindex, &addr, 1) < 1)
+ if (odhcpd_get_preferred_interface_address(iface->ifindex, &addr) < 1)
continue; // Unable to comply
- rewrite = &addr.addr;
+ rewrite = &addr;
rewrite_cnt = 1;
}
projects / project / odhcpd.git / blobdiff