github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix IP parsing in local dns client

pull/1469/head
Darien Raymond 2018-12-06 20:11:45 +01:00
parent 30b5bffad4
commit 21b3f66b8b
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
features/dns/localdns/client.go
View File

@ -21,7 +21,18 @@ func (*Client) Close() error { return nil }
// LookupIP implements Client.
func (*Client) LookupIP(host string) ([]net.IP, error) {
return net.LookupIP(host)
ips, err := net.LookupIP(host)
if err != nil {
return nil, err
}
parsedIPs := make([]net.IP, 0, len(ips))
for _, ip := range parsedIPs {
parsed := net.IPAddress(ip)
if parsed != nil {
parsedIPs = append(parsedIPs, parsed.IP())
}
}
return parsedIPs, nil
}
// LookupIPv4 implements IPv4Lookup.
@ -30,11 +41,10 @@ func (c *Client) LookupIPv4(host string) ([]net.IP, error) {
if err != nil {
return nil, err
}
var ipv4 []net.IP
ipv4 := make([]net.IP, 0, len(ips))
for _, ip := range ips {
parsed := net.IPAddress(ip)
if parsed.Family().IsIPv4() {
ipv4 = append(ipv4, parsed.IP())
if len(ip) == net.IPv4len {
ipv4 = append(ipv4, ip)
}
}
return ipv4, nil
@ -46,11 +56,10 @@ func (c *Client) LookupIPv6(host string) ([]net.IP, error) {
if err != nil {
return nil, err
}
var ipv6 []net.IP
ipv6 := make([]net.IP, 0, len(ips))
for _, ip := range ips {
parsed := net.IPAddress(ip)
if parsed.Family().IsIPv6() {
ipv6 = append(ipv6, parsed.IP())
if len(ip) == net.IPv6len {
ipv6 = append(ipv6, ip)
}
}
return ipv6, nil