--- a/net/adns.lua Tue Jul 09 00:04:30 2013 +0100
+++ b/net/adns.lua Wed Jul 10 07:47:54 2013 +0200
@@ -68,9 +68,9 @@
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
--- a/net/dns.lua Tue Jul 09 00:04:30 2013 +0100
+++ b/net/dns.lua Wed Jul 10 07:47:54 2013 +0200
@@ -629,10 +629,10 @@
else
sock, err = socket.udp();
end
+ if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end
if not sock then
return nil, err;
end
- if self.socket_wrapper then sock = self.socket_wrapper(sock, self); end
sock:settimeout(0);
-- todo: attempt to use a random port, fallback to 0
sock:setsockname('*', 0);