Fix darwin writev

nekohasekai · nekohasekai · commit 72899fc25d96 · 2025-07-20T18:26:56.000+08:00
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/sagernet/gvisor v0.0.0-20241123041152-536d05261cff
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a
 	github.com/sagernet/nftables v0.3.0-beta.4
-	github.com/sagernet/sing v0.6.0-beta.2
+	github.com/sagernet/sing v0.6.12-0.20250720102517-17fa6611136d
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
 	golang.org/x/net v0.26.0
diff --git a/go.sum b/go.sum
@@ -22,8 +22,8 @@ github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZN
 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
 github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
 github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
-github.com/sagernet/sing v0.6.0-beta.2 h1:Dcutp3kxrsZes9q3oTiHQhYYjQvDn5rwp1OI9fDLYwQ=
-github.com/sagernet/sing v0.6.0-beta.2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/sing v0.6.12-0.20250720102517-17fa6611136d h1:ZR/6vztdiDJ/rB1NHMrSyq0jCPDKMvWLvAU1ckB0pRs=
+github.com/sagernet/sing v0.6.12-0.20250720102517-17fa6611136d/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
diff --git a/tun_darwin.go b/tun_darwin.go
@@ -40,7 +40,7 @@ type NativeTun struct {
 	inet4Address        [4]byte
 	inet6Address        [16]byte
 	routeSet            bool
-	writeMsgX           bool
+	sendMsgX            bool
 }
 
 type iovecBuffer struct {
@@ -64,8 +64,7 @@ func (b *iovecBuffer) nextIovecs() []unix.Iovec {
 	}
 	if b.buffer == nil {
 		b.buffer = buf.NewSize(b.mtu)
-		b.iovecs[1].Base = &b.buffer.FreeBytes()[0]
-		b.iovecs[1].SetLen(b.mtu)
+		b.iovecs[1] = b.buffer.Iovec(b.buffer.Cap())
 	}
 	return b.iovecs
 }
@@ -77,8 +76,7 @@ func (b *iovecBuffer) nextIovecsOutput(buffer *buf.Buffer) []unix.Iovec {
 	case header.IPv6Version:
 		b.iovecs[0] = packetHeaderVec6
 	}
-	b.iovecs[1].Base = &buffer.Bytes()[0]
-	b.iovecs[1].SetLen(buffer.Len())
+	b.iovecs[1] = buffer.Iovec(buffer.Len())
 	return b.iovecs
 }
 
@@ -132,7 +130,7 @@ func New(options Options) (Tun, error) {
 		msgHdrs:       make([]rawfile.MsgHdrX, batchSize),
 		msgHdrsOutput: make([]rawfile.MsgHdrX, batchSize),
 		stopFd:        common.Must1(stopfd.New()),
-		writeMsgX:     options.EXP_SendMsgX,
+		sendMsgX:      options.EXP_SendMsgX,
 	}
 	for i := 0; i < batchSize; i++ {
 		nativeTun.iovecs[i] = newIovecBuffer(int(options.MTU))
@@ -364,7 +362,7 @@ func (t *NativeTun) BatchRead() ([]*buf.Buffer, error) {
 }
 
 func (t *NativeTun) BatchWrite(buffers []*buf.Buffer) error {
-	if !t.writeMsgX {
+	if !t.sendMsgX {
 		for i, buffer := range buffers {
 			t.iovecsOutput[i].nextIovecsOutput(buffer)
 		}
@@ -381,9 +379,13 @@ func (t *NativeTun) BatchWrite(buffers []*buf.Buffer) error {
 			t.msgHdrsOutput[i].Msg.Iov = &iovecs[0]
 			t.msgHdrsOutput[i].Msg.Iovlen = 2
 		}
-		_, errno := rawfile.NonBlockingSendMMsg(t.tunFd, t.msgHdrsOutput[:len(buffers)])
-		if errno != 0 {
-			return errno
+		var n int
+		for n != len(buffers) {
+			sent, errno := rawfile.NonBlockingSendMMsg(t.tunFd, t.msgHdrsOutput[n:len(buffers)])
+			if errno != 0 {
+				return errno
+			}
+			n += sent
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ type NativeTun struct {`
`40`	`40`	`inet4Address [4]byte`
`41`	`41`	`inet6Address [16]byte`
`42`	`42`	`routeSet bool`
`43`		`- writeMsgX bool`
	`43`	`+ sendMsgX bool`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`type iovecBuffer struct {`
`@@ -64,8 +64,7 @@ func (b *iovecBuffer) nextIovecs() []unix.Iovec {`
`64`	`64`	`}`
`65`	`65`	`if b.buffer == nil {`
`66`	`66`	`b.buffer = buf.NewSize(b.mtu)`
`67`		`- b.iovecs[1].Base = &b.buffer.FreeBytes()[0]`
`68`		`- b.iovecs[1].SetLen(b.mtu)`
	`67`	`+ b.iovecs[1] = b.buffer.Iovec(b.buffer.Cap())`
`69`	`68`	`}`
`70`	`69`	`return b.iovecs`
`71`	`70`	`}`
`@@ -77,8 +76,7 @@ func (b iovecBuffer) nextIovecsOutput(buffer buf.Buffer) []unix.Iovec {`
`77`	`76`	`case header.IPv6Version:`
`78`	`77`	`b.iovecs[0] = packetHeaderVec6`
`79`	`78`	`}`
`80`		`- b.iovecs[1].Base = &buffer.Bytes()[0]`
`81`		`- b.iovecs[1].SetLen(buffer.Len())`
	`79`	`+ b.iovecs[1] = buffer.Iovec(buffer.Len())`
`82`	`80`	`return b.iovecs`
`83`	`81`	`}`
`84`	`82`
`@@ -132,7 +130,7 @@ func New(options Options) (Tun, error) {`
`132`	`130`	`msgHdrs: make([]rawfile.MsgHdrX, batchSize),`
`133`	`131`	`msgHdrsOutput: make([]rawfile.MsgHdrX, batchSize),`
`134`	`132`	`stopFd: common.Must1(stopfd.New()),`
`135`		`- writeMsgX: options.EXP_SendMsgX,`
	`133`	`+ sendMsgX: options.EXP_SendMsgX,`
`136`	`134`	`}`
`137`	`135`	`for i := 0; i < batchSize; i++ {`
`138`	`136`	`nativeTun.iovecs[i] = newIovecBuffer(int(options.MTU))`
`@@ -364,7 +362,7 @@ func (t NativeTun) BatchRead() ([]buf.Buffer, error) {`
`364`	`362`	`}`
`365`	`363`
`366`	`364`	`func (t NativeTun) BatchWrite(buffers []buf.Buffer) error {`
`367`		`- if !t.writeMsgX {`
	`365`	`+ if !t.sendMsgX {`
`368`	`366`	`for i, buffer := range buffers {`
`369`	`367`	`t.iovecsOutput[i].nextIovecsOutput(buffer)`
`370`	`368`	`}`
`@@ -381,9 +379,13 @@ func (t NativeTun) BatchWrite(buffers []buf.Buffer) error {`
`381`	`379`	`t.msgHdrsOutput[i].Msg.Iov = &iovecs[0]`
`382`	`380`	`t.msgHdrsOutput[i].Msg.Iovlen = 2`
`383`	`381`	`}`
`384`		`- _, errno := rawfile.NonBlockingSendMMsg(t.tunFd, t.msgHdrsOutput[:len(buffers)])`
`385`		`- if errno != 0 {`
`386`		`- return errno`
	`382`	`+ var n int`
	`383`	`+ for n != len(buffers) {`
	`384`	`+ sent, errno := rawfile.NonBlockingSendMMsg(t.tunFd, t.msgHdrsOutput[n:len(buffers)])`
	`385`	`+ if errno != 0 {`
	`386`	`+ return errno`
	`387`	`+ }`
	`388`	`+ n += sent`
`387`	`389`	`}`
`388`	`390`	`}`
`389`	`391`	`return nil`