X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=89b1c520ab13d4a104e00a65d10dd7c1cf79771d;hp=a45a8cbbe2d176ed4ed71a587f9107cdebfb8154;hb=053ca41a841aa4a1b1ce86ce6ee9f4304cba7027;hpb=c0c1086c51e1abfc991de11e3d687a60240d2df8 diff --git a/src/router.c b/src/router.c index a45a8cb..89b1c52 100644 --- a/src/router.c +++ b/src/router.c @@ -31,12 +31,13 @@ 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, void *dest); -static void send_router_advert(struct uloop_timeout *event); +static void trigger_router_advert(struct uloop_timeout *event); static void sigusr1_refresh(int signal); static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6}; static FILE *fp_route = NULL; +#define RA_IOV_LEN 6 int init_router(void) @@ -104,7 +105,7 @@ int setup_router_interface(struct interface *iface, bool enable) if (!enable) { if (iface->ra) - send_router_advert(&iface->timer_rs); + trigger_router_advert(&iface->timer_rs); } else { void *mreq = &all_routers; @@ -112,8 +113,8 @@ int setup_router_interface(struct interface *iface, bool enable) mreq = &all_nodes; forward_router_solicitation(iface); } else if (iface->ra == RELAYD_SERVER && !iface->master) { - iface->timer_rs.cb = send_router_advert; - send_router_advert(&iface->timer_rs); + iface->timer_rs.cb = trigger_router_advert; + trigger_router_advert(&iface->timer_rs); } if (iface->ra == RELAYD_RELAY || (iface->ra == RELAYD_SERVER && !iface->master)) @@ -168,26 +169,6 @@ static bool router_icmpv6_valid(struct sockaddr_in6 *source, uint8_t *data, size return opt == end; } -// Event handler for incoming ICMPv6 packets -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); - } else if (iface->ra == RELAYD_RELAY) { // Relay mode - if (hdr->icmp6_type == ND_ROUTER_ADVERT && iface->master) - forward_router_advertisement(data, len); - else if (hdr->icmp6_type == ND_ROUTER_SOLICIT && !iface->master) - forward_router_solicitation(odhcpd_get_master_interface()); - } -} - // Detect whether a default route exists, also find the source prefixes static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len) @@ -196,7 +177,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, 0, false, 0, 0, 0}; + struct odhcpd_ipaddr p = {IN6ADDR_ANY_INIT, 0, 0, 0, 0}; while (fgets(line, sizeof(line), fp_route)) { uint32_t rflags; if (sscanf(line, "00000000000000000000000000000000 00 " @@ -225,16 +206,14 @@ static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len) return found_default; } - // Router Advert server mode -static void send_router_advert(struct uloop_timeout *event) +static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from) { - struct interface *iface = - container_of(event, struct interface, timer_rs); + int mtu = odhcpd_get_interface_config(iface->ifname, "mtu"); + int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit"); - int mtu = odhcpd_get_interface_mtu(iface->ifname); - if (mtu < 0) - mtu = 1500; + if (mtu < 1280) + mtu = 1280; struct { struct nd_router_advert h; @@ -247,6 +226,9 @@ static void send_router_advert(struct uloop_timeout *event) .mtu = {ND_OPT_MTU, 1, 0, htonl(mtu)}, }; + if (hlim > 0) + adv.h.nd_ra_curhoplimit = hlim; + if (iface->dhcpv6) adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER; @@ -262,21 +244,20 @@ 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; + uint64_t minvalid = UINT64_MAX; + uint64_t maxvalid = 0; // If not shutdown - if (event->cb) { + if (iface->timer_rs.cb) { ipcnt = odhcpd_get_interface_addresses(iface->ifindex, addrs, ARRAY_SIZE(addrs)); // Check default route if (parse_routes(addrs, ipcnt) || iface->default_router > 1) - adv.h.nd_ra_router_lifetime = - htons(3 * MaxRtrAdvInterval); + adv.h.nd_ra_router_lifetime = 1; } // Construct Prefix Information options - bool have_public = false; size_t cnt = 0; struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref; @@ -285,11 +266,11 @@ 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 > 96 || addr->has_class) + if (addr->prefix > 96) continue; // Address not suitable - if (addr->preferred > MaxPreferredTime) - addr->preferred = MaxPreferredTime; + if (addr->preferred > MaxValidTime) + addr->preferred = MaxValidTime; if (addr->valid > MaxValidTime) addr->valid = MaxValidTime; @@ -309,14 +290,18 @@ static void send_router_advert(struct uloop_timeout *event) p = &adv.prefix[cnt++]; } - if ((addr->addr.s6_addr[0] & 0xfe) != 0xfc && addr->preferred > 0) { - have_public = true; + if (addr->preferred > 0) { + if (minvalid > 1000ULL * addr->valid) + minvalid = 1000ULL * addr->valid; - if (maxpreferred < 1000 * addr->preferred) - maxpreferred = 1000 * addr->preferred; + if (maxvalid < 1000ULL * addr->valid && (iface->default_router || + (addr->addr.s6_addr[0] & 0xfe) != 0xfc)) + maxvalid = 1000ULL * addr->valid; } - odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr, addr->prefix); + + odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr, + (iface->ra_advrouter) ? 128 : addr->prefix); p->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION; p->nd_opt_pi_len = 4; p->nd_opt_pi_prefix_len = (addr->prefix < 64) ? 64 : addr->prefix; @@ -325,6 +310,8 @@ static void send_router_advert(struct uloop_timeout *event) p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_ONLINK; if (iface->managed < RELAYD_MANAGED_NO_AFLAG && addr->prefix <= 64) p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_AUTO; + if (iface->ra_advrouter) + p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_RADDR; p->nd_opt_pi_valid_time = htonl(addr->valid); p->nd_opt_pi_preferred_time = htonl(addr->preferred); @@ -334,7 +321,7 @@ static void send_router_advert(struct uloop_timeout *event) } } - if (!have_public && !iface->default_router && adv.h.nd_ra_router_lifetime) { + if (!maxvalid && !iface->default_router && adv.h.nd_ra_router_lifetime) { syslog(LOG_WARNING, "A default route is present but there is no public prefix " "on %s thus we don't announce a default route!", iface->ifname); adv.h.nd_ra_router_lifetime = 0; @@ -344,7 +331,7 @@ static void send_router_advert(struct uloop_timeout *event) if (iface->dns_cnt > 0) { dns_addr = iface->dns; dns_cnt = iface->dns_cnt; - dns_time = 2 * MaxRtrAdvInterval; + dns_time = 0; } if (!dns_addr || IN6_IS_ADDR_UNSPECIFIED(dns_addr)) @@ -385,15 +372,10 @@ static void send_router_advert(struct uloop_timeout *event) uint8_t name[]; } *search = alloca(sizeof(*search) + search_padded); - if (!search) { - syslog(LOG_ERR, "Alloca failed for dns search on interface %s", iface->ifname); - return; - } search->type = ND_OPT_DNS_SEARCH; search->len = search_len ? ((sizeof(*search) + search_padded) / 8) : 0; search->pad = 0; search->pad2 = 0; - search->lifetime = htonl(2 * MaxRtrAdvInterval);; memcpy(search->name, search_domain, search_len); memset(&search->name[search_len], 0, search_padded - search_len); @@ -437,36 +419,87 @@ static void send_router_advert(struct uloop_timeout *event) ++routes_cnt; } + // Calculate periodic transmit + int msecs = 0; + uint32_t maxival = iface->ra_maxinterval * 1000; + uint32_t minival; + + if (maxival < 4000 || maxival > MaxRtrAdvInterval * 1000) + maxival = MaxRtrAdvInterval * 1000; + + if (maxival > minvalid / 3) { + maxival = minvalid / 3; + + if (maxival < 4000) + maxival = 4000; + } + + minival = (maxival * 3) / 4; + if (adv.h.nd_ra_router_lifetime) + adv.h.nd_ra_router_lifetime = htons(maxvalid / 1000); + + search->lifetime = htonl(maxvalid / 1000); + + if (!dns.lifetime) + dns.lifetime = search->lifetime; - struct iovec iov[] = {{&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv}, + odhcpd_urandom(&msecs, sizeof(msecs)); + msecs = (labs(msecs) % (maxival - minival)) + minival; + + struct icmpv6_opt adv_interval = { + .type = ND_OPT_RTR_ADV_INTERVAL, + .len = 1, + .data = {0, 0, maxival >> 24, maxival >> 16, maxival >> 8, maxival} + }; + + struct iovec iov[RA_IOV_LEN] = { + {&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv}, {&routes, routes_cnt * sizeof(*routes)}, {&dns, (dns_cnt) ? sizeof(dns) : 0}, {dns_addr, dns_cnt * sizeof(*dns_addr)}, - {search, search->len * 8}}; - struct sockaddr_in6 all_nodes = {AF_INET6, 0, 0, ALL_IPV6_NODES, 0}; + {search, search->len * 8}, + {&adv_interval, adv_interval.len * 8}}; + struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_NODES, 0}; + + if (from && !IN6_IS_ADDR_UNSPECIFIED(from)) + dest.sin6_addr = *from; + odhcpd_send(router_event.uloop.fd, - &all_nodes, iov, ARRAY_SIZE(iov), iface); + &dest, iov, ARRAY_SIZE(iov), iface); + + return msecs; +} + + +static void trigger_router_advert(struct uloop_timeout *event) +{ + struct interface *iface = container_of(event, struct interface, timer_rs); + int msecs = send_router_advert(iface, NULL); // 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; - } + if (event->cb) + uloop_timeout_set(event, msecs); +} + + +// Event handler for incoming ICMPv6 packets +static void handle_icmpv6(void *addr, void *data, size_t len, + struct interface *iface, _unused void *dest) +{ + struct icmp6_hdr *hdr = data; + struct sockaddr_in6 *from = addr; + + if (!router_icmpv6_valid(addr, data, len)) + return; - int msecs; - odhcpd_urandom(&msecs, sizeof(msecs)); - msecs = (labs(msecs) % (maxinterval - mininterval)) + mininterval; - uloop_timeout_set(&iface->timer_rs, msecs); + if ((iface->ra == RELAYD_SERVER && !iface->master)) { // Server mode + if (hdr->icmp6_type == ND_ROUTER_SOLICIT) + send_router_advert(iface, &from->sin6_addr); + } else if (iface->ra == RELAYD_RELAY) { // Relay mode + if (hdr->icmp6_type == ND_ROUTER_ADVERT && iface->master) + forward_router_advertisement(data, len); + else if (hdr->icmp6_type == ND_ROUTER_SOLICIT && !iface->master) + forward_router_solicitation(odhcpd_get_master_interface()); } } @@ -519,7 +552,6 @@ static void forward_router_advertisement(uint8_t *data, size_t len) struct sockaddr_in6 all_nodes = {AF_INET6, 0, 0, ALL_IPV6_NODES, 0}; struct iovec iov = {data, len}; - struct odhcpd_ipaddr addr; struct interface *iface; list_for_each_entry(iface, &interfaces, head) { if (iface->ra != RELAYD_RELAY || iface->master) @@ -532,13 +564,14 @@ static void forward_router_advertisement(uint8_t *data, size_t len) // If we have to rewrite DNS entries if (iface->always_rewrite_dns && dns_ptr && dns_count > 0) { const struct in6_addr *rewrite = iface->dns; + struct in6_addr addr; size_t rewrite_cnt = iface->dns_cnt; if (rewrite_cnt == 0) { - if (odhcpd_get_interface_addresses(iface->ifindex, &addr, 1) < 1) + if (odhcpd_get_preferred_interface_address(iface->ifindex, &addr) < 1) continue; // Unable to comply - rewrite = &addr.addr; + rewrite = &addr; rewrite_cnt = 1; }