aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-12-03 01:10:08 +0000
committerMatthew Wild <mwild1@gmail.com>2009-12-03 01:10:08 +0000
commit85cf0d26611e9b21914e8403f9c107d91a4a656b (patch)
tree19c439228fa320ed5f8bc4e965d296ecbb89c7a7
parent38377c072580f6195c00e27d771bdf6ca1f03df6 (diff)
downloadprosody-85cf0d26611e9b21914e8403f9c107d91a4a656b.tar.gz
prosody-85cf0d26611e9b21914e8403f9c107d91a4a656b.zip
net.dns: Port some DNS fixes to the resolver:feed() function for net.adns to use
-rw-r--r--net/dns.lua13
1 files changed, 5 insertions, 8 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 2c008940..9863164d 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -768,21 +768,18 @@ function resolver:feed(sock, packet)
self.time = socket.gettime();
local response = self:decode(packet);
- if response then
+ if response and self.active[response.header.id]
+ and self.active[response.header.id][response.question.raw] then
--print('received response');
--self.print(response);
- for i,section in pairs({ 'answer', 'authority', 'additional' }) do
- for j,rr in pairs(response[section]) do
- self:remember(rr, response.question[1].type);
- end
+ for j,rr in pairs(response.answer) do
+ self:remember(rr, response.question[1].type);
end
-- retire the query
local queries = self.active[response.header.id];
- if queries[response.question.raw] then
- queries[response.question.raw] = nil;
- end
+ queries[response.question.raw] = nil;
if not next(queries) then self.active[response.header.id] = nil; end
if not next(self.active) then self:closeall(); end