Software / code / prosody
Diff
net/dns.lua @ 6631:45222bfb206f
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 24 Apr 2015 14:14:01 +0200 |
| parent | 6509:7cb69eba3e95 |
| child | 6632:855085439f7f |
| child | 6645:4f934cf03bc9 |
line wrap: on
line diff
--- a/net/dns.lua Tue Mar 24 19:12:04 2015 +0000 +++ b/net/dns.lua Fri Apr 24 14:14:01 2015 +0200 @@ -694,15 +694,20 @@ 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
