projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net.server_select: Made another global local.
[prosody.git]
/
net
/
dns.lua
diff --git
a/net/dns.lua
b/net/dns.lua
index 714d6618b4158d9d2093f26b6d1853e7bbd39580..c5f219a8f0a5b07c7e9831ae07a0018331afd0e7 100644
(file)
--- a/
net/dns.lua
+++ b/
net/dns.lua
@@
-438,6
+438,9
@@
function resolver:SRV(rr) -- - - - - - - - - - - - - - - - - - - - - - SRV
rr.srv.target = self:name();
end
rr.srv.target = self:name();
end
+function resolver:PTR(rr)
+ rr.ptr = self:name();
+end
function SRV_tostring(rr) -- - - - - - - - - - - - - - - - - - SRV_tostring
local s = rr.srv;
function SRV_tostring(rr) -- - - - - - - - - - - - - - - - - - SRV_tostring
local s = rr.srv;
@@
-528,7
+531,7
@@
end
function resolver:adddefaultnameservers() -- - - - - adddefaultnameservers
if is_windows then
function resolver:adddefaultnameservers() -- - - - - adddefaultnameservers
if is_windows then
- if windows then
+ if windows
and windows.get_nameservers
then
for _, server in ipairs(windows.get_nameservers()) do
self:addnameserver(server);
end
for _, server in ipairs(windows.get_nameservers()) do
self:addnameserver(server);
end
@@
-671,11
+674,11
@@
function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query
retry = socket.gettime() + self.delays[1]
};
retry = socket.gettime() + self.delays[1]
};
- -- remember the query
+
-- remember the query
self.active[id] = self.active[id] or {};
self.active[id][question] = o;
self.active[id] = self.active[id] or {};
self.active[id][question] = o;
- -- remember which coroutine wants the answer
+
-- remember which coroutine wants the answer
local co = coroutine.running();
if co then
set(self.wanted, qclass, qtype, qname, co, true);
local co = coroutine.running();
if co then
set(self.wanted, qclass, qtype, qname, co, true);
@@
-699,7
+702,7
@@
function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query
return self.timeout;
else
-- Tried everything, failed
return self.timeout;
else
-- Tried everything, failed
-
resolver
:cancel(qclass, qtype, qname, co, true);
+
self
:cancel(qclass, qtype, qname, co, true);
end
end
end)
end
end
end)
@@
-735,7
+738,7
@@
function resolver:servfail(sock)
end
end
end
end
end
end
-
+
if num == self.best_server then
self.best_server = self.best_server + 1;
if self.best_server > #self.server then
if num == self.best_server then
self.best_server = self.best_server + 1;
if self.best_server > #self.server then
@@
-798,11
+801,11
@@
function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive
end
end
-function resolver:feed(sock, packet)
+function resolver:feed(sock, packet
, force
)
--print('receive'); print(self.socket);
self.time = socket.gettime();
--print('receive'); print(self.socket);
self.time = socket.gettime();
- local response = self:decode(packet);
+ local response = self:decode(packet
, force
);
if response and self.active[response.header.id]
and self.active[response.header.id][response.question.raw] then
--print('received response');
if response and self.active[response.header.id]
and self.active[response.header.id][response.question.raw] then
--print('received response');
@@
-884,12
+887,12
@@
end
function resolver:lookup(qname, qtype, qclass) -- - - - - - - - - - lookup
self:query (qname, qtype, qclass)
while self:pulse() do
function resolver:lookup(qname, qtype, qclass) -- - - - - - - - - - lookup
self:query (qname, qtype, qclass)
while self:pulse() do
- local recvt = {}
- for i, s in ipairs(self.socket) do
- recvt[i] = s
- end
- socket.select(recvt, nil, 4)
-
end
+
local recvt = {}
+
for i, s in ipairs(self.socket) do
+
recvt[i] = s
+
end
+
socket.select(recvt, nil, 4)
+ end
--print(self.cache);
return self:peek(qname, qtype, qclass);
end
--print(self.cache);
return self:peek(qname, qtype, qclass);
end