🗽 darwin: use upstreamed connectx(2) libc wrapper

go.mod

@@ -2,4 +2,4 @@ module github.com/database64128/tfo-go/v2
 
 go 1.21.0
 
-require golang.org/x/sys v0.24.0
+require golang.org/x/sys v0.24.1-0.20240828075529-ed67b1566aaf

go.sum

@@ -1,2 +1,2 @@
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.1-0.20240828075529-ed67b1566aaf h1:q2Cx0keWwW5HecyZeIyA3DCuupo8A/zjDqsOQK0+Z80=
+golang.org/x/sys v0.24.1-0.20240828075529-ed67b1566aaf/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

tfo_bsd+linux.go

@@ -96,13 +96,18 @@ func (d *Dialer) dialSingle(ctx context.Context, network string, laddr, raddr *n
 		}
 	}
 
+	rusa, err := unixSockaddrFromSyscallSockaddr(rsa)
+	if err != nil {
+		return nil, err
+	}
+
 	var (
 		n           int
 		canFallback bool
 	)
 
 	if err = connWriteFunc(ctx, f, func(f *os.File) (err error) {
-		n, canFallback, err = connect(rawConn, rsa, b)
+		n, canFallback, err = connect(rawConn, rusa, b)
 		return err
 	}); err != nil {
 		if d.Fallback && canFallback {
@@ -127,7 +132,27 @@ func (d *Dialer) dialSingle(ctx context.Context, network string, laddr, raddr *n
 	return c.(*net.TCPConn), err
 }
 
-func connect(rawConn syscall.RawConn, rsa syscall.Sockaddr, b []byte) (n int, canFallback bool, err error) {
+func unixSockaddrFromSyscallSockaddr(sa syscall.Sockaddr) (unix.Sockaddr, error) {
+	if sa == nil {
+		return nil, nil
+	}
+	switch sa := sa.(type) {
+	case *syscall.SockaddrInet4:
+		return &unix.SockaddrInet4{
+			Port: sa.Port,
+			Addr: sa.Addr,
+		}, nil
+	case *syscall.SockaddrInet6:
+		return &unix.SockaddrInet6{
+			Port:   sa.Port,
+			ZoneId: sa.ZoneId,
+			Addr:   sa.Addr,
+		}, nil
+	}
+	return nil, errors.New("unsupported sockaddr type")
+}
+
+func connect(rawConn syscall.RawConn, rsa unix.Sockaddr, b []byte) (n int, canFallback bool, err error) {
 	var done bool
 
 	if perr := rawConn.Write(func(fd uintptr) bool {

tfo_darwin.go

@@ -99,7 +99,20 @@ const setTFODialerFromSocketSockoptName = "TCP_FASTOPEN_FORCE_ENABLE"
 
 const connectSyscallName = "connectx"
 
-func doConnect(fd uintptr, rsa syscall.Sockaddr, b []byte) (int, error) {
-	n, err := Connectx(int(fd), 0, nil, rsa, b)
+func doConnect(fd uintptr, rsa unix.Sockaddr, b []byte) (int, error) {
+	var (
+		flags uint32
+		iov   []unix.Iovec
+	)
+	if len(b) > 0 {
+		flags = unix.CONNECT_DATA_IDEMPOTENT
+		iov = []unix.Iovec{
+			{
+				Base: &b[0],
+				Len:  uint64(len(b)),
+			},
+		}
+	}
+	n, err := unix.Connectx(int(fd), 0, nil, rsa, unix.SAE_ASSOCID_ANY, flags, iov, nil)
 	return int(n), err
 }

tfo_freebsd+linux.go

@@ -3,8 +3,6 @@
 package tfo
 
 import (
-	"syscall"
-
 	"golang.org/x/sys/unix"
 )
 
@@ -18,6 +16,6 @@ func (*Dialer) setIPv6Only(fd int, family int, ipv6only bool) error {
 
 const connectSyscallName = "sendmsg"
 
-func doConnect(fd uintptr, rsa syscall.Sockaddr, b []byte) (int, error) {
-	return syscall.SendmsgN(int(fd), b, nil, rsa, sendtoImplicitConnectFlag|unix.MSG_NOSIGNAL)
+func doConnect(fd uintptr, rsa unix.Sockaddr, b []byte) (int, error) {
+	return unix.SendmsgN(int(fd), b, nil, rsa, sendtoImplicitConnectFlag|unix.MSG_NOSIGNAL)
 }