# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1495423931 -7200
# Node ID 2c65f8be38aabe3307101d8bed3f61ce6adde671
# Parent  8d1fd6d34bda2d74872f402f66e35888e2e316b8
net.dns: Simplify expiry calculation (fixes #919)

diff -r 8d1fd6d34bda -r 2c65f8be38aa net/dns.lua
--- a/net/dns.lua	Mon Apr 17 21:40:06 2017 +0200
+++ b/net/dns.lua	Mon May 22 05:32:11 2017 +0200
@@ -137,9 +137,7 @@
 	time = time or socket.gettime();
 	for i,rr in ipairs(rrs) do
 		if rr.tod then
-			-- rr.tod = rr.tod - 50    -- accelerated decripitude
-			rr.ttl = math.floor(rr.tod - time);
-			if rr.ttl <= 0 then
+			if rr.tod < time then
 				rrs[rr[rr.type:lower()]] = nil;
 				table.remove(rrs, i);
 				return prune(rrs, time, soft); -- Re-iterate
@@ -515,11 +513,7 @@
 	rr.ttl      = 0x10000*self:word() + self:word();
 	rr.rdlength = self:word();
 
-	if rr.ttl <= 0 then
-		rr.tod = self.time + 30;
-	else
-		rr.tod = self.time + rr.ttl;
-	end
+	rr.tod = self.time + rr.ttl;
 
 	local remember = self.offset;
 	local rr_parser = self[dns.type[rr.type]];