Fix darwin batch read not exit on stop

nekohasekai · nekohasekai · commit 2f53768be2c9 · 2026-01-15T02:08:56.000+08:00
diff --git a/tun_darwin.go b/tun_darwin.go
@@ -158,7 +158,10 @@ func (t *NativeTun) Close() error {
 		return t.tunFile.Close()
 	}
 	defer flushDNSCache()
-	return E.Errors(t.unsetRoutes(), t.tunFile.Close())
+	t.stopFd.Stop()
+	err := E.Errors(t.unsetRoutes(), t.tunFile.Close())
+	t.stopFd.Close()
+	return err
 }
 
 func (t *NativeTun) Read(p []byte) (n int, err error) {
@@ -356,6 +359,9 @@ func (t *NativeTun) BatchRead() ([]*buf.Buffer, error) {
 		t.buffers = t.buffers[:0]
 		return nil, errno
 	}
+	if n < 0 {
+		return nil, os.ErrClosed
+	}
 	if n < 1 {
 		return nil, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,10 @@ func (t *NativeTun) Close() error {`
`158`	`158`	`return t.tunFile.Close()`
`159`	`159`	`}`
`160`	`160`	`defer flushDNSCache()`
`161`		`- return E.Errors(t.unsetRoutes(), t.tunFile.Close())`
	`161`	`+ t.stopFd.Stop()`
	`162`	`+ err := E.Errors(t.unsetRoutes(), t.tunFile.Close())`
	`163`	`+ t.stopFd.Close()`
	`164`	`+ return err`
`162`	`165`	`}`
`163`	`166`
`164`	`167`	`func (t *NativeTun) Read(p []byte) (n int, err error) {`
`@@ -356,6 +359,9 @@ func (t NativeTun) BatchRead() ([]buf.Buffer, error) {`
`356`	`359`	`t.buffers = t.buffers[:0]`
`357`	`360`	`return nil, errno`
`358`	`361`	`}`
	`362`	`+ if n < 0 {`
	`363`	`+ return nil, os.ErrClosed`
	`364`	`+ }`
`359`	`365`	`if n < 1 {`
`360`	`366`	`return nil, nil`
`361`	`367`	`}`