don't use type aliases since we are not mirroring the net package

Signed-off-by: Achille Roussel <[email protected]>

Author: achille-roussel

wasip1/dial_wasip1.go

@@ -16,11 +16,8 @@ func init() {
 	}
 }
 
-// Conn is a generic stream-oriented network connection.
-type Conn = net.Conn
-
 // Dial connects to the address on the named network.
-func Dial(network, address string) (Conn, error) {
+func Dial(network, address string) (net.Conn, error) {
 	addr, err := lookupAddr("dial", network, address)
 	if err != nil {
 		return nil, err
@@ -29,12 +26,32 @@ func Dial(network, address string) (Conn, error) {
 }
 
 // DialContext is a variant of Dial that accepts a context.
-func DialContext(ctx context.Context, network, address string) (Conn, error) {
-	_ = ctx // TODO
-	return Dial(network, address)
+func DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	select {
+	case <-ctx.Done():
+		return nil, &net.OpError{
+			Op:  "dial",
+			Net: network,
+			Addr: &networkAddress{
+				network: network,
+				address: address,
+			},
+			Err: context.Cause(ctx),
+		}
+	default:
+		return Dial(network, address)
+	}
 }
 
-func dialAddr(addr net.Addr) (Conn, error) {
+type networkAddress struct {
+	network string
+	address string
+}
+
+func (na *networkAddress) Network() string { return na.address }
+func (na *networkAddress) String() string  { return na.address }
+
+func dialAddr(addr net.Addr) (net.Conn, error) {
 	proto := family(addr)
 	sotype := socketType(addr)
 

wasip1/listen_wasip1.go

@@ -8,19 +8,16 @@ import (
 	"github.com/stealthrocket/net/syscall"
 )
 
-// A Listener is a generic network listener for stream-oriented protocols.
-type Listener = net.Listener
-
 // Listen announces on the local network address.
-func Listen(network, address string) (Listener, error) {
+func Listen(network, address string) (net.Listener, error) {
 	addr, err := lookupAddr("listen", network, address)
 	if err != nil {
 		return nil, err
 	}
 	return listenAddr(addr)
 }
 
-func listenAddr(addr net.Addr) (Listener, error) {
+func listenAddr(addr net.Addr) (net.Listener, error) {
 	fd, err := syscall.Socket(family(addr), socketType(addr), 0)
 	if err != nil {
 		return nil, fmt.Errorf("Socket: %w", err)
@@ -57,7 +54,7 @@ func listenAddr(addr net.Addr) (Listener, error) {
 }
 
 type listener struct {
-	Listener
+	net.Listener
 	addr net.Addr
 }