cy/goproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net.LookupIP may cause deadlock in windows

Browse Source 
https://github.com/golang/go/issues/24178
This commit is contained in:
boboan
2018-07-11 17:45:35 +08:00
parent bb933cfb6e
commit dd8d7dd0d4
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/http/http.go
View File

@ -492,7 +492,7 @@ func (s *HTTP) IsDeadLoop(inLocalAddr string, host string) bool {
if *s.cfg.DNSAddress != "" { if *s.cfg.DNSAddress != "" {
outIPs = []net.IP{net.ParseIP(s.Resolve(outDomain))} outIPs = []net.IP{net.ParseIP(s.Resolve(outDomain))}
} else { } else {
outIPs, err = net.LookupIP(outDomain) outIPs, err = utils.MyLookupIP(outDomain)
} }
if err == nil { if err == nil {
for _, ip := range outIPs { for _, ip := range outIPs {

2
services/socks/socks.go
View File

@ -598,7 +598,7 @@ func (s *Socks) IsDeadLoop(inLocalAddr string, host string) bool {
if *s.cfg.DNSAddress != "" { if *s.cfg.DNSAddress != "" {
outIPs = []net.IP{net.ParseIP(s.Resolve(outDomain))} outIPs = []net.IP{net.ParseIP(s.Resolve(outDomain))}
} else { } else {
outIPs, err = net.LookupIP(outDomain) outIPs, err = utils.MyLookupIP(outDomain)
} }
if err == nil { if err == nil {
for _, ip := range outIPs { for _, ip := range outIPs {

29
utils/functions.go
View File

@ -29,6 +29,8 @@ import (
"github.com/snail007/goproxy/utils/id" "github.com/snail007/goproxy/utils/id"
kcp "github.com/xtaci/kcp-go" kcp "github.com/xtaci/kcp-go"
"context"
) )
func IoBind(dst io.ReadWriteCloser, src io.ReadWriteCloser, fn func(err interface{}), log *logger.Logger) { func IoBind(dst io.ReadWriteCloser, src io.ReadWriteCloser, fn func(err interface{}), log *logger.Logger) {
@ -497,7 +499,7 @@ func IsIternalIP(domainOrIP string, always bool) bool {
} }
if isDomain { if isDomain {
outIPs, err = net.LookupIP(domainOrIP) outIPs, err = MyLookupIP(domainOrIP)
} else { } else {
outIPs = []net.IP{net.ParseIP(domainOrIP)} outIPs = []net.IP{net.ParseIP(domainOrIP)}
} }
@ -632,3 +634,28 @@ func InsertProxyHeaders(head []byte, headers string) []byte {
// } // }
// return // return
// } // }
/*
net.LookupIP may cause deadlock in windows
https://github.com/golang/go/issues/24178
*/
func MyLookupIP(host string) ([]net.IP, error) {
ctx ,cancel := context.WithTimeout(context.Background(),time.Second *time.Duration(3))
defer func() {
cancel()
//ctx.Done()
}()
addrs, err := net.DefaultResolver.LookupIPAddr(ctx, host)
if err != nil {
return nil, err
}
ips := make([]net.IP, len(addrs))
for i, ia := range addrs {
ips[i] = ia.IP
}
return ips, nil
}