Send router solicitations with source link-layer address

[odhcp6c.git] / src / ra.c

diff --git a/src/ra.c b/src/ra.c
index 6132e455189b1ce0b527b0322c97166c42f600a9..b700c9a8270a10aba5a162f10d0c4c061e785e27 100644 (file)
--- a/src/ra.c
+++ b/src/ra.c
@@ -26,6 +26,7 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 
@@ -132,9 +133,26 @@ 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}}};
+       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};
-       sendto(sock, &rs, sizeof(rs), MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
+       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);
+       else
+               len = sizeof(struct icmp6_hdr);
+
+       sendto(sock, &rs, len, MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
 
        if (++rs_attempt <= 3)
                alarm(4);
@@ -311,11 +329,13 @@ bool ra_process(void)
                        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
@@ -356,18 +376,16 @@ bool ra_process(void)
                                                || 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);
+
                                if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO) ||
-                                               pinfo->nd_opt_pi_prefix_len != 64) {
-                                       if (pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
-                                               changed |= odhcp6c_update_entry_safe(STATE_RA_ROUTE, &entry, 7200);
+                                               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];
 
-                               if (!(pinfo->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK))
-                                       entry.length = 128;
                                changed |= 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;