util.xmppstream: When error is 'no-stream', pass the received tagname to the error...

[prosody.git] / net / adns.lua

diff --git a/net/adns.lua b/net/adns.lua
index 7fadbe3f7e68d2a75c8f40e7a9aede67457a958f..2a3fa8adbad9be872220c0f205eac6ab6d7feed2 100644 (file)
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -26,10 +26,17 @@ function lookup(handler, qname, qtype, qclass)
                                        return;
                                end
                                log("debug", "Records for %s not in cache, sending query (%s)...", qname, tostring(coroutine.running()));
-                               dns.query(qname, qtype, qclass);
-                               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));
+                               local ok, err = dns.query(qname, qtype, qclass);
+                               if ok then
+                                       coroutine.yield({ qclass or "IN", qtype or "A", qname, coroutine.running()}); -- Wait for reply
+                                       log("debug", "Reply for %s (%s)", qname, tostring(coroutine.running()));
+                               end
+                               if ok then
+                                       ok, err = pcall(handler, dns.peek(qname, qtype, qclass));
+                               else
+                                       log("error", "Error sending DNS query: %s", err);
+                                       ok, err = pcall(handler, nil, err);
+                               end
                                if not ok then
                                        log("error", "Error in DNS response handler: %s", tostring(err));
                                end
@@ -38,13 +45,14 @@ end
 
 function cancel(handle, call_handler, reason)
        log("warn", "Cancelling DNS lookup for %s", tostring(handle[3]));
-       dns.cancel(handle, call_handler);
+       dns.cancel(handle[1], handle[2], handle[3], handle[4], call_handler);
 end
 
 function new_async_socket(sock, resolver)
        local peername = "<unknown>";
        local listener = {};
        local handler = {};
+       local err;
        function listener.onincoming(conn, data)
                if data then
                        dns.feed(handler, data);
@@ -61,9 +69,9 @@ function new_async_socket(sock, resolver)
                        resolver:servfail(conn); -- Let the magic commence
                end
        end
-       handler = server.wrapclient(sock, "dns", 53, listener);
+       handler, err = server.wrapclient(sock, "dns", 53, listener);
        if not handler then
-               log("warn", "handler is nil");
+               return nil, err;
        end
        
        handler.settimeout = function () end
@@ -71,7 +79,11 @@ function new_async_socket(sock, resolver)
        handler.setpeername = function (_, ...) peername = (...); local ret = sock:setpeername(...); _:set_send(dummy_send); return ret; end
        handler.connect = function (_, ...) return sock:connect(...) end
        --handler.send = function (_, data) _:write(data);  return _.sendbuffer and _.sendbuffer(); end
-       handler.send = function (_, data) return sock:send(data); end
+       handler.send = function (_, data)
+               local getpeername = sock.getpeername;
+               log("debug", "Sending DNS query to %s", (getpeername and getpeername(sock)) or "<unconnected>");
+               return sock:send(data);
+       end
        return handler;
 end