xsteadfastx/wireguard-go
1
0
Fork 0
mirror of https://git.zx2c4.com/wireguard-go synced 2024-11-15 01:05:15 +01:00
Code Issues Releases Wiki Activity

tun: guard Device.Events() against chan writes

Browse Source 
Signed-off-by: Jordan Whited <jordan@tailscale.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jordan Whited 2023-02-08 10:42:07 -08:00 committed by Jason A. Donenfeld
parent ebbd4a4330
commit 1e2c3e5a3c
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tun/netstack/tun.go
View File

@ -109,7 +109,7 @@ func (tun *netTun) File() *os.File {
return nil return nil
} }
func (tun *netTun) Events() chan tun.Event { func (tun *netTun) Events() <-chan tun.Event {
return tun.events return tun.events
} }

2
tun/tun.go
View File

@ -24,6 +24,6 @@ type Device interface {
Flush() error // flush all previous writes to the device Flush() error // flush all previous writes to the device
MTU() (int, error) // returns the MTU of the device MTU() (int, error) // returns the MTU of the device
Name() (string, error) // fetches and returns the current name Name() (string, error) // fetches and returns the current name
Events() chan Event // returns a constant channel of events related to the device Events() <-chan Event // returns a constant channel of events related to the device
Close() error // stops the device and closes the event channel Close() error // stops the device and closes the event channel
} }

2
tun/tun_darwin.go
View File

@ -213,7 +213,7 @@ func (tun *NativeTun) File() *os.File {
return tun.tunFile return tun.tunFile
} }
func (tun *NativeTun) Events() chan Event { func (tun *NativeTun) Events() <-chan Event {
return tun.events return tun.events
} }

2
tun/tun_freebsd.go
View File

@ -329,7 +329,7 @@ func (tun *NativeTun) File() *os.File {
return tun.tunFile return tun.tunFile
} }
func (tun *NativeTun) Events() chan Event { func (tun *NativeTun) Events() <-chan Event {
return tun.events return tun.events
} }

2
tun/tun_linux.go
View File

@ -376,7 +376,7 @@ func (tun *NativeTun) Read(buf []byte, offset int) (n int, err error) {
return return
} }
func (tun *NativeTun) Events() chan Event { func (tun *NativeTun) Events() <-chan Event {
return tun.events return tun.events
} }

2
tun/tun_openbsd.go
View File

@ -200,7 +200,7 @@ func (tun *NativeTun) File() *os.File {
return tun.tunFile return tun.tunFile
} }
func (tun *NativeTun) Events() chan Event { func (tun *NativeTun) Events() <-chan Event {
return tun.events return tun.events
} }

2
tun/tun_windows.go
View File

@ -102,7 +102,7 @@ func (tun *NativeTun) File() *os.File {
return nil return nil
} }
func (tun *NativeTun) Events() chan Event { func (tun *NativeTun) Events() <-chan Event {
return tun.events return tun.events
} }

8
tun/tuntest/tuntest.go
View File

@ -138,10 +138,10 @@ func (t *chTun) Write(data []byte, offset int) (int, error) {
const DefaultMTU = 1420 const DefaultMTU = 1420
func (t *chTun) Flush() error { return nil } func (t *chTun) Flush() error { return nil }
func (t *chTun) MTU() (int, error) { return DefaultMTU, nil } func (t *chTun) MTU() (int, error) { return DefaultMTU, nil }
func (t *chTun) Name() (string, error) { return "loopbackTun1", nil } func (t *chTun) Name() (string, error) { return "loopbackTun1", nil }
func (t *chTun) Events() chan tun.Event { return t.c.events } func (t *chTun) Events() <-chan tun.Event { return t.c.events }
func (t *chTun) Close() error { func (t *chTun) Close() error {
t.Write(nil, -1) t.Write(nil, -1)
return nil return nil