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

Fix: ip version check

Browse source
This commit is contained in:
Dreamacro 2019-09-27 15:26:07 +08:00
parent 045c3a3ad4
commit c38469330d
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dns/iputil.go
View file

@ -37,8 +37,8 @@ func ResolveIPv4(host string) (net.IP, error) {
} }
for _, ip := range ipAddrs { for _, ip := range ipAddrs {
if len(ip) == net.IPv4len { if ip4 := ip.To4(); ip4 != nil {
return ip, nil return ip4, nil
} }
} }
@ -71,7 +71,7 @@ func ResolveIPv6(host string) (net.IP, error) {
} }
for _, ip := range ipAddrs { for _, ip := range ipAddrs {
if len(ip) == net.IPv6len { if ip.To4() == nil {
return ip, nil return ip, nil
} }
} }

5
dns/resolver.go
View file

@ -222,9 +222,10 @@ func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) { func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) {
ip = net.ParseIP(host) ip = net.ParseIP(host)
if ip != nil { if ip != nil {
if dnsType == D.TypeAAAA && len(ip) == net.IPv6len { isIPv4 := ip.To4() != nil
if dnsType == D.TypeAAAA && !isIPv4 {
return ip, nil return ip, nil
} else if dnsType == D.TypeA && len(ip) == net.IPv4len { } else if dnsType == D.TypeA && isIPv4 {
return ip, nil return ip, nil
} }
} }