aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-26 00:06:44 +0200
committerKim Alvefur <zash@zash.se>2015-04-26 00:06:44 +0200
commit3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000 (patch)
tree11f81ddc7bcc089676e965ba2b9171c2767911d5 /net
parent48652fb9d3b1eeb4dc44460abf3ba2060cf5bb91 (diff)
parent7dff400ed5e217b3316b9b311b41c826d10e67f1 (diff)
downloadprosody-3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000.tar.gz
prosody-3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
-rw-r--r--net/dns.lua11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 2cb677f6..2128fb1a 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -701,15 +701,20 @@ local function comp_mx(a, b) -- - - - - - - - - - - - - - - - - - - comp_mx
end
-function resolver:peek (qname, qtype, qclass) -- - - - - - - - - - - - peek
+function resolver:peek (qname, qtype, qclass, n) -- - - - - - - - - - - - peek
qname, qtype, qclass = standardize(qname, qtype, qclass);
local rrs = get(self.cache, qclass, qtype, qname);
- if not rrs then return nil; end
+ if not rrs then
+ if n then if n <= 0 then return end else n = 3 end
+ rrs = get(self.cache, qclass, "CNAME", qname);
+ if not (rrs and rrs[1]) then return end
+ return self:peek(rrs[1].cname, qtype, qclass, n - 1);
+ end
if prune(rrs, socket.gettime()) and qtype == '*' or not next(rrs) then
set(self.cache, qclass, qtype, qname, nil);
return nil;
end
- if self.unsorted[rrs] then table.sort (rrs, comp_mx); end
+ if self.unsorted[rrs] then table.sort (rrs, comp_mx); self.unsorted[rrs] = nil; end
return rrs;
end