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;
}
static bool ra_deduplicate(const struct in6_addr *any, uint8_t length)
{
- struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 0};
+ struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, length, 0, *any, 0, 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);
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)
bool found = false;
uint8_t buf[1500];
struct nd_router_advert *adv = (struct nd_router_advert*)buf;
- struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0};
+ struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0};
const struct in6_addr any = IN6ADDR_ANY_INIT;
odhcp6c_expire();
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);
size_t ra_dns_len;
struct odhcp6c_entry *entry = odhcp6c_get_state(STATE_RA_DNS, &ra_dns_len);
- for (size_t i = 0; i < len / sizeof(*entry); ++i)
+ 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;