Merge Tobias->trunk

[prosody.git] / net / adns.lua

diff --git a/net/adns.lua b/net/adns.lua
index c9cb9476a17eea1af38b4b3f084bfee4ac23398a..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.
@@ -14,6 +14,8 @@ local log = require "util.logger".init("adns");
 local t_insert, t_remove = table.insert, table.remove;
 local coroutine, tostring, pcall = coroutine, tostring, pcall;
 
+local function dummy_send(sock, data, i, j) return (j-i)+1; end
+
 module "adns"
 
 function lookup(handler, qname, qtype, qclass)
@@ -34,44 +36,45 @@ 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)
-       local newconn, peername = {}, "<unknown>";
+       local peername = "<unknown>";
        local listener = {};
+       local handler = {};
        function listener.onincoming(conn, data)
-               dns.feed(sock, 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[newconn.handler] == 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
-       newconn.handler, newconn._socket = server.wrapclient(sock, "dns", 53, listener);
-       if not newconn.handler then
+       handler = server.wrapclient(sock, "dns", 53, listener);
+       if not handler then
                log("warn", "handler is nil");
        end
-       if not newconn._socket then
-               log("warn", "socket is nil");
-       end
-       newconn.handler.settimeout = function () end
-       newconn.handler.setsockname = function (_, ...) return sock:setsockname(...); end
-       newconn.handler.setpeername = function (_, ...) peername = (...); 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.settimeout = function () end
+       handler.setsockname = function (_, ...) return sock:setsockname(...); end
+       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
+       return handler;
 end
 
-dns:socket_wrapper_set(new_async_socket);
+dns.socket_wrapper_set(new_async_socket);
 
 return _M;