Skip to content

add support for connected UDP sockets #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions wasip1/listen_wasip1.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,37 @@ func ListenPacket(network, address string) (net.PacketConn, error) {
addr := &netAddr{network, address}
return nil, listenErr(addr, err)
}
conn, err := listenPacketAddr(addrs[0])
conn, err := listenPacketAddr(addrs[0], nil)
if err != nil {
return nil, listenErr(addrs[0], err)
}
return conn, nil
}

// DialUDP connects to the remote UDP network address from the local UDP network address.
func DialUDP(network, localAddr, remoteAddr string) (net.PacketConn, error) {
switch network {
case "udp", "udp4", "udp6":
default:
return nil, unsupportedNetwork(network, localAddr)
}
laddrs, err := lookupAddr(context.Background(), "listen", network, localAddr)
if err != nil {
addr := &netAddr{network, localAddr}
return nil, listenErr(addr, err)
}
raddrs, err := lookupAddr(context.Background(), "dial", network, remoteAddr)
if err != nil {
addr := &netAddr{network, localAddr}
return nil, dialErr(addr, err)
}
conn, err := listenPacketAddr(laddrs[0], raddrs[0])
if err != nil {
return nil, listenErr(laddrs[0], err)
}
return conn, nil
}

func unsupportedNetwork(network, address string) error {
return fmt.Errorf("unsupported network: %s://%s", network, address)
}
Expand Down Expand Up @@ -105,7 +129,8 @@ func listenAddr(addr net.Addr) (net.Listener, error) {
return makeListener(l, name), nil
}

func listenPacketAddr(addr net.Addr) (net.PacketConn, error) {
// If remoteAddr is set, the socket will be connected to that address.
func listenPacketAddr(addr net.Addr, remoteAddr net.Addr) (net.PacketConn, error) {
fd, err := socket(family(addr), SOCK_DGRAM, 0)
if err != nil {
return nil, os.NewSyscallError("socket", err)
Expand All @@ -131,6 +156,16 @@ func listenPacketAddr(addr net.Addr) (net.PacketConn, error) {
return nil, os.NewSyscallError("bind", err)
}

if remoteAddr != nil {
remoteSockAddr, err := socketAddress(remoteAddr)
if err != nil {
return nil, os.NewSyscallError("connect", err)
}
if err := connect(fd, remoteSockAddr); err != nil {
return nil, os.NewSyscallError("connect", err)
}
}

name, err := getsockname(fd)
if err != nil {
return nil, os.NewSyscallError("getsockname", err)
Expand Down