Fix race with closing event channel
There's still a tiny race on Linux, since the tun channel is written to from two places.
This commit is contained in:
parent
058cedcf66
commit
18f43705ec
|
@ -53,6 +53,8 @@ func (tun *NativeTun) RoutineRouteListener(tunIfindex int) {
|
|||
statusMTU int
|
||||
)
|
||||
|
||||
defer close(tun.events)
|
||||
|
||||
data := make([]byte, os.Getpagesize())
|
||||
for {
|
||||
n, err := unix.Read(tun.routeSocket, data)
|
||||
|
@ -302,7 +304,6 @@ func (tun *NativeTun) Close() error {
|
|||
// We don't even need to call shutdown, or use a rwcancel.
|
||||
err3 = unix.Close(tun.routeSocket)
|
||||
}
|
||||
close(tun.events)
|
||||
if err1 != nil {
|
||||
return err1
|
||||
}
|
||||
|
|
|
@ -89,7 +89,10 @@ func createNetlinkSocket() (int, error) {
|
|||
}
|
||||
|
||||
func (tun *NativeTun) RoutineNetlinkListener() {
|
||||
defer unix.Close(tun.netlinkSock)
|
||||
defer func() {
|
||||
unix.Close(tun.netlinkSock)
|
||||
close(tun.events)
|
||||
}()
|
||||
|
||||
for msg := make([]byte, 1<<16); ; {
|
||||
|
||||
|
@ -357,7 +360,6 @@ func (tun *NativeTun) Close() error {
|
|||
}
|
||||
err2 := tun.fd.Close()
|
||||
err3 := tun.fdCancel.Cancel()
|
||||
close(tun.events)
|
||||
|
||||
if err1 != nil {
|
||||
return err1
|
||||
|
|
Loading…
Reference in a new issue