Revert "router: fix compile issue on 64 targets"
[project/odhcpd.git] / src / router.c
index 0b15dac..a09e107 100644 (file)
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdbool.h>
+#include <arpa/inet.h>
 #include <net/route.h>
 
 #include "router.h"
@@ -34,10 +35,12 @@ static void handle_icmpv6(void *addr, void *data, size_t len,
 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 struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6, NULL};
 
 static FILE *fp_route = NULL;
+#define RA_IOV_LEN 6
 
+#define TIME_LEFT(t1, now) ((t1) != UINT32_MAX ? (t1) - (now) : UINT32_MAX)
 
 int init_router(void)
 {
@@ -97,6 +100,9 @@ int setup_router_interface(struct interface *iface, bool enable)
        uloop_timeout_cancel(&iface->timer_rs);
        iface->timer_rs.cb = NULL;
 
+       if (iface->ifindex <= 0)
+               return -1;
+
        setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
                        &all_nodes, sizeof(all_nodes));
        setsockopt(router_event.uloop.fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
@@ -113,7 +119,7 @@ int setup_router_interface(struct interface *iface, bool enable)
                        forward_router_solicitation(iface);
                } else if (iface->ra == RELAYD_SERVER && !iface->master) {
                        iface->timer_rs.cb = trigger_router_advert;
-                       trigger_router_advert(&iface->timer_rs);
+                       uloop_timeout_set(&iface->timer_rs, 1000);
                }
 
                if (iface->ra == RELAYD_RELAY || (iface->ra == RELAYD_SERVER && !iface->master))
@@ -176,7 +182,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 "
@@ -205,25 +211,30 @@ static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len)
        return found_default;
 }
 
-
 // Router Advert server mode
 static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from)
 {
-       int mtu = odhcpd_get_interface_mtu(iface->ifname);
-       if (mtu < 0)
-               mtu = 1500;
+       time_t now = odhcpd_time();
+       int mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
+       int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
+
+       if (mtu < 1280)
+               mtu = 1280;
 
        struct {
                struct nd_router_advert h;
                struct icmpv6_opt lladdr;
                struct nd_opt_mtu mtu;
-               struct nd_opt_prefix_info prefix[RELAYD_MAX_PREFIXES];
+               struct nd_opt_prefix_info prefix[sizeof(iface->ia_addr) / sizeof(*iface->ia_addr)];
        } adv = {
                .h = {{.icmp6_type = ND_ROUTER_ADVERT, .icmp6_code = 0}, 0, 0},
                .lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
                .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;
 
@@ -237,39 +248,44 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        odhcpd_get_mac(iface, adv.lladdr.data);
 
        // If not currently shutting down
-       struct odhcpd_ipaddr addrs[RELAYD_MAX_PREFIXES];
+       struct odhcpd_ipaddr addrs[RELAYD_MAX_ADDRS];
        ssize_t ipcnt = 0;
-       uint64_t maxpreferred = 0;
+       int64_t minvalid = INT64_MAX;
 
        // If not shutdown
        if (iface->timer_rs.cb) {
-               ipcnt = odhcpd_get_interface_addresses(iface->ifindex,
-                               addrs, ARRAY_SIZE(addrs));
+               ipcnt = iface->ia_addr_len;
+               memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
 
                // Check default route
-               if (parse_routes(addrs, ipcnt) || iface->default_router > 1)
-                       adv.h.nd_ra_router_lifetime =
-                                       htons(3 * MaxRtrAdvInterval);
+               if (iface->default_router > 1)
+                       adv.h.nd_ra_router_lifetime = htons(iface->default_router);
+               else if (parse_routes(addrs, ipcnt))
+                       adv.h.nd_ra_router_lifetime = htons(1);
+
+               syslog(LOG_INFO, "Initial router lifetime %d, %d address(es) available",
+                               ntohs(adv.h.nd_ra_router_lifetime), ipcnt);
        }
 
        // Construct Prefix Information options
-       bool have_public = false;
        size_t cnt = 0;
 
-       struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref;
-       uint32_t dns_time = 0;
+       struct in6_addr dns_pref, *dns_addr = &dns_pref;
        size_t dns_cnt = 1;
 
+       odhcpd_get_linklocal_interface_address(iface->ifindex, &dns_pref);
+
        for (ssize_t i = 0; i < ipcnt; ++i) {
                struct odhcpd_ipaddr *addr = &addrs[i];
-               if (addr->prefix > 96 || addr->has_class)
-                       continue; // Address not suitable
 
-               if (addr->preferred > MaxPreferredTime)
-                       addr->preferred = MaxPreferredTime;
+               if (addr->prefix > 96 || addr->valid <= (uint32_t)now) {
+                       char namebuf[INET6_ADDRSTRLEN];
 
-               if (addr->valid > MaxValidTime)
-                       addr->valid = MaxValidTime;
+                       inet_ntop(AF_INET6, addr, namebuf, sizeof(namebuf));
+                       syslog(LOG_INFO, "Address %s (prefix %d, valid %u) not suitable",
+                                       namebuf, addr->prefix, addr->valid);
+                       continue;
+               }
 
                struct nd_opt_prefix_info *p = NULL;
                for (size_t i = 0; i < cnt; ++i) {
@@ -286,11 +302,19 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                        p = &adv.prefix[cnt++];
                }
 
-               if ((addr->addr.s6_addr[0] & 0xfe) != 0xfc && addr->preferred > 0) {
-                       have_public = true;
+               if (addr->preferred > (uint32_t)now &&
+                               minvalid > 1000LL * TIME_LEFT(addr->valid, now))
+                       minvalid = 1000LL * TIME_LEFT(addr->valid, now);
+
+               uint32_t this_lifetime = TIME_LEFT(addr->valid, now);
+               if (this_lifetime > UINT16_MAX)
+                       this_lifetime = UINT16_MAX;
+               if (((addr->addr.s6_addr[0] & 0xfe) != 0xfc || iface->default_router)
+                               && adv.h.nd_ra_router_lifetime
+                               && ntohs(adv.h.nd_ra_router_lifetime) < this_lifetime) {
+                       adv.h.nd_ra_router_lifetime = htons(this_lifetime);
 
-                       if (maxpreferred < 1000 * addr->preferred)
-                               maxpreferred = 1000 * addr->preferred;
+                       syslog(LOG_DEBUG, "Updating router lifetime to %d", this_lifetime);
                }
 
                odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
@@ -305,16 +329,14 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                        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);
-
-               if (addr->preferred > dns_time) {
-                       dns_time = addr->preferred;
-                       dns_pref = addr->addr;
-               }
+               p->nd_opt_pi_valid_time = htonl(TIME_LEFT(addr->valid, now));
+               if (addr->preferred > (uint32_t)now)
+                       p->nd_opt_pi_preferred_time = htonl(TIME_LEFT(addr->preferred, now));
+               else if (addr->valid - now < 7200)
+                       p->nd_opt_pi_valid_time = 0;
        }
 
-       if (!have_public && !iface->default_router && adv.h.nd_ra_router_lifetime) {
+       if (!iface->default_router && adv.h.nd_ra_router_lifetime == htons(1)) {
                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;
@@ -324,7 +346,6 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        if (iface->dns_cnt > 0) {
                dns_addr = iface->dns;
                dns_cnt = iface->dns_cnt;
-               dns_time = 2 * MaxRtrAdvInterval;
        }
 
        if (!dns_addr || IN6_IS_ADDR_UNSPECIFIED(dns_addr))
@@ -336,7 +357,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                uint8_t pad;
                uint8_t pad2;
                uint32_t lifetime;
-       } dns = {ND_OPT_RECURSIVE_DNS, (1 + (2 * dns_cnt)), 0, 0, htonl(dns_time)};
+       } dns = {ND_OPT_RECURSIVE_DNS, (1 + (2 * dns_cnt)), 0, 0, 0};
 
 
 
@@ -369,7 +390,6 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        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);
 
@@ -386,7 +406,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
        for (ssize_t i = 0; i < ipcnt; ++i) {
                struct odhcpd_ipaddr *addr = &addrs[i];
-               if (addr->dprefix > 64 || addr->dprefix == 0 ||
+               if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now ||
                                (addr->dprefix == 64 && addr->prefix == 64)) {
                        continue; // Address not suitable
                } else if (addr->dprefix > 32) {
@@ -404,7 +424,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                        routes[routes_cnt].flags |= ND_RA_PREF_LOW;
                else if (iface->route_preference > 0)
                        routes[routes_cnt].flags |= ND_RA_PREF_HIGH;
-               routes[routes_cnt].lifetime = htonl(addr->valid);
+               routes[routes_cnt].lifetime = htonl(TIME_LEFT(addr->valid, now));
                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] = 0;
@@ -415,20 +435,24 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
        // Calculate periodic transmit
        int msecs = 0;
-       uint32_t maxival = MaxRtrAdvInterval * 1000;
-       uint32_t minival = MinRtrAdvInterval * 1000;
+       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 (maxpreferred > 0 && maxival > maxpreferred / 2) {
-               maxival = maxpreferred / 2;
                if (maxival < 4000)
                        maxival = 4000;
-
-               if (maxival >= 9000)
-                       minival = maxival / 3;
-               else
-                       minival = (maxival * 3) / 4;
        }
 
+       minival = (maxival * 3) / 4;
+
+       search->lifetime = htonl(maxival / 100);
+       dns.lifetime = search->lifetime;
+
        odhcpd_urandom(&msecs, sizeof(msecs));
        msecs = (labs(msecs) % (maxival - minival)) + minival;
 
@@ -438,7 +462,8 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                .data = {0, 0, maxival >> 24, maxival >> 16, maxival >> 8, maxival}
        };
 
-       struct iovec iov[] = {{&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv},
+       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)},
@@ -537,7 +562,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)
@@ -550,13 +574,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_linklocal_interface_address(iface->ifindex, &addr))
                                        continue; // Unable to comply
 
-                               rewrite = &addr.addr;
+                               rewrite = &addr;
                                rewrite_cnt = 1;
                        }