uloop_timeout_set(&iface->timer_rs, 1000);
}
-static int router_icmpv6_valid(struct sockaddr_in6 *source, uint8_t *data, size_t len)
+static bool router_icmpv6_valid(struct sockaddr_in6 *source, uint8_t *data, size_t len)
{
struct icmp6_hdr *hdr = (struct icmp6_hdr *)data;
- struct icmpv6_opt *opt;
- size_t optlen = len - sizeof(*hdr);
+ struct icmpv6_opt *opt, *end = (struct icmpv6_opt*)&data[len];
/* Hoplimit is already checked in odhcpd_receive_packets */
- if (len < sizeof(*hdr))
- return 0;
-
- if (hdr->icmp6_code)
- return 0;
+ if (len < sizeof(*hdr) || hdr->icmp6_code)
+ return false;
switch (hdr->icmp6_type) {
case ND_ROUTER_ADVERT:
if (!IN6_IS_ADDR_LINKLOCAL(&source->sin6_addr))
- return 0;
+ return false;
opt = (struct icmpv6_opt *)((struct nd_router_advert *)data + 1);
break;
break;
default:
- return 0;
+ return false;
}
- while (optlen > 0) {
- size_t l = opt->len << 3;
+ icmpv6_for_each_option(opt, opt, end)
+ if (opt->type == ND_OPT_SOURCE_LINKADDR &&
+ IN6_IS_ADDR_UNSPECIFIED(&source->sin6_addr) &&
+ hdr->icmp6_type == ND_ROUTER_SOLICIT)
+ return false;
- if (optlen < sizeof(*opt))
- return 0;
-
- if (l > optlen || l == 0)
- return 0;
-
- if (opt->type == ND_OPT_SOURCE_LINKADDR && IN6_IS_ADDR_UNSPECIFIED(&source->sin6_addr) &&
- hdr->icmp6_type == ND_ROUTER_SOLICIT) {
- return 0;
- }
-
- opt = (struct icmpv6_opt *)(((uint8_t *)opt) + l);
-
- optlen -= l;
- }
-
- return 1;
+ // Check all options parsed successfully
+ return opt == end;
}
// Event handler for incoming ICMPv6 packets
struct interface *iface)
{
struct icmp6_hdr *hdr = data;
-
+
if (!router_icmpv6_valid(addr, data, len))
return;
adv.h.nd_ra_router_lifetime = 0;
}
- if (have_public && iface->deprecate_ula_if_public_avail)
- for (size_t i = 0; i < cnt; ++i)
- if ((adv.prefix[i].nd_opt_pi_prefix.s6_addr[0] & 0xfe) == 0xfc)
- adv.prefix[i].nd_opt_pi_preferred_time = 0;
-
// DNS Recursive DNS
if (iface->dns_cnt > 0) {
dns_addr = iface->dns;