aboutsummaryrefslogtreecommitdiffstats
path: root/net/adns.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-09 20:32:33 +0100
committerKim Alvefur <zash@zash.se>2014-11-09 20:32:33 +0100
commit639527b16590d9032d4340c5e6570909c6cdc776 (patch)
tree00a4652d294babdf3be6f9add9a811a0e180a5d8 /net/adns.lua
parentcebfb0bf3e29df5aac96cb0d41adb8e356921dc8 (diff)
parent61b8eb49edf8e9a2d1ae2d55a898fc6e69a6f59e (diff)
downloadprosody-639527b16590d9032d4340c5e6570909c6cdc776.tar.gz
prosody-639527b16590d9032d4340c5e6570909c6cdc776.zip
Merge 0.10->trunk
Diffstat (limited to 'net/adns.lua')
-rw-r--r--net/adns.lua5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/adns.lua b/net/adns.lua
index 15814fe7..87f2876b 100644
--- 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;