Fix: DNS NCACHE TTL and OPT RRs (#2900)

* Fix: DNS NCACHE TTL and OPT RRs

1. DNS NCACHE was not correctly implemented.
2. OPT RRs must not be cached or forwarded.

Closes #2889.
This commit is contained in:
Jiahao Lu
2023-08-24 23:28:04 +08:00
committed by GitHub
parent 8a4c46ae77
commit 45c10a17a6
2 changed files with 28 additions and 6 deletions

View File

@@ -16,6 +16,7 @@ import (
C "github.com/Dreamacro/clash/constant"
D "github.com/miekg/dns"
"github.com/samber/lo"
"golang.org/x/sync/singleflight"
)
@@ -166,7 +167,10 @@ func (r *Resolver) exchangeWithoutCache(ctx context.Context, m *D.Msg) (msg *D.M
}
msg := result.(*D.Msg)
// OPT RRs MUST NOT be cached, forwarded, or stored in or loaded from master files.
msg.Extra = lo.Filter(msg.Extra, func(rr D.RR, index int) bool {
return rr.Header().Rrtype != D.TypeOPT
})
putMsgToCache(r.lruCache, q.String(), q, msg)
}()