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

Fix: write msg cache multiple times (#812)

Browse source 
Co-authored-by: john.xu <john.xu@bytedance.com>
This commit is contained in:
gVisor bot 2020-07-17 17:34:40 +08:00
parent 22f32c3789
commit 63e2c176f1
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dns/resolver.go
View file

@ -115,11 +115,16 @@ 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]
defer func() { ret, err, shared := r.group.Do(q.String(), func() (interface{}, error) {
if msg == nil { isIPReq := isIPRequest(q)
return if isIPReq {
return r.fallbackExchange(m)
} }
msg, err := r.batchExchange(r.main, m)
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)
@ -127,15 +132,7 @@ 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
ret, err, shared := r.group.Do(q.String(), func() (interface{}, error) {
isIPReq := isIPRequest(q)
if isIPReq {
return r.fallbackExchange(m)
}
return r.batchExchange(r.main, m)
}) })
if err == nil { if err == nil {