aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-24 14:14:01 +0200
committerKim Alvefur <zash@zash.se>2015-04-24 14:14:01 +0200
commit7dff400ed5e217b3316b9b311b41c826d10e67f1 (patch)
treeaaeae7aab9070d0eb7402fdd5eb20d597c842737 /net
parent51bef3673c57c5a2e323a7eb1424c85498905f53 (diff)
downloadprosody-7dff400ed5e217b3316b9b311b41c826d10e67f1.tar.gz
prosody-7dff400ed5e217b3316b9b311b41c826d10e67f1.zip
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
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 13417cee..28cb4419 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -694,15 +694,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