X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Frouter.c;h=e8a9aa97760c0a048c08958792bb1a6d0c9b8c6d;hp=dd3f09cebba6d72c64935c90188b394def3bfc34;hb=1b630f8bc59978884c9caccebca3b6d8e9b045a1;hpb=3495f179bd901d6d232e0dbf35444ebe483fdfd9

diff --git a/src/router.c b/src/router.c
index dd3f09c..e8a9aa9 100644
--- a/src/router.c
+++ b/src/router.c
@@ -233,7 +233,8 @@ static int calc_adv_interval(struct interface *iface, uint32_t minvalid,
 		minival = (*maxival >= 9 ? *maxival/3 : *maxival);
 
 	odhcpd_urandom(&msecs, sizeof(msecs));
-	msecs = (labs(msecs) % ((*maxival - minival)*1000)) + minival*1000;
+	msecs = (labs(msecs) % ((*maxival != minival) ? (*maxival - minival)*1000 : 500)) +
+			minival*1000;
 
 	return msecs;
 }
@@ -357,11 +358,8 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 		}
 
 		valid = TIME_LEFT(addr->valid, now);
-		if (iface->ra_useleasetime) {
-			if (valid > iface->dhcpv4_leasetime)
-				valid = iface->dhcpv4_leasetime;
-		} else if (!preferred && valid < 7200)
-			valid = 0;
+		if (iface->ra_useleasetime && valid > iface->dhcpv4_leasetime)
+			valid = iface->dhcpv4_leasetime;
 
 		if (minvalid > valid)
 			minvalid = valid;