Revert "Respect interface "ignore" settings as documented."

[project/odhcpd.git] / src / router.c

diff --git a/src/router.c b/src/router.c
index 1ae8d1a..f964a82 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -34,7 +34,7 @@ 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
@@ -99,6 +99,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,
@@ -244,30 +247,30 @@ 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 = NULL;
+       struct odhcpd_ipaddr addrs[8];
        ssize_t ipcnt = 0;
        int64_t minvalid = INT64_MAX;
-       int64_t maxvalid = 0;
 
        // If not shutdown
        if (iface->timer_rs.cb) {
-               addrs = iface->ia_addr;
                ipcnt = iface->ia_addr_len;
+               memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
 
                // Check default route
-               if (parse_routes(addrs, ipcnt))
-                       adv.h.nd_ra_router_lifetime = htons(1);
                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);
        }
 
        // Construct Prefix Information options
        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->valid <= (uint32_t)now)
@@ -292,12 +295,13 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                                minvalid > 1000LL * TIME_LEFT(addr->valid, now))
                        minvalid = 1000LL * TIME_LEFT(addr->valid, now);
 
-               if (maxvalid < 1000LL * TIME_LEFT(addr->valid, now))
-                       maxvalid = 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)
-                               && ntohs(adv.h.nd_ra_router_lifetime) < TIME_LEFT(addr->valid, now))
-                       adv.h.nd_ra_router_lifetime = htons(TIME_LEFT(addr->valid, now));
+                               && adv.h.nd_ra_router_lifetime
+                               && ntohs(adv.h.nd_ra_router_lifetime) < this_lifetime)
+                       adv.h.nd_ra_router_lifetime = htons(this_lifetime);
 
                odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
                                (iface->ra_advrouter) ? 128 : addr->prefix);
@@ -316,15 +320,9 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                        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 (TIME_LEFT(addr->preferred, now) > dns_time) {
-                       dns_time = TIME_LEFT(addr->preferred, now);
-                       dns_pref = addr->addr;
-               }
        }
 
-       if (!iface->default_router && ntohs(adv.h.nd_ra_router_lifetime) == 1) {
+       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;
@@ -334,7 +332,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 = 0;
        }
 
        if (!dns_addr || IN6_IS_ADDR_UNSPECIFIED(dns_addr))
@@ -346,7 +343,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};
 
 
 
@@ -439,10 +436,8 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
        minival = (maxival * 3) / 4;
 
-       search->lifetime = htonl(maxvalid / 1000);
-
-       if (!dns.lifetime)
-               dns.lifetime = search->lifetime;
+       search->lifetime = htonl(maxival / 100);
+       dns.lifetime = search->lifetime;
 
        odhcpd_urandom(&msecs, sizeof(msecs));
        msecs = (labs(msecs) % (maxival - minival)) + minival;
@@ -569,7 +564,7 @@ static void forward_router_advertisement(uint8_t *data, size_t len)
                        size_t rewrite_cnt = iface->dns_cnt;
 
                        if (rewrite_cnt == 0) {
-                               if (odhcpd_get_preferred_interface_address(iface->ifindex, &addr) < 1)
+                               if (odhcpd_get_linklocal_interface_address(iface->ifindex, &addr))
                                        continue; // Unable to comply
 
                                rewrite = &addr;