X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fadns.lua;h=d6beffbbedca121f9ac7234b5be83857e1c3845f;hb=409ea7826d085d86bce956ec741bc3df62feda02;hp=34ef5d770dae27d19ca867f555ef8165176e56b3;hpb=82aa9c749335a601ec308148ce95e3c680ad7705;p=prosody.git

diff --git a/net/adns.lua b/net/adns.lua
index 34ef5d77..d6beffbb 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -11,6 +11,7 @@ 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"
@@ -28,7 +29,7 @@ function lookup(handler, qname, qtype, qclass)
 				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)(dns.peek(qname, qtype, qclass));
 end
@@ -41,21 +42,33 @@ function cancel(handle, call_handler)
 	end
 end
 
-function new_async_socket(sock)
-	local newconn = {};
+function new_async_socket(sock, resolver)
+	local peername = "<unknown>";
 	local listener = {};
-	function listener.incoming(conn, data)
-		dns.feed(sock, data);
+	local handler = {};
+	function listener.onincoming(conn, data)
+		dns.feed(handler, 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[conn] == 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);
-	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.connect = function (_, ...) return sock:connect(...) end	
-	newconn.handler.send = function (_, data) _.write(data); return _.sendbuffer(); end	
-	return newconn.handler;
+	handler = server.wrapclient(sock, "dns", 53, listener);
+	if not handler then
+		log("warn", "handler is nil");
+	end
+	
+	handler.settimeout = function () end
+	handler.setsockname = function (_, ...) return sock:setsockname(...); end
+	handler.setpeername = function (_, ...) peername = (...); local ret = sock:setpeername(...); _:set_send(sock.send); return ret; end
+	handler.connect = function (_, ...) return sock:connect(...) end	
+	handler.send = function (_, data) _:write(data);  return _.sendbuffer and _.sendbuffer(); end	
+	return handler;
 end
 
 dns:socket_wrapper_set(new_async_socket);