eburet-oss/sing-tun-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix darwin batch read not exit on stop

Browse source
This commit is contained in:
世界 2026-01-15 02:01:35 +08:00
parent 9d97d95a9c
commit 2f53768be2
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tun_darwin.go
View file

@ -158,7 +158,10 @@ func (t *NativeTun) Close() error {
return t.tunFile.Close() return t.tunFile.Close()
} }
defer flushDNSCache() 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) { 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] t.buffers = t.buffers[:0]
return nil, errno return nil, errno
} }
if n < 0 {
return nil, os.ErrClosed
}
if n < 1 { if n < 1 {
return nil, nil return nil, nil
} }