aboutsummaryrefslogtreecommitdiffstats
path: root/net/adns.lua
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2009-11-27 00:19:56 +0100
committerTobias Markmann <tm@ayena.de>2009-11-27 00:19:56 +0100
commit7d3a6dc36dcebba2a974054017791baba80b4ce7 (patch)
treef85e87b501b70b89f3c1fa7076c95db00ba1157a /net/adns.lua
parentc65488fc2befa056ce844e59fa3472c0a297bd7e (diff)
parent546954e85cee23594c84866db3c56842886ad541 (diff)
downloadprosody-7d3a6dc36dcebba2a974054017791baba80b4ce7.tar.gz
prosody-7d3a6dc36dcebba2a974054017791baba80b4ce7.zip
Merged with tip.
Diffstat (limited to 'net/adns.lua')
-rw-r--r--net/adns.lua27
1 files changed, 13 insertions, 14 deletions
diff --git a/net/adns.lua b/net/adns.lua
index c9cb9476..d6beffbb 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -43,33 +43,32 @@ function cancel(handle, 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);
+ dns.feed(handler, data);
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
+ 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
- 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(sock.send); return ret; end
+ handler.connect = function (_, ...) return sock:connect(...) end
+ handler.send = function (_, data) _:write(data); return _.sendbuffer and _.sendbuffer(); end
+ return handler;
end
dns:socket_wrapper_set(new_async_socket);