X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fra.c;h=90f09230d6f7ce6a5976814b9cfeae311dec53aa;hp=560552fcbd5bb4149bb9f2df8043bd30394ee76a;hb=5710bd46493eaa75a3c6b532d21b8237a691c5a8;hpb=6cda10d0b5f43234b2fefdf1ab94ee341878d010 diff --git a/src/ra.c b/src/ra.c index 560552f..90f0923 100644 --- a/src/ra.c +++ b/src/ra.c @@ -13,7 +13,6 @@ */ #include -#include #include #include #include @@ -55,6 +54,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 +100,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 +141,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,8 +160,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; + return (flags == 0x0) ? 512 : (flags == 0x1) ? 384 : + (flags == 0x3) ? 640 : -1; } @@ -179,6 +195,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; @@ -227,37 +251,21 @@ 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}; const struct in6_addr any = IN6ADDR_ANY_INIT; - if (!has_lladdr) { - // Autodetect interface-id if not specified - struct ifaddrs *ifaddr, *ifa; + 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 (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; + if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) && + !getsockname(sock, (struct sockaddr*)&addr, &alen)) + lladdr = addr.sin6_addr; - addr = (struct sockaddr_in6*)ifa->ifa_addr; - - if (!IN6_IS_ADDR_LINKLOCAL(&addr->sin6_addr)) - continue; - - if (!strcmp(ifa->ifa_name, if_name)) { - lladdr = addr->sin6_addr; - has_lladdr = true; - break; - } - } - - freeifaddrs(ifaddr); - } + close(sock); } while (true) { @@ -270,7 +278,7 @@ bool ra_process(void) if (len <= 0) break; - if (!has_lladdr) + if (IN6_IS_ADDR_UNSPECIFIED(&lladdr)) continue; int hlim = 0; @@ -304,18 +312,20 @@ bool ra_process(void) entry.priority = pref_to_priority(0); entry.valid = router_valid; entry.preferred = entry.valid; - changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry); + 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); // Parse ND parameters - if (ntohl(adv->nd_ra_reachable) <= 3600000) - update_proc("neigh", "base_reachable_time_ms", ntohl(adv->nd_ra_reachable)); + uint32_t reachable = ntohl(adv->nd_ra_reachable); + if (reachable > 0 && reachable <= 3600000) + update_proc("neigh", "base_reachable_time_ms", reachable); - if (ntohl(adv->nd_ra_retransmit) <= 60000) - update_proc("neigh", "retrans_time_ms", ntohl(adv->nd_ra_retransmit)); + uint32_t retransmit = ntohl(adv->nd_ra_retransmit); + if (retransmit > 0 && retransmit <= 60000) + update_proc("neigh", "retrans_time_ms", retransmit); // Evaluate options @@ -340,7 +350,7 @@ bool ra_process(void) continue; if (entry.priority > 0) - changed |= odhcp6c_update_entry(STATE_RA_ROUTE, &entry); + 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; @@ -357,7 +367,7 @@ bool ra_process(void) 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) @@ -366,7 +376,7 @@ bool ra_process(void) 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; @@ -378,7 +388,7 @@ bool ra_process(void) 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); + changed |= odhcp6c_update_entry(STATE_RA_DNS, &entry, 0, true); } } }