+/**
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
#include <fcntl.h>
#include <stdio.h>
#include <signal.h>
static int sock = -1, rtnl_sock = -1;
static unsigned if_index = 0;
static char if_name[IF_NAMESIZE] = {0};
-static volatile int rs_attempt = 1;
+static volatile int rs_attempt = 0;
static struct in6_addr lladdr = IN6ADDR_ANY_INIT;
static void ra_send_rs(int signal __attribute__((unused)));
const struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index};
sendto(sock, &rs, sizeof(rs), MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
- if (++rs_attempt < 3)
+ if (++rs_attempt <= 3)
alarm(4);
}
static int16_t pref_to_priority(uint8_t flags)
{
flags = (flags >> 3) & 0x03;
- return (flags == 0x00) ? 1024 : (flags == 0x01) ? 512 :
- (flags == 0x11) ? 2048 : -1;
+ return (flags == 0x0) ? 1024 : (flags == 0x1) ? 512 :
+ (flags == 0x3) ? 2048 : -1;
}
{
struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0};
struct odhcp6c_entry *x = odhcp6c_find_entry(STATE_RA_PREFIX, &entry);
- if (x) {
+ if (x && IN6_ARE_ADDR_EQUAL(&x->target, any)) {
odhcp6c_random(&x->target.s6_addr32[2], 2 * sizeof(uint32_t));
} else if (odhcp6c_find_entry(STATE_IA_NA, &entry)) {
dhcpv6_request(DHCPV6_MSG_DECLINE);
if (len < 0)
break;
- for (struct nlmsghdr *nh = (struct nlmsghdr*)buf; NLMSG_OK(nh, len);
+ for (struct nlmsghdr *nh = (struct nlmsghdr*)buf; NLMSG_OK(nh, (size_t)len);
nh = NLMSG_NEXT(nh, len)) {
struct ifaddrmsg *ifa = NLMSG_DATA(nh);
struct in6_addr *addr = NULL;
- if (nh->nlmsg_type != RTM_NEWADDR || NLMSG_PAYLOAD(nh, 0) < sizeof(*ifa) ||
- !(ifa->ifa_flags & IFA_F_DADFAILED) ||
- ifa->ifa_index != if_index)
+ if (NLMSG_PAYLOAD(nh, 0) < sizeof(*ifa) || ifa->ifa_index != if_index ||
+ (nh->nlmsg_type == RTM_NEWADDR && !(ifa->ifa_flags & IFA_F_DADFAILED)) ||
+ (nh->nlmsg_type == RTM_DELADDR && !(ifa->ifa_flags & IFA_F_TENTATIVE)))
continue;
ssize_t alen = NLMSG_PAYLOAD(nh, sizeof(*ifa));
for (struct rtattr *rta = (struct rtattr*)&ifa[1]; RTA_OK(rta, alen);
rta = RTA_NEXT(rta, alen))
- if (rta->rta_type == IFA_LOCAL && RTA_PAYLOAD(rta) >= sizeof(*addr))
+ if (rta->rta_type == IFA_ADDRESS && RTA_PAYLOAD(rta) >= sizeof(*addr))
addr = RTA_DATA(rta);
if (addr)
}
found = true;
+ uint32_t router_valid = ntohs(adv->nd_ra_router_lifetime);
// Parse default route
entry.router = from.sin6_addr;
entry.priority = pref_to_priority(adv->nd_ra_flags_reserved);
if (entry.priority < 0)
entry.priority = pref_to_priority(0);
- entry.valid = ntohs(adv->nd_ra_router_lifetime);
+ entry.valid = router_valid;
entry.preferred = entry.valid;
odhcp6c_update_entry(STATE_RA_ROUTE, &entry);
if (adv->nd_ra_retransmit)
update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit));
+
// Evaluate options
struct icmpv6_opt *opt;
icmpv6_for_each_option(opt, &adv[1], &buf[len]) {
if (opt->type == ND_OPT_MTU) {
- update_proc("conf", "mtu", ntohl(*((uint32_t*)&opt->data[2])));
+ uint32_t *mtu = (uint32_t*)&opt->data[2];
+ update_proc("conf", "mtu", ntohl(*mtu));
} else if (opt->type == ND_OPT_ROUTE_INFORMATION && opt->len <= 3) {
entry.router = from.sin6_addr;
entry.target = any;
entry.priority = pref_to_priority(opt->data[1]);
entry.length = opt->data[0];
- entry.valid = ntohl(*((uint32_t*)&opt->data[2]));
+ uint32_t *valid = (uint32_t*)&opt->data[2];
+ entry.valid = ntohl(*valid);
memcpy(&entry.target, &opt->data[6], (opt->len - 1) * 8);
if (entry.length > 128 || IN6_IS_ADDR_LINKLOCAL(&entry.target)
struct nd_opt_prefix_info *pinfo = (struct nd_opt_prefix_info*)opt;
entry.router = any;
entry.target = pinfo->nd_opt_pi_prefix;
- entry.priority = 0;
+ entry.priority = 256;
entry.length = pinfo->nd_opt_pi_prefix_len;
entry.valid = ntohl(pinfo->nd_opt_pi_valid_time);
entry.preferred = ntohl(pinfo->nd_opt_pi_preferred_time);
continue;
if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
- odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7201);
+ odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) ||
pinfo->nd_opt_pi_prefix_len != 64)
entry.target.s6_addr32[2] = lladdr.s6_addr32[2];
entry.target.s6_addr32[3] = lladdr.s6_addr32[3];
- odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7201);
+ odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200);
+ } else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 2) {
+ entry.router = from.sin6_addr;
+ entry.priority = 0;
+ entry.length = 128;
+ uint32_t *valid = (uint32_t*)&opt->data[2];
+ entry.valid = ntohl(*valid);
+ entry.preferred = 0;
+
+ for (ssize_t i = 0; i < (opt->len - 1) / 2; ++i) {
+ memcpy(&entry.target, &opt->data[6 + i * sizeof(entry.target)],
+ sizeof(entry.target));
+ odhcp6c_update_entry(STATE_RA_DNS, &entry);
+ }
}
-
}
+
+ size_t ra_dns_len;
+ struct odhcp6c_entry *entry = odhcp6c_get_state(STATE_RA_DNS, &ra_dns_len);
+ for (size_t i = 0; i < ra_dns_len / sizeof(*entry); ++i)
+ if (IN6_ARE_ADDR_EQUAL(&entry[i].router, &from.sin6_addr) &&
+ entry[i].valid > router_valid)
+ entry[i].valid = router_valid;
}
+
+ odhcp6c_expire();
return found;
}