X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fadns.lua;h=c9cb9476a17eea1af38b4b3f084bfee4ac23398a;hb=4e9ad86f42f78e32d5a983b62277a0552c853a9c;hp=fb68ea718fa710590f6d51fc46727a7e7f61ac05;hpb=9ac5f3a98d27d916a2d42daf62f914ad1dc5fe29;p=prosody.git

diff --git a/net/adns.lua b/net/adns.lua
index fb68ea71..c9cb9476 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -1,40 +1,74 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local server = require "net.server";
 local dns = require "net.dns";
 
 local log = require "util.logger".init("adns");
 
+local t_insert, t_remove = table.insert, table.remove;
 local coroutine, tostring, pcall = coroutine, tostring, pcall;
 
 module "adns"
 
 function lookup(handler, qname, qtype, qclass)
-	return dns.peek(qname, qtype, qclass) or
-		coroutine.wrap(function ()
-				log("debug", "Records for "..qname.." not in cache, sending query (%s)...", tostring(coroutine.running()));
+	return coroutine.wrap(function (peek)
+				if peek then
+					log("debug", "Records for %s already cached, using those...", qname);
+					handler(peek);
+					return;
+				end
+				log("debug", "Records for %s not in cache, sending query (%s)...", qname, tostring(coroutine.running()));
 				dns.query(qname, qtype, qclass);
-				coroutine.yield(nil); -- Wait for reply
-				log("debug", "Reply for "..qname.." (%s)", tostring(coroutine.running()));
+				coroutine.yield({ qclass or "IN", qtype or "A", qname, coroutine.running()}); -- Wait for reply
+				log("debug", "Reply for %s (%s)", qname, tostring(coroutine.running()));
 				local ok, err = pcall(handler, dns.peek(qname, qtype, qclass));
 				if not ok then
-					log("debug", "Error in DNS response handler: %s", tostring(err));
+					log("error", "Error in DNS response handler: %s", tostring(err));
 				end
-			end)();
+			end)(dns.peek(qname, qtype, qclass));
 end
 
-function new_async_socket(sock)
-	local newconn = {};
+function cancel(handle, call_handler)
+	log("warn", "Cancelling DNS lookup for %s", tostring(handle[3]));
+	dns.cancel(handle);
+	if call_handler then
+		coroutine.resume(handle[4]);
+	end
+end
+
+function new_async_socket(sock, resolver)
+	local newconn, peername = {}, "<unknown>";
 	local listener = {};
-	function listener.incoming(conn, data)
+	function listener.onincoming(conn, data)
 		dns.feed(sock, data);
 	end
-	function listener.disconnect()
+	function listener.ondisconnect(conn, err)
+		log("warn", "DNS socket for %s disconnected: %s", peername, err);
+		local servers = resolver.server;
+		if resolver.socketset[newconn.handler] == resolver.best_server and resolver.best_server == #servers then
+			log("error", "Exhausted all %d configured DNS servers, next lookup will try %s again", #servers, servers[1]);
+		end
+		
+		resolver:servfail(conn); -- Let the magic commence
 	end
 	newconn.handler, newconn._socket = server.wrapclient(sock, "dns", 53, listener);
+	if not newconn.handler then
+		log("warn", "handler is nil");
+	end
+	if not newconn._socket then
+		log("warn", "socket is nil");
+	end
 	newconn.handler.settimeout = function () end
 	newconn.handler.setsockname = function (_, ...) return sock:setsockname(...); end
-	newconn.handler.setpeername = function (_, ...) local ret = sock:setpeername(...); _.setsend(sock.send); return ret; end
+	newconn.handler.setpeername = function (_, ...) peername = (...); local ret = sock:setpeername(...); _.setsend(sock.send); return ret; end
 	newconn.handler.connect = function (_, ...) return sock:connect(...) end	
-	newconn.handler.send = function (_, data) return _.write(data) end	
+	newconn.handler.send = function (_, data) _.write(_, data); return _.sendbuffer(); end	
 	return newconn.handler;
 end