snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tun_netbsd: update to follow tun_openbsd changes

Browse source 
Most of tun_netbsd is from tun_openbsd with some small changes, so we
should follow the changes made in tun_openbsd.
This commit is contained in:
snow flurry 2022-02-18 19:15:16 -08:00
parent ff49dc80a3
commit 5657c3c1e8
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tun/tun_netbsd.go
View file

@ -6,6 +6,7 @@
package tun package tun
import ( import (
"errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
@ -130,7 +131,7 @@ func CreateTUN(name string, mtu int) (Device, error) {
} else { } else {
for ifIndex = 0; ifIndex < 256; ifIndex += 1 { for ifIndex = 0; ifIndex < 256; ifIndex += 1 {
tunfile, err = os.OpenFile(fmt.Sprintf("/dev/tun%d", ifIndex), unix.O_RDWR, 0) tunfile, err = os.OpenFile(fmt.Sprintf("/dev/tun%d", ifIndex), unix.O_RDWR, 0)
if err == nil || !errorIsEBUSY(err) { if err == nil || !errors.Is(err, syscall.EBUSY) {
break break
} }
} }
@ -249,19 +250,15 @@ func (tun *NativeTun) Read(buff []byte, offset int) (int, error) {
return 0, err return 0, err
default: default:
buff := buff[offset-4:] buff := buff[offset-4:]
// buff := buff[offset:]
n, err := tun.tunFile.Read(buff[:]) n, err := tun.tunFile.Read(buff[:])
if n < 4 { if n < 4 {
return 0, err return 0, err
} }
return n - 4, err return n - 4, err
// return n, err
} }
} }
func (tun *NativeTun) Write(buff []byte, offset int) (int, error) { func (tun *NativeTun) Write(buff []byte, offset int) (int, error) {
// reserve space for header // reserve space for header
buff = buff[offset-4:] buff = buff[offset-4:]
@ -289,8 +286,9 @@ func (tun *NativeTun) Flush() error {
} }
func (tun *NativeTun) Close() error { func (tun *NativeTun) Close() error {
var err2 error var err1, err2 error
err1 := tun.tunFile.Close() tun.closeOnce.Do(func () {
err1 = tun.tunFile.Close()
if tun.routeSocket != -1 { if tun.routeSocket != -1 {
unix.Shutdown(tun.routeSocket, unix.SHUT_RDWR) unix.Shutdown(tun.routeSocket, unix.SHUT_RDWR)
err2 = unix.Close(tun.routeSocket) err2 = unix.Close(tun.routeSocket)
@ -298,6 +296,7 @@ func (tun *NativeTun) Close() error {
} else if tun.events != nil { } else if tun.events != nil {
close(tun.events) close(tun.events)
} }
})
if err1 != nil { if err1 != nil {
return err1 return err1
} }