mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9 -> 0.10

Browse source
This commit is contained in:
Kim Alvefur 2014-11-09 20:30:04 +01:00
commit 486335f3db
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
net/dns.lua
View file

@ -624,7 +624,7 @@ function resolver:getsocket(servernum) -- - - - - - - - - - - - - getsocket
local sock = self.socket[servernum];
if sock then return sock; end
local err;
local ok, err;
local peer = self.server[servernum];
if peer:find(":") then
sock, err = socket.udp6();
@ -637,10 +637,14 @@ function resolver:getsocket(servernum) -- - - - - - - - - - - - - getsocket
end
sock:settimeout(0);
-- todo: attempt to use a random port, fallback to 0
sock:setsockname('*', 0);
sock:setpeername(peer, 53);
self.socket[servernum] = sock;
self.socketset[sock] = servernum;
-- set{sock,peer}name can fail, eg because of local routing table
-- if so, try the next server
ok, err = sock:setsockname('*', 0);
if not ok then return self:servfail(sock, err); end
ok, err = sock:setpeername(peer, 53);
if not ok then return self:servfail(sock, err); end
return sock;
end
@ -788,13 +792,13 @@ function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query
return true;
end
function resolver:servfail(sock)
function resolver:servfail(sock, err)
-- Resend all queries for this server
local num = self.socketset[sock]
-- Socket is dead now
self:voidsocket(sock);
sock = self:voidsocket(sock);
-- Find all requests to the down server, and retry on the next server
self.time = socket.gettime();
@ -811,8 +815,8 @@ function resolver:servfail(sock)
--print('timeout');
queries[question] = nil;
else
local _a = self:getsocket(o.server);
if _a then _a:send(o.packet); end
sock, err = self:getsocket(o.server);
if sock then sock:send(o.packet); end
end
end
end
@ -828,6 +832,7 @@ function resolver:servfail(sock)
self.best_server = 1;
end
end
return sock, err;
end
function resolver:settimeout(seconds)