X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fdns.lua;h=29d9cf36d227a52df80b9e4ae75a730e094b4e2c;hb=2fcf677c4dce862df770bb51eec44a6a9e5ab476;hp=b3cce1111ecb22007234b9fc8934dbac71ddc8d9;hpb=b3e0125cebfa70cd0a8462185558822f91ad3277;p=prosody.git

diff --git a/net/dns.lua b/net/dns.lua
index b3cce111..29d9cf36 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -29,7 +29,7 @@ local ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack
 
 local get, set = ztact.get, ztact.set;
 
-local dns_timeout = 15;
+local default_timeout = 15;
 
 -------------------------------------------------- module dns
 module('dns')
@@ -118,6 +118,7 @@ end
 local resolver = {};
 resolver.__index = resolver;
 
+resolver.timeout = default_timeout;
 
 local SRV_tostring;
 
@@ -437,6 +438,9 @@ function resolver:SRV(rr)    -- - - - - - - - - - - - - - - - - - - - - -  SRV
 	  rr.srv.target   = self:name();
 end
 
+function resolver:PTR(rr)
+	rr.ptr = self:name();
+end
 
 function SRV_tostring(rr)    -- - - - - - - - - - - - - - - - - - SRV_tostring
 	local s = rr.srv;
@@ -684,10 +688,10 @@ function resolver:query(qname, qtype, qclass)    -- - - - - - - - - - -- query
 	local conn = self:getsocket(o.server)
 	conn:send (o.packet)
 	
-	if timer then
+	if timer and self.timeout then
 		local num_servers = #self.server;
 		local i = 1;
-		timer.add_task(dns_timeout, function ()
+		timer.add_task(self.timeout, function ()
 			if get(self.wanted, qclass, qtype, qname, co) then
 				if i < num_servers then
 					i = i + 1;
@@ -695,10 +699,10 @@ function resolver:query(qname, qtype, qclass)    -- - - - - - - - - - -- query
 					o.server = self.best_server;
 					conn = self:getsocket(o.server);
 					conn:send(o.packet);
-					return dns_timeout;
+					return self.timeout;
 				else
 					-- Tried everything, failed
-					resolver:cancel(qclass, qtype, qname, co, true);
+					self:cancel(qclass, qtype, qname, co, true);
 				end
 			end
 		end)
@@ -744,6 +748,10 @@ function resolver:servfail(sock)
 	end
 end
 
+function resolver:settimeout(seconds)
+	self.timeout = seconds;
+end
+
 function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
 	--print('receive');  print(self.socket);
 	self.time = socket.gettime();
@@ -793,11 +801,11 @@ function resolver:receive(rset)    -- - - - - - - - - - - - - - - - -  receive
 end
 
 
-function resolver:feed(sock, packet)
+function resolver:feed(sock, packet, force)
 	--print('receive'); print(self.socket);
 	self.time = socket.gettime();
 
-	local response = self:decode(packet);
+	local response = self:decode(packet, force);
 	if response and self.active[response.header.id]
 		and self.active[response.header.id][response.question.raw] then
 		--print('received response');
@@ -988,6 +996,10 @@ function dns.cancel(...)  -- - - - - - - - - - - - - - - - - - - - - -  cancel
 	return _resolver:cancel(...);
 end
 
+function dns.settimeout(...)
+	return _resolver:settimeout(...);
+end
+
 function dns.socket_wrapper_set(...)    -- - - - - - - - -  socket_wrapper_set
 	return _resolver:socket_wrapper_set(...);
 end