incl addtl rrs when computing cache ttl (#1549)

This commit is contained in:
Chris O'Haver 2018-02-21 16:02:49 -05:00 committed by Miek Gieben
parent 96aff9376a
commit aa2302e3f4

View file

@ -96,12 +96,16 @@ func minMsgTTL(m *dns.Msg, mt response.Type) time.Duration {
} }
// No data to examine, return a short ttl as a fail safe. // No data to examine, return a short ttl as a fail safe.
if len(m.Answer)+len(m.Ns) == 0 { if len(m.Answer)+len(m.Ns)+len(m.Extra) == 0 {
return failSafeTTL return failSafeTTL
} }
minTTL := maxTTL minTTL := maxTTL
for _, r := range append(m.Answer, m.Ns...) { for _, r := range append(append(m.Answer, m.Ns...), m.Extra...) {
if r.Header().Rrtype == dns.TypeOPT {
// OPT records use TTL field for extended rcode and flags
continue
}
switch mt { switch mt {
case response.NameError, response.NoData: case response.NameError, response.NoData:
if r.Header().Rrtype == dns.TypeSOA { if r.Header().Rrtype == dns.TypeSOA {