Merge 0.10->trunk

[prosody.git] / net / adns.lua

diff --git a/net/adns.lua b/net/adns.lua
index 15814fe7a4c5d8240bd1373fbe493f336d5a5436..87f2876b1f84b5102425b1d896e5718dbe1ce117 100644 (file)
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -76,12 +76,11 @@ function new_async_socket(sock, resolver)
 
        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.setpeername = function (_, ...) peername = (...); local ret, err = sock:setpeername(...); _:set_send(dummy_send); return ret, err; end
        handler.connect = function (_, ...) return sock:connect(...) end
        --handler.send = function (_, data) _:write(data);  return _.sendbuffer and _.sendbuffer(); end
        handler.send = function (_, data)
-               local getpeername = sock.getpeername;
-               log("debug", "Sending DNS query to %s", (getpeername and getpeername(sock)) or "<unconnected>");
+               log("debug", "Sending DNS query to %s", peername);
                return sock:send(data);
        end
        return handler;