net.xmppcomponent_listener: Move session creation from listener.onincoming to listene...

[prosody.git] / net / adns.lua

diff --git a/net/adns.lua b/net/adns.lua
index 005bc606a8d899001d1a27d5e965f648076e14a8..d0151c8c31a4721b3bddfff472d17a32092b4f04 100644 (file)
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -36,12 +36,9 @@ function lookup(handler, qname, qtype, qclass)
                        end)(dns.peek(qname, qtype, qclass));
 end
 
-function cancel(handle, call_handler)
+function cancel(handle, call_handler, reason)
        log("warn", "Cancelling DNS lookup for %s", tostring(handle[3]));
-       dns.cancel(handle);
-       if call_handler then
-               coroutine.resume(handle[4]);
-       end
+       dns.cancel(handle[1], handle[2], handle[3], handle[4], call_handler);
 end
 
 function new_async_socket(sock, resolver)
@@ -49,16 +46,20 @@ function new_async_socket(sock, resolver)
        local listener = {};
        local handler = {};
        function listener.onincoming(conn, data)
-               dns.feed(handler, data);
+               if data then
+                       dns.feed(handler, data);
+               end
        end
        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
+               if err then
+                       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
+                       resolver:servfail(conn); -- Let the magic commence
+               end
        end
        handler = server.wrapclient(sock, "dns", 53, listener);
        if not handler then
@@ -74,6 +75,6 @@ function new_async_socket(sock, resolver)
        return handler;
 end
 
-dns:socket_wrapper_set(new_async_socket);
+dns.socket_wrapper_set(new_async_socket);
 
 return _M;