Correctly byteswap DNS lifetimes in RAs

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

diff --git a/src/router.c b/src/router.c
index 3fbf590..526f9c2 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -293,6 +293,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                        minvalid = 1000LL * TIME_LEFT(addr->valid, now);
 
                if (((addr->addr.s6_addr[0] & 0xfe) != 0xfc || iface->default_router)
+                               && adv.h.nd_ra_router_lifetime
                                && ntohs(adv.h.nd_ra_router_lifetime) < TIME_LEFT(addr->valid, now))
                        adv.h.nd_ra_router_lifetime = htons(TIME_LEFT(addr->valid, now));
 
@@ -315,7 +316,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
                        p->nd_opt_pi_valid_time = 0;
        }
 
-       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;
@@ -429,7 +430,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
        minival = (maxival * 3) / 4;
 
-       search->lifetime = maxival / 100;
+       search->lifetime = htonl(maxival / 100);
        dns.lifetime = search->lifetime;
 
        odhcpd_urandom(&msecs, sizeof(msecs));