X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=74d8a09d8fe44fde93f145133bfaac50f95600a2;hp=3fbf5901cc536b6a1cdefa51e41e4c2f0860c98c;hb=1ef3103b7a9ac37bd2967ae57c5f0bc6e697bb7f;hpb=01c1163b979cb3872aba9274ecbf0b38f822f950

diff --git a/src/router.c b/src/router.c
index 3fbf590..74d8a09 100644
--- a/src/router.c
+++ b/src/router.c
@@ -292,9 +292,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);
 
+		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);
@@ -315,7 +319,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 +433,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));