Use sock_getaddrinfo by default

Author: chriso

lookup_wasip1.go

@@ -3,67 +3,63 @@ package net
 import (
 	"fmt"
 	"net"
+
+	"github.com/stealthrocket/net/syscall"
 )
 
 func lookupAddr(context, network, address string) (net.Addr, error) {
+	var hints syscall.AddrInfo
 	switch network {
 	case "tcp", "tcp4", "tcp6":
+		hints.SocketType = syscall.SOCK_STREAM
+		hints.Protocol = syscall.IPPROTO_TCP
 	case "udp", "udp4", "udp6":
+		hints.SocketType = syscall.SOCK_DGRAM
+		hints.Protocol = syscall.IPPROTO_UDP
 	case "unix", "unixgram":
 		return &net.UnixAddr{Name: address, Net: network}, nil
 	default:
 		return nil, fmt.Errorf("not implemented: %s", network)
 	}
-	host, portstr, err := net.SplitHostPort(address)
-	if err != nil {
-		return nil, err
+	switch network {
+	case "tcp", "udp":
+		hints.Family = syscall.AF_UNSPEC
+	case "tcp4", "udp4":
+		hints.Family = syscall.AF_INET
+	case "tcp6", "udp6":
+		hints.Family = syscall.AF_INET6
 	}
-	port, err := net.LookupPort(network, portstr)
+	hostname, service, err := net.SplitHostPort(address)
 	if err != nil {
 		return nil, err
 	}
-	if host == "" {
-		if context == "listen" {
-			switch network {
-			case "tcp", "tcp4":
-				return &net.TCPAddr{IP: net.IPv4zero, Port: port}, nil
-			case "tcp6":
-				return &net.TCPAddr{IP: net.IPv6zero, Port: port}, nil
-			}
-		}
-		return nil, fmt.Errorf("invalid address %q for %s", address, context)
+	if context == "listen" && hostname == "" {
+		hints.Flags |= syscall.AI_PASSIVE
 	}
-	ips, err := net.LookupIP(host)
+
+	results := make([]syscall.AddrInfo, 16)
+	n, err := syscall.Getaddrinfo(hostname, service, hints, results)
 	if err != nil {
 		return nil, err
 	}
-	if network == "tcp" || network == "tcp4" {
-		for _, ip := range ips {
-			if len(ip) == net.IPv4len {
-				return &net.TCPAddr{IP: ip, Port: port}, nil
-			}
+	results = results[:n]
+	for _, r := range results {
+		var ip net.IP
+		var port int
+		switch a := r.Address.(type) {
+		case *syscall.SockaddrInet4:
+			ip = a.Addr[:]
+			port = a.Port
+		case *syscall.SockaddrInet6:
+			ip = a.Addr[:]
+			port = a.Port
 		}
-	}
-	if network == "tcp" || network == "tcp6" {
-		for _, ip := range ips {
-			if len(ip) == net.IPv6len {
-				return &net.TCPAddr{IP: ip, Port: port}, nil
-			}
-		}
-	}
-	if network == "udp" || network == "udp4" {
-		for _, ip := range ips {
-			if len(ip) == net.IPv4len {
-				return &net.UDPAddr{IP: ip, Port: port}, nil
-			}
-		}
-	}
-	if network == "udp" || network == "udp6" {
-		for _, ip := range ips {
-			if len(ip) == net.IPv6len {
-				return &net.UDPAddr{IP: ip, Port: port}, nil
-			}
+		switch network {
+		case "tcp", "tcp4", "tcp6":
+			return &net.TCPAddr{IP: ip, Port: port}, nil
+		case "udp", "udp4", "udp6":
+			return &net.UDPAddr{IP: ip, Port: port}, nil
 		}
 	}
-	return nil, fmt.Errorf("cannot listen on %q", host)
+	return nil, fmt.Errorf("lookup failed: %q", address)
 }

lookup_wasip1_purego.go

@@ -20,15 +20,15 @@ func lookupAddr(context, network, address string) (net.Addr, error) {
 	default:
 		return nil, fmt.Errorf("not implemented: %s", network)
 	}
-	host, portstr, err := net.SplitHostPort(address)
+	hostname, service, err := net.SplitHostPort(address)
 	if err != nil {
 		return nil, err
 	}
-	port, err := net.LookupPort(network, portstr)
+	port, err := net.LookupPort(network, service)
 	if err != nil {
 		return nil, err
 	}
-	if host == "" {
+	if hostname == "" {
 		if context == "listen" {
 			switch network {
 			case "tcp", "tcp4":
@@ -39,7 +39,7 @@ func lookupAddr(context, network, address string) (net.Addr, error) {
 		}
 		return nil, fmt.Errorf("invalid address %q for %s", address, context)
 	}
-	ips, err := net.LookupIP(host)
+	ips, err := net.LookupIP(hostname)
 	if err != nil {
 		return nil, err
 	}
@@ -71,5 +71,5 @@ func lookupAddr(context, network, address string) (net.Addr, error) {
 			}
 		}
 	}
-	return nil, fmt.Errorf("cannot listen on %q", host)
+	return nil, fmt.Errorf("lookup failed: %q", address)
 }

syscall/net_wasip1.go

@@ -306,7 +306,7 @@ func Getaddrinfo(name, service string, hints AddrInfo, results []AddrInfo) (int,
 			ai_canonnamelen: uint32(unsafe.Sizeof(AddrInfo{}.cannoname)),
 		}
 		if i > 0 {
-			results[i-1].addrInfo.ai_next = uintptr32(uintptr(unsafe.Pointer(&results[i-1])))
+			results[i-1].addrInfo.ai_next = uintptr32(uintptr(unsafe.Pointer(&results[i-1].addrInfo)))
 		}
 	}