mod_dialback: Keep the same dialback secret across module reloads

[prosody.git] / net / adns.lua

diff --git a/net/adns.lua b/net/adns.lua
index 2f7b680458bf36e82de0d50ea3ba8a24f945d504..15814fe7a4c5d8240bd1373fbe493f336d5a5436 100644 (file)
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- 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.
 --
@@ -52,6 +52,7 @@ 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);
@@ -64,21 +65,25 @@ function new_async_socket(sock, resolver)
                        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
                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
        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
+       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