X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fra.c;h=1c121e63e3f8153064886293b3b8d5bcc72533b0;hp=560552fcbd5bb4149bb9f2df8043bd30394ee76a;hb=d21764d12bb799f89d42c94dc20d4adb6d588077;hpb=6cda10d0b5f43234b2fefdf1ab94ee341878d010 diff --git a/src/ra.c b/src/ra.c index 560552f..1c121e6 100644 --- a/src/ra.c +++ b/src/ra.c @@ -13,7 +13,6 @@ */ #include -#include #include #include #include @@ -21,6 +20,8 @@ #include #include #include +#include +#include #include #include @@ -55,6 +56,15 @@ static char if_name[IF_NAMESIZE] = {0}; static volatile int rs_attempt = 0; static struct in6_addr lladdr = IN6ADDR_ANY_INIT; +struct { + struct icmp6_hdr hdr; + struct icmpv6_opt lladdr; +} rs = { + .hdr = {ND_ROUTER_SOLICIT, 0, 0, {{0}}}, + .lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}}, +}; + + static void ra_send_rs(int signal __attribute__((unused))); int ra_init(const char *ifname, const struct in6_addr *ifid) @@ -92,6 +102,7 @@ int ra_init(const char *ifname, const struct in6_addr *ifid) .ifi = {.ifi_index = if_index} }; send(rtnl, &req, sizeof(req), 0); + ra_link_up(); // Filter ICMPv6 package types struct icmp6_filter filt; @@ -132,9 +143,16 @@ int ra_init(const char *ifname, const struct in6_addr *ifid) static void ra_send_rs(int signal __attribute__((unused))) { - const struct icmp6_hdr rs = {ND_ROUTER_SOLICIT, 0, 0, {{0}}}; 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)); + const struct icmpv6_opt llnull = {ND_OPT_SOURCE_LINKADDR, 1, {0}}; + size_t len; + + if ((rs_attempt % 2 == 0) && memcmp(&rs.lladdr, &llnull, sizeof(llnull))) + len = sizeof(rs); + else + len = sizeof(struct icmp6_hdr); + + sendto(sock, &rs, len, MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest)); if (++rs_attempt <= 3) alarm(4); @@ -144,19 +162,8 @@ static void ra_send_rs(int signal __attribute__((unused))) static int16_t pref_to_priority(uint8_t flags) { flags = (flags >> 3) & 0x03; - return (flags == 0x0) ? 1024 : (flags == 0x1) ? 512 : - (flags == 0x3) ? 2048 : -1; -} - - -static void update_proc(const char *sect, const char *opt, uint32_t value) -{ - char buf[64]; - snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/%s/%s/%s", sect, if_name, opt); - - int fd = open(buf, O_WRONLY); - write(fd, buf, snprintf(buf, sizeof(buf), "%u", value)); - close(fd); + return (flags == 0x0) ? 512 : (flags == 0x1) ? 384 : + (flags == 0x3) ? 640 : -1; } @@ -179,6 +186,14 @@ bool ra_link_up(void) resp.msg.ifi_index != if_index) continue; + ssize_t alen = NLMSG_PAYLOAD(&resp.hdr, sizeof(resp.msg)); + for (struct rtattr *rta = (struct rtattr*)(resp.pad); + RTA_OK(rta, alen); rta = RTA_NEXT(rta, alen)) { + if (rta->rta_type == IFLA_ADDRESS && + RTA_PAYLOAD(rta) >= sizeof(rs.lladdr.data)) + memcpy(rs.lladdr.data, RTA_DATA(rta), sizeof(rs.lladdr.data)); + } + bool hascarrier = resp.msg.ifi_flags & IFF_LOWER_UP; if (!firstcall && nocarrier != !hascarrier) ret = true; @@ -223,54 +238,79 @@ static bool ra_icmpv6_valid(struct sockaddr_in6 *source, int hlim, uint8_t *data return opt == end; } +int ra_conf_hoplimit(int newvalue) +{ + static int value = 0; + if (newvalue > 0) + value = newvalue; + return value; +} + +int ra_conf_mtu(int newvalue) +{ + static int value = 0; + if (newvalue >= 1280 && newvalue <= 65535) + value = newvalue; + return value; +} + +int ra_conf_reachable(int newvalue) +{ + static int value = 0; + if (newvalue > 0 && newvalue <= 3600000) + value = newvalue; + return value; +} + +int ra_conf_retransmit(int newvalue) +{ + static int value = 0; + if (newvalue > 0 && newvalue <= 60000) + value = newvalue; + return value; +} + bool ra_process(void) { bool found = false; bool changed = false; - bool has_lladdr = !IN6_IS_ADDR_UNSPECIFIED(&lladdr); uint8_t buf[1500], cmsg_buf[128]; struct nd_router_advert *adv = (struct nd_router_advert*)buf; - struct odhcp6c_entry entry = {IN6ADDR_ANY_INIT, 0, 0, IN6ADDR_ANY_INIT, 0, 0, 0, 0, 0, 0}; + struct odhcp6c_entry *entry = alloca(sizeof(*entry) + 256); const struct in6_addr any = IN6ADDR_ANY_INIT; - if (!has_lladdr) { - // Autodetect interface-id if not specified - struct ifaddrs *ifaddr, *ifa; - - if (getifaddrs(&ifaddr) == 0) { - for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { - struct sockaddr_in6 *addr; - - if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6) - continue; - - addr = (struct sockaddr_in6*)ifa->ifa_addr; + memset(entry, 0, sizeof(*entry)); - if (!IN6_IS_ADDR_LINKLOCAL(&addr->sin6_addr)) - continue; + if (IN6_IS_ADDR_UNSPECIFIED(&lladdr)) { + struct sockaddr_in6 addr = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index}; + socklen_t alen = sizeof(addr); + int sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); - if (!strcmp(ifa->ifa_name, if_name)) { - lladdr = addr->sin6_addr; - has_lladdr = true; - break; - } - } + if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) && + !getsockname(sock, (struct sockaddr*)&addr, &alen)) + lladdr = addr.sin6_addr; - freeifaddrs(ifaddr); - } + close(sock); } while (true) { struct sockaddr_in6 from; struct iovec iov = {buf, sizeof(buf)}; - struct msghdr msg = {&from, sizeof(from), &iov, 1, - cmsg_buf, sizeof(cmsg_buf), 0}; + struct msghdr msg = { + .msg_name = (void *) &from, + .msg_namelen = sizeof(from), + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = cmsg_buf, + .msg_controllen = sizeof(cmsg_buf), + .msg_flags = 0 + }; ssize_t len = recvmsg(sock, &msg, MSG_DONTWAIT); if (len <= 0) break; - if (!has_lladdr) + if (IN6_IS_ADDR_UNSPECIFIED(&lladdr)) continue; int hlim = 0; @@ -296,99 +336,120 @@ bool ra_process(void) uint32_t router_valid = ntohs(adv->nd_ra_router_lifetime); // Parse default route - entry.target = any; - entry.length = 0; - 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 = router_valid; - entry.preferred = entry.valid; - changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry); + entry->target = any; + entry->length = 0; + 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 = router_valid; + entry->preferred = entry->valid; + changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry, 0, true); // Parse hoplimit - if (adv->nd_ra_curhoplimit) - update_proc("conf", "hop_limit", adv->nd_ra_curhoplimit); + ra_conf_hoplimit(adv->nd_ra_curhoplimit); // Parse ND parameters - if (ntohl(adv->nd_ra_reachable) <= 3600000) - update_proc("neigh", "base_reachable_time_ms", ntohl(adv->nd_ra_reachable)); - - if (ntohl(adv->nd_ra_retransmit) <= 60000) - update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit)); - + ra_conf_reachable(ntohl(adv->nd_ra_reachable)); + ra_conf_retransmit(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) { uint32_t *mtu = (uint32_t*)&opt->data[2]; - if (ntohl(*mtu) >= 1280 && ntohl(*mtu) <= 65535) - update_proc("conf", "mtu", ntohl(*mtu)); + ra_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->router = from.sin6_addr; + entry->target = any; + entry->priority = pref_to_priority(opt->data[1]); + entry->length = opt->data[0]; uint32_t *valid = (uint32_t*)&opt->data[2]; - entry.valid = ntohl(*valid); - memcpy(&entry.target, &opt->data[6], (opt->len - 1) * 8); + entry->valid = ntohl(*valid); + memcpy(&entry->target, &opt->data[6], (opt->len - 1) * 8); - if (entry.length > 128 || IN6_IS_ADDR_LINKLOCAL(&entry.target) - || IN6_IS_ADDR_LOOPBACK(&entry.target) - || IN6_IS_ADDR_MULTICAST(&entry.target)) + if (entry->length > 128 || IN6_IS_ADDR_LINKLOCAL(&entry->target) + || IN6_IS_ADDR_LOOPBACK(&entry->target) + || IN6_IS_ADDR_MULTICAST(&entry->target)) continue; - if (entry.priority > 0) - changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry); + if (entry->priority > 0) + changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry, 0, true); } else if (opt->type == ND_OPT_PREFIX_INFORMATION && opt->len == 4) { struct nd_opt_prefix_info *pinfo = (struct nd_opt_prefix_info*)opt; - entry.router = any; - entry.target = pinfo->nd_opt_pi_prefix; - 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); - - if (entry.length > 128 || IN6_IS_ADDR_LINKLOCAL(&entry.target) - || IN6_IS_ADDR_LOOPBACK(&entry.target) - || IN6_IS_ADDR_MULTICAST(&entry.target) - || entry.valid < entry.preferred) + entry->router = any; + entry->target = pinfo->nd_opt_pi_prefix; + 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); + + if (entry->length > 128 || IN6_IS_ADDR_LINKLOCAL(&entry->target) + || IN6_IS_ADDR_LOOPBACK(&entry->target) + || IN6_IS_ADDR_MULTICAST(&entry->target) + || entry->valid < entry->preferred) continue; if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK) - changed |= odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200); + changed |= odhcp6c_update_entry(STATE_RA_ROUTE, entry, 7200, true); if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) || pinfo->nd_opt_pi_prefix_len != 64) continue; - entry.target.s6_addr32[2] = lladdr.s6_addr32[2]; - entry.target.s6_addr32[3] = lladdr.s6_addr32[3]; + entry->target.s6_addr32[2] = lladdr.s6_addr32[2]; + entry->target.s6_addr32[3] = lladdr.s6_addr32[3]; - changed |= odhcp6c_update_entry_safe(STATE_RA_PREFIX, &entry, 7200); + changed |= odhcp6c_update_entry(STATE_RA_PREFIX, entry, 7200, true); } else if (opt->type == ND_OPT_RECURSIVE_DNS && opt->len > 2) { - entry.router = from.sin6_addr; - entry.priority = 0; - entry.length = 128; + 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; + 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)); - changed |= odhcp6c_update_entry(STATE_RA_DNS, &entry); + memcpy(&entry->target, &opt->data[6 + i * sizeof(entry->target)], + sizeof(entry->target)); + changed |= odhcp6c_update_entry(STATE_RA_DNS, entry, 0, true); + } + } else if (opt->type == ND_OPT_DNSSL && opt->len > 1) { + uint32_t *valid = (uint32_t*)&opt->data[2]; + uint8_t *buf = &opt->data[6]; + uint8_t *end = &buf[(opt->len - 1) * 8]; + + entry->router = from.sin6_addr; + entry->valid = ntohl(*valid); + + while (buf < end) { + int len = dn_expand(buf, end, buf, (char*)entry->auxtarget, 256); + if (len < 1) + break; + + buf = &buf[len]; + entry->auxlen = strlen((char*)entry->auxtarget); + + if (entry->auxlen == 0) + continue; + + changed |= odhcp6c_update_entry(STATE_RA_SEARCH, entry, 0, true); + entry->auxlen = 0; } } } - 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; + int states[2] = {STATE_RA_DNS, STATE_RA_SEARCH}; + for (size_t i = 0; i < 2; ++i) { + size_t ra_dns_len; + uint8_t *start = odhcp6c_get_state(states[i], &ra_dns_len); + for (struct odhcp6c_entry *c = (struct odhcp6c_entry*)start; + (uint8_t*)c < &start[ra_dns_len] && &c->auxtarget[c->auxlen] <= &start[ra_dns_len]; + c = (struct odhcp6c_entry*)(&c->auxtarget[c->auxlen])) + if (IN6_ARE_ADDR_EQUAL(&c->router, &from.sin6_addr) && + c->valid > router_valid) + c->valid = router_valid; + } } if (found)