ejabberdsql2prosody: Add support for rosterusers.ask == "B" (both pending in and...

[prosody.git] / net / adns.lua

diff --git a/net/adns.lua b/net/adns.lua
index fb68ea718fa710590f6d51fc46727a7e7f61ac05..34ef5d770dae27d19ca867f555ef8165176e56b3 100644 (file)
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -1,3 +1,11 @@
+-- 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";
 
@@ -8,17 +16,29 @@ 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));
                                end
-                       end)();
+                       end)(dns.peek(qname, qtype, qclass));
+end
+
+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)
@@ -34,7 +54,7 @@ function new_async_socket(sock)
        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) return _.write(data) end      
+       newconn.handler.send = function (_, data) _.write(data); return _.sendbuffer(); end     
        return newconn.handler;
 end