Merge Tobias->trunk

[prosody.git] / net / adns.lua

diff --git a/net/adns.lua b/net/adns.lua
index 88d4b4b39c4c1e2b71e0b9c36424f2b998ad1700..d0151c8c31a4721b3bddfff472d17a32092b4f04 100644 (file)
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -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)