aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-07-25 13:01:57 +0100
committerMatthew Wild <mwild1@gmail.com>2014-07-25 13:01:57 +0100
commit999a5a0cb3e13f5922d5c64418162ff463f1abd7 (patch)
tree3f8f8b54a2965d1a317b87e2a2b0205d8c4e11e7
parent2957bd81cbcab588ff96fa755ee164d85859ab7d (diff)
parentc3ee155f3be5a463ecbca824a829b139da51756d (diff)
downloadprosody-999a5a0cb3e13f5922d5c64418162ff463f1abd7.tar.gz
prosody-999a5a0cb3e13f5922d5c64418162ff463f1abd7.zip
Merge 0.9->0.10
-rw-r--r--net/dns.lua15
-rw-r--r--plugins/mod_admin_telnet.lua4
2 files changed, 8 insertions, 11 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 088067ae..42bbdb01 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -752,7 +752,6 @@ function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query
-- remember which coroutine wants the answer
if co then
set(self.wanted, qclass, qtype, qname, co, true);
- --set(self.yielded, co, qclass, qtype, qname, true);
end
local conn, err = self:getsocket(o.server)
@@ -777,7 +776,7 @@ function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query
end
end
-- Tried everything, failed
- self:cancel(qclass, qtype, qname, co, true);
+ self:cancel(qclass, qtype, qname);
end
end)
end
@@ -865,7 +864,6 @@ function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive
local cos = get(self.wanted, q.class, q.type, q.name);
if cos then
for co in pairs(cos) do
- set(self.yielded, co, q.class, q.type, q.name, nil);
if coroutine.status(co) == "suspended" then coroutine.resume(co); end
end
set(self.wanted, q.class, q.type, q.name, nil);
@@ -906,7 +904,6 @@ function resolver:feed(sock, packet, force)
local cos = get(self.wanted, q.class, q.type, q.name);
if cos then
for co in pairs(cos) do
- set(self.yielded, co, q.class, q.type, q.name, nil);
if coroutine.status(co) == "suspended" then coroutine.resume(co); end
end
set(self.wanted, q.class, q.type, q.name, nil);
@@ -917,13 +914,13 @@ function resolver:feed(sock, packet, force)
return response;
end
-function resolver:cancel(qclass, qtype, qname, co, call_handler)
+function resolver:cancel(qclass, qtype, qname)
local cos = get(self.wanted, qclass, qtype, qname);
if cos then
- if call_handler then
- coroutine.resume(co);
+ for co in pairs(cos) do
+ if coroutine.status(co) == "suspended" then coroutine.resume(co); end
end
- cos[co] = nil;
+ set(self.wanted, qclass, qtype, qname, nil);
end
end
@@ -1044,7 +1041,7 @@ end
function dns.resolver () -- - - - - - - - - - - - - - - - - - - - - resolver
-- this function seems to be redundant with resolver.new ()
- local r = { active = {}, cache = {}, unsorted = {}, wanted = {}, yielded = {}, best_server = 1 };
+ local r = { active = {}, cache = {}, unsorted = {}, wanted = {}, best_server = 1 };
setmetatable (r, resolver);
setmetatable (r.cache, cache_metatable);
setmetatable (r.unsorted, { __mode = 'kv' });
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 66560d44..5388a0e6 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1073,12 +1073,12 @@ function def_env.dns:lookup(name, typ, class)
end
function def_env.dns:addnameserver(...)
- dns.addnameserver(...)
+ dns._resolver:addnameserver(...)
return true
end
function def_env.dns:setnameserver(...)
- dns.setnameserver(...)
+ dns._resolver:setnameserver(...)
return true
end