From 01c1163b979cb3872aba9274ecbf0b38f822f950 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 7 Sep 2015 11:39:19 +0200 Subject: [PATCH] router: reduce dns lifetime to 10x maximum interval --- src/router.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/router.c b/src/router.c index 9c9b55a..3fbf590 100644 --- a/src/router.c +++ b/src/router.c @@ -247,7 +247,6 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add 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) { @@ -293,9 +292,6 @@ 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); - 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)); @@ -433,7 +429,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add minival = (maxival * 3) / 4; - search->lifetime = htonl(maxvalid / 1000); + search->lifetime = maxival / 100; dns.lifetime = search->lifetime; odhcpd_urandom(&msecs, sizeof(msecs)); -- 2.11.0