history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: upstream dns ExchangeContext workaround (#468)

Browse Source
This commit is contained in:
Comzyh
2020-01-10 14:13:44 +08:00
committed by Dreamacro
parent 2c0cc374d3
commit e68c0d088b
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dns/resolver.go
View File

@ -180,7 +180,7 @@ func (r *Resolver) IsFakeIP(ip net.IP) bool {
}
func (r *Resolver) batchExchange(clients []resolver, m *D.Msg) (msg *D.Msg, err error) {
fast, ctx := picker.WithTimeout(context.Background(), time.Second * 5)
fast, ctx := picker.WithTimeout(context.Background(), time.Second*5)
for _, client := range clients {
r := client
fast.Go(func() (interface{}, error) {
@ -192,7 +192,7 @@ func (r *Resolver) batchExchange(clients []resolver, m *D.Msg) (msg *D.Msg, err
})
}
elm := fast.Wait()
elm := fast.WaitWithoutCancel()
if elm == nil {
return nil, errors.New("All DNS requests failed")
}