Improve sockaddr handling

Author: nekohasekai

common/buf/buffer.go

@@ -88,6 +88,9 @@ func (b *Buffer) Extend(n int) []byte {
 
 func (b *Buffer) Advance(from int) {
 	b.start += from
+	if b.end < b.start {
+		b.end = b.start
+	}
 }
 
 func (b *Buffer) Truncate(to int) {

common/bufio/addr_bsd.go

@@ -57,8 +57,8 @@ func copyWaitWithPool(originSource io.Reader, destination N.ExtendedWriter, sour
 		notFirstTime = true
 		if !options.IncreaseBuffer && increaseBufferAfter > 0 && n >= increaseBufferAfter {
 			options.IncreaseBuffer = true
-			vectorisedReadWaiter, isVectorisedReadWaiter := CreateVectorisedReadWaiter(N.UnwrapReader(source))
-			vectorisedWriter, isVectorisedWriter := CreateVectorisedWriter(N.UnwrapWriter(destination))
+			vectorisedReadWaiter, isVectorisedReadWaiter := CreateVectorisedReadWaiter(source)
+			vectorisedWriter, isVectorisedWriter := CreateVectorisedWriter(destination)
 			if !isVectorisedReadWaiter || !isVectorisedWriter {
 				readWaiter.InitializeReadWaiter(options)
 				continue

common/bufio/addr_linux.go

@@ -83,7 +83,7 @@ func (w *SyscallVectorisedPacketWriter) WriteVectorisedPacket(buffers []*buf.Buf
 	var innerErr unix.Errno
 	err := w.rawConn.Write(func(fd uintptr) (done bool) {
 		var msg unix.Msghdr
-		name, nameLen := ToSockaddr(destination.AddrPort())
+		name, nameLen := M.AddrPortToRawSockaddr(destination.AddrPort())
 		msg.Name = (*byte)(name)
 		msg.Namelen = nameLen
 		if len(iovecList) > 0 {

common/bufio/addr_windows.go

@@ -53,7 +53,7 @@ func (w *SyscallVectorisedPacketWriter) WriteVectorisedPacket(buffers []*buf.Buf
 	var n uint32
 	var innerErr error
 	err := w.rawConn.Write(func(fd uintptr) (done bool) {
-		name, nameLen := ToSockaddr(destination.AddrPort())
+		name, nameLen := M.AddrPortToRawSockaddr(destination.AddrPort())
 		var bufs *windows.WSABuf
 		if len(iovecList) > 0 {
 			bufs = &iovecList[0]

common/bufio/copy_direct.go

@@ -0,0 +1,29 @@
+//go:build darwin || dragonfly || freebsd || netbsd || openbsd
+
+package metadata
+
+import (
+	"encoding/binary"
+	"net/netip"
+	"unsafe"
+
+	"golang.org/x/sys/unix"
+)
+
+func AddrPortToRawSockaddr(addrPort netip.AddrPort) (name unsafe.Pointer, nameLen uint32) {
+	if addrPort.Addr().Is4() {
+		var sa unix.RawSockaddrInet4
+		sa.Len = unix.SizeofSockaddrInet4
+		sa.Family = unix.AF_INET
+		sa.Addr = addrPort.Addr().As4()
+		binary.BigEndian.PutUint16((*[2]byte)(unsafe.Pointer(&sa.Port))[:], addrPort.Port())
+		return unsafe.Pointer(&sa), unix.SizeofSockaddrInet4
+	} else {
+		var sa unix.RawSockaddrInet6
+		sa.Len = unix.SizeofSockaddrInet6
+		sa.Family = unix.AF_INET6
+		sa.Addr = addrPort.Addr().As16()
+		binary.BigEndian.PutUint16((*[2]byte)(unsafe.Pointer(&sa.Port))[:], addrPort.Port())
+		return unsafe.Pointer(&sa), unix.SizeofSockaddrInet6
+	}
+}

common/bufio/vectorised_unix.go

@@ -0,0 +1,25 @@
+package metadata
+
+import (
+	"encoding/binary"
+	"net/netip"
+	"unsafe"
+
+	"golang.org/x/sys/unix"
+)
+
+func AddrPortToRawSockaddr(addrPort netip.AddrPort) (name unsafe.Pointer, nameLen uint32) {
+	if addrPort.Addr().Is4() {
+		var sa unix.RawSockaddrInet4
+		sa.Family = unix.AF_INET
+		sa.Addr = addrPort.Addr().As4()
+		binary.BigEndian.PutUint16((*[2]byte)(unsafe.Pointer(&sa.Port))[:], addrPort.Port())
+		return unsafe.Pointer(&sa), unix.SizeofSockaddrInet4
+	} else {
+		var sa unix.RawSockaddrInet6
+		sa.Family = unix.AF_INET6
+		sa.Addr = addrPort.Addr().As16()
+		binary.BigEndian.PutUint16((*[2]byte)(unsafe.Pointer(&sa.Port))[:], addrPort.Port())
+		return unsafe.Pointer(&sa), unix.SizeofSockaddrInet6
+	}
+}

common/bufio/vectorised_windows.go

@@ -0,0 +1,48 @@
+//go:build unix
+
+package metadata
+
+import (
+	"net/netip"
+	"unsafe"
+
+	"golang.org/x/sys/unix"
+)
+
+func AddrPortFromSockaddr(sa unix.Sockaddr) netip.AddrPort {
+	switch addr := sa.(type) {
+	case *unix.SockaddrInet4:
+		return netip.AddrPortFrom(netip.AddrFrom4(addr.Addr), uint16(addr.Port))
+	case *unix.SockaddrInet6:
+		return netip.AddrPortFrom(netip.AddrFrom16(addr.Addr), uint16(addr.Port))
+	default:
+		return netip.AddrPort{}
+	}
+}
+
+func AddrPortToSockaddr(addrPort netip.AddrPort) unix.Sockaddr {
+	if addrPort.Addr().Is4() {
+		return &unix.SockaddrInet4{
+			Port: int(addrPort.Port()),
+			Addr: addrPort.Addr().As4(),
+		}
+	} else {
+		return &unix.SockaddrInet6{
+			Port: int(addrPort.Port()),
+			Addr: addrPort.Addr().As16(),
+		}
+	}
+}
+
+func AddrPortFromRawSockaddr(sa *unix.RawSockaddr) netip.AddrPort {
+	switch sa.Family {
+	case unix.AF_INET:
+		sa4 := (*unix.RawSockaddrInet4)(unsafe.Pointer(sa))
+		return netip.AddrPortFrom(netip.AddrFrom4(sa4.Addr), sa4.Port)
+	case unix.AF_INET6:
+		sa6 := (*unix.RawSockaddrInet6)(unsafe.Pointer(sa))
+		return netip.AddrPortFrom(netip.AddrFrom16(sa6.Addr), sa6.Port)
+	default:
+		return netip.AddrPort{}
+	}
+}