xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: dns should put msg to cache while exchangeWithoutCache (#820)

Browse source
This commit is contained in:
Kr328 2020-07-20 21:16:36 +08:00 committed by GitHub
parent ae1e1dc9f6
commit 20eff200b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dns/resolver.go
View file

@ -115,16 +115,14 @@ func (r *Resolver) Exchange(m *D.Msg) (msg *D.Msg, err error) {
func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) { func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
q := m.Question[0] q := m.Question[0]
ret, err, shared := r.group.Do(q.String(), func() (interface{}, error) { ret, err, shared := r.group.Do(q.String(), func() (result interface{}, err error) {
isIPReq := isIPRequest(q) defer func() {
if isIPReq { if err != nil {
return r.fallbackExchange(m) return
} }
msg, err := r.batchExchange(r.main, m) msg := result.(*D.Msg)
if err != nil {
return nil, err
}
putMsgToCache(r.lruCache, q.String(), msg) putMsgToCache(r.lruCache, q.String(), msg)
if r.mapping || r.fakeip { if r.mapping || r.fakeip {
ips := r.msgToIP(msg) ips := r.msgToIP(msg)
@ -132,7 +130,14 @@ func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
putMsgToCache(r.lruCache, ip.String(), msg) putMsgToCache(r.lruCache, ip.String(), msg)
} }
} }
return msg, nil }()
isIPReq := isIPRequest(q)
if isIPReq {
return r.fallbackExchange(m)
}
return r.batchExchange(r.main, m)
}) })
if err == nil { if err == nil {