X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=f8ba5d7aac0332daa0c8776e12183c4c06e48edd;hp=83da938606fc165bf6b92c02400ffc102e66ab44;hb=1bbf34a1df3e16865b3b9330b338952076bc26f9;hpb=0b68cabeb40d6e24a677a9332d3f3db163b5d723 diff --git a/src/router.c b/src/router.c index 83da938..f8ba5d7 100644 --- a/src/router.c +++ b/src/router.c @@ -30,7 +30,7 @@ static void forward_router_solicitation(const struct interface *iface); static void forward_router_advertisement(uint8_t *data, size_t len); static void handle_icmpv6(void *addr, void *data, size_t len, - struct interface *iface); + struct interface *iface, void *dest); static void send_router_advert(struct uloop_timeout *event); static void sigusr1_refresh(int signal); @@ -88,6 +88,9 @@ int init_router(void) int setup_router_interface(struct interface *iface, bool enable) { + if (!fp_route || router_event.uloop.fd < 0) + return -1; + struct ipv6_mreq all_nodes = {ALL_IPV6_NODES, iface->ifindex}; struct ipv6_mreq all_routers = {ALL_IPV6_ROUTERS, iface->ifindex}; @@ -130,12 +133,50 @@ static void sigusr1_refresh(_unused int signal) uloop_timeout_set(&iface->timer_rs, 1000); } +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, *end = (struct icmpv6_opt*)&data[len]; + + /* Hoplimit is already checked in odhcpd_receive_packets */ + 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 false; + + opt = (struct icmpv6_opt *)((struct nd_router_advert *)data + 1); + break; + + case ND_ROUTER_SOLICIT: + opt = (struct icmpv6_opt *)((struct nd_router_solicit *)data + 1); + break; + + default: + return false; + } + + 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; + + // Check all options parsed successfully + return opt == end; +} // Event handler for incoming ICMPv6 packets -static void handle_icmpv6(_unused void *addr, void *data, size_t len, - struct interface *iface) +static void handle_icmpv6(void *addr, void *data, size_t len, + struct interface *iface, _unused void *dest) { struct icmp6_hdr *hdr = data; + + if (!router_icmpv6_valid(addr, data, len)) + return; + if ((iface->ra == RELAYD_SERVER && !iface->master)) { // Server mode if (hdr->icmp6_type == ND_ROUTER_SOLICIT) send_router_advert(&iface->timer_rs); @@ -148,20 +189,6 @@ static void handle_icmpv6(_unused void *addr, void *data, size_t len, } -static bool match_route(const struct odhcpd_ipaddr *n, const struct in6_addr *addr) -{ - if (n->prefix <= 32) - return ntohl(n->addr.s6_addr32[0]) >> (32 - n->prefix) == - ntohl(addr->s6_addr32[0]) >> (32 - n->prefix); - - if (n->addr.s6_addr32[0] != addr->s6_addr32[0]) - return false; - - return ntohl(n->addr.s6_addr32[1]) >> (64 - n->prefix) == - ntohl(addr->s6_addr32[1]) >> (64 - n->prefix); -} - - // Detect whether a default route exists, also find the source prefixes static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len) { @@ -169,7 +196,7 @@ static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len) char line[512], ifname[16]; bool found_default = false; - struct odhcpd_ipaddr p = {IN6ADDR_ANY_INIT, 0, false, 0, 0, 0}; + struct odhcpd_ipaddr p = {IN6ADDR_ANY_INIT, 0, 0, false, 0, 0, 0}; while (fgets(line, sizeof(line), fp_route)) { uint32_t rflags; if (sscanf(line, "00000000000000000000000000000000 00 " @@ -186,8 +213,8 @@ static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len) for (ssize_t i = 0; i < len; ++i) { if (n[i].prefix <= 64 && n[i].prefix >= p.prefix && - match_route(&p, &n[i].addr)) { - n[i].prefix = p.prefix; + !odhcpd_bmemcmp(&p.addr, &n[i].addr, p.prefix)) { + n[i].dprefix = p.prefix; break; } } @@ -219,7 +246,10 @@ static void send_router_advert(struct uloop_timeout *event) .lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}}, .mtu = {ND_OPT_MTU, 1, 0, htonl(mtu)}, }; - adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER; + + if (iface->dhcpv6) + adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER; + if (iface->managed >= RELAYD_MANAGED_MFLAG) adv.h.nd_ra_flags_reserved |= ND_RA_FLAG_MANAGED; @@ -232,6 +262,7 @@ static void send_router_advert(struct uloop_timeout *event) // If not currently shutting down struct odhcpd_ipaddr addrs[RELAYD_MAX_PREFIXES]; ssize_t ipcnt = 0; + uint64_t maxpreferred = 0; // If not shutdown if (event->cb) { @@ -248,13 +279,13 @@ static void send_router_advert(struct uloop_timeout *event) bool have_public = false; size_t cnt = 0; - struct in6_addr *dns_addr = NULL; + struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref; uint32_t dns_time = 0; size_t dns_cnt = 1; for (ssize_t i = 0; i < ipcnt; ++i) { struct odhcpd_ipaddr *addr = &addrs[i]; - if (addr->prefix > 64 || addr->has_class) + if (addr->prefix > 96 || addr->has_class) continue; // Address not suitable if (addr->preferred > MaxPreferredTime) @@ -265,8 +296,9 @@ static void send_router_advert(struct uloop_timeout *event) struct nd_opt_prefix_info *p = NULL; for (size_t i = 0; i < cnt; ++i) { - if (!memcmp(&adv.prefix[i].nd_opt_pi_prefix, - &addr->addr, 8)) + if (addr->prefix == adv.prefix[i].nd_opt_pi_prefix_len && + !odhcpd_bmemcmp(&adv.prefix[i].nd_opt_pi_prefix, + &addr->addr, addr->prefix)) p = &adv.prefix[i]; } @@ -277,24 +309,28 @@ static void send_router_advert(struct uloop_timeout *event) p = &adv.prefix[cnt++]; } - if ((addr->addr.s6_addr[0] & 0xfe) != 0xfc && addr->preferred > 0) + if ((addr->addr.s6_addr[0] & 0xfe) != 0xfc && addr->preferred > 0) { have_public = true; - memcpy(&p->nd_opt_pi_prefix, &addr->addr, 8); + if (maxpreferred < 1000 * addr->preferred) + maxpreferred = 1000 * addr->preferred; + } + + odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr, addr->prefix); p->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION; p->nd_opt_pi_len = 4; - p->nd_opt_pi_prefix_len = 64; + p->nd_opt_pi_prefix_len = (addr->prefix < 64) ? 64 : addr->prefix; p->nd_opt_pi_flags_reserved = 0; if (!iface->ra_not_onlink) p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_ONLINK; - if (iface->managed < RELAYD_MANAGED_NO_AFLAG) + if (iface->managed < RELAYD_MANAGED_NO_AFLAG && addr->prefix <= 64) p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_AUTO; p->nd_opt_pi_valid_time = htonl(addr->valid); p->nd_opt_pi_preferred_time = htonl(addr->preferred); if (addr->preferred > dns_time) { dns_time = addr->preferred; - dns_addr = &addr->addr; + dns_pref = addr->addr; } } @@ -304,11 +340,6 @@ static void send_router_advert(struct uloop_timeout *event) 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; @@ -316,7 +347,7 @@ static void send_router_advert(struct uloop_timeout *event) dns_time = 2 * MaxRtrAdvInterval; } - if (!dns_addr) + if (!dns_addr || IN6_IS_ADDR_UNSPECIFIED(dns_addr)) dns_cnt = 0; struct { @@ -379,18 +410,18 @@ static void send_router_advert(struct uloop_timeout *event) for (ssize_t i = 0; i < ipcnt; ++i) { struct odhcpd_ipaddr *addr = &addrs[i]; - if (addr->prefix > 64 || addr->prefix == 0) { + if (addr->dprefix > 64 || addr->dprefix == 0) { continue; // Address not suitable - } else if (addr->prefix > 32) { - addr->addr.s6_addr32[1] &= htonl(~((1U << (64 - addr->prefix)) - 1)); - } else if (addr->prefix <= 32) { - addr->addr.s6_addr32[0] &= htonl(~((1U << (32 - addr->prefix)) - 1)); + } else if (addr->dprefix > 32) { + addr->addr.s6_addr32[1] &= htonl(~((1U << (64 - addr->dprefix)) - 1)); + } else if (addr->dprefix <= 32) { + addr->addr.s6_addr32[0] &= htonl(~((1U << (32 - addr->dprefix)) - 1)); addr->addr.s6_addr32[1] = 0; } routes[routes_cnt].type = ND_OPT_ROUTE_INFO; routes[routes_cnt].len = sizeof(*routes) / 8; - routes[routes_cnt].prefix = addr->prefix; + routes[routes_cnt].prefix = addr->dprefix; routes[routes_cnt].flags = 0; if (iface->route_preference < 0) routes[routes_cnt].flags |= ND_RA_PREF_LOW; @@ -399,8 +430,8 @@ static void send_router_advert(struct uloop_timeout *event) routes[routes_cnt].lifetime = htonl(addr->valid); routes[routes_cnt].addr[0] = addr->addr.s6_addr32[0]; routes[routes_cnt].addr[1] = addr->addr.s6_addr32[1]; - routes[routes_cnt].addr[2] = addr->addr.s6_addr32[2]; - routes[routes_cnt].addr[3] = addr->addr.s6_addr32[3]; + routes[routes_cnt].addr[2] = 0; + routes[routes_cnt].addr[3] = 0; ++routes_cnt; } @@ -415,12 +446,27 @@ static void send_router_advert(struct uloop_timeout *event) odhcpd_send(router_event.uloop.fd, &all_nodes, iov, ARRAY_SIZE(iov), iface); - // Rearm timer - int msecs; - odhcpd_urandom(&msecs, sizeof(msecs)); - msecs = (labs(msecs) % (1000 * (MaxRtrAdvInterval - - MinRtrAdvInterval))) + (MinRtrAdvInterval * 1000); - uloop_timeout_set(&iface->timer_rs, msecs); + // Rearm timer if not shut down + if (event->cb) { + uint32_t maxinterval = MaxRtrAdvInterval * 1000; + uint32_t mininterval = MinRtrAdvInterval * 1000; + + if (maxpreferred > 0 && maxinterval > maxpreferred / 2) { + maxinterval = maxpreferred / 2; + if (maxinterval < 4000) + maxinterval = 4000; + + if (maxinterval >= 9000) + mininterval = maxinterval / 3; + else + mininterval = (maxinterval * 3) / 4; + } + + int msecs; + odhcpd_urandom(&msecs, sizeof(msecs)); + msecs = (labs(msecs) % (maxinterval - mininterval)) + mininterval; + uloop_timeout_set(&iface->timer_rs, msecs); + } }