]> git.decadent.org.uk Git - odhcp6c.git/blobdiff - src/ra.c
ra: use proper struct msghdr initializer to fix build error on musl
[odhcp6c.git] / src / ra.c
index b700c9a8270a10aba5a162f10d0c4c061e785e27..95416240b2113fa313aa35bf2b55fcca4f69575c 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -13,7 +13,6 @@
  */
 
 #include <fcntl.h>
-#include <ifaddrs.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -26,7 +25,6 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 
@@ -56,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)
@@ -93,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;
@@ -133,22 +141,12 @@ int ra_init(const char *ifname, const struct in6_addr *ifid)
 
 static void ra_send_rs(int signal __attribute__((unused)))
 {
-       struct {
-               struct icmp6_hdr hdr;
-               struct icmpv6_opt lladdr;
-       } rs = {
-               .hdr = {ND_ROUTER_SOLICIT, 0, 0, {{0}}},
-               .lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
-       };
        const struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index};
-       size_t len = sizeof(rs);
-
-       struct ifreq ifr;
-       memset(&ifr, 0, sizeof(ifr));
-       strncpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name));
-       if (!ioctl(sock, SIOCGIFHWADDR, &ifr)
-                       && memcmp(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6))
-               memcpy(rs.lladdr.data, ifr.ifr_hwaddr.sa_data, 6);
+       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);
 
@@ -162,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;
 }
 
 
@@ -197,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;
@@ -245,50 +251,41 @@ 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 (getifaddrs(&ifaddr) == 0) {
-                       for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-                               struct sockaddr_in6 *addr;
+       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 (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6)
-                                       continue;
-
-                               addr = (struct sockaddr_in6*)ifa->ifa_addr;
-
-                               if (!IN6_IS_ADDR_LINKLOCAL(&addr->sin6_addr))
-                                       continue;
+               if (!connect(sock, (struct sockaddr*)&addr, sizeof(addr)) &&
+                               !getsockname(sock, (struct sockaddr*)&addr, &alen))
+                       lladdr = addr.sin6_addr;
 
-                               if (!strcmp(ifa->ifa_name, if_name)) {
-                                       lladdr = addr->sin6_addr;
-                                       has_lladdr = true;
-                                       break;
-                               }
-                       }
-
-                       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;
@@ -322,7 +319,7 @@ 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)
@@ -360,7 +357,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;
@@ -377,7 +374,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)
@@ -386,7 +383,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;
@@ -398,7 +395,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);
                                }
                        }
                }