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

Merge branch 'master' of ssh://git.zx2c4.com/wireguard-go

Browse source
This commit is contained in:
Mathias Hall-Andersen 2018-05-05 04:42:44 +02:00
parent 8ba28be732 beab52258a
commit 34891d92cd
1 changed files with 17 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
tun_linux.go
View file

@ -20,7 +20,6 @@ import (
"net" "net"
"os" "os"
"strconv" "strconv"
"strings"
"syscall" "syscall"
"time" "time"
"unsafe" "unsafe"
@ -361,6 +360,7 @@ func (tun *NativeTun) doRead(buff []byte, offset int) (int, error) {
} }
} }
/* https://golang.org/src/crypto/rand/eagain.go */
func unixIsEAGAIN(err error) bool { func unixIsEAGAIN(err error) bool {
if pe, ok := err.(*os.PathError); ok { if pe, ok := err.(*os.PathError); ok {
if errno, ok := pe.Err.(syscall.Errno); ok && errno == syscall.EAGAIN { if errno, ok := pe.Err.(syscall.Errno); ok && errno == syscall.EAGAIN {
@ -395,57 +395,18 @@ func (tun *NativeTun) Close() error {
return nil return nil
} }
func CreateTUNFromFile(fd *os.File) (TUNDevice, error) {
device := &NativeTun{
fd: fd,
events: make(chan TUNEvent, 5),
errors: make(chan error, 5),
nopi: false,
}
var err error
err = syscall.SetNonblock(int(fd.Fd()), true)
if err != nil {
return nil, err
}
_, err = device.Name()
if err != nil {
return nil, err
}
device.closingReader, device.closingWriter, err = os.Pipe()
if err != nil {
return nil, err
}
// start event listener
device.index, err = getIFIndex(device.name)
if err != nil {
return nil, err
}
go device.RoutineNetlinkListener()
go device.RoutineHackListener() // cross namespace
// set default MTU
return device, device.setMTU(DefaultMTU)
}
func CreateTUN(name string) (TUNDevice, error) { func CreateTUN(name string) (TUNDevice, error) {
// open clone device // open clone device
// HACK: we open it as a raw Fd first, so that f.nonblock=false // HACK: we open it as a raw Fd first, so that f.nonblock=false
// when we make it into a file object. // when we make it into a file object.
nfd, err := syscall.Open(cloneDevicePath, os.O_RDWR, 0) nfd, err := unix.Open(cloneDevicePath, os.O_RDWR, 0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = syscall.SetNonblock(nfd, true) err = unix.SetNonblock(nfd, true)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -476,17 +437,27 @@ func CreateTUN(name string) (TUNDevice, error) {
return nil, errno return nil, errno
} }
// read (new) name of interface return CreateTUNFromFile(fd)
}
newName := string(ifr[:]) func CreateTUNFromFile(fd *os.File) (TUNDevice, error) {
newName = newName[:strings.Index(newName, "\000")]
device := &NativeTun{ device := &NativeTun{
fd: fd, fd: fd,
name: newName,
events: make(chan TUNEvent, 5), events: make(chan TUNEvent, 5),
errors: make(chan error, 5), errors: make(chan error, 5),
nopi: false, nopi: false,
} }
var err error
err = unix.SetNonblock(int(fd.Fd()), true)
if err != nil {
return nil, err
}
_, err = device.Name()
if err != nil {
return nil, err
}
device.closingReader, device.closingWriter, err = os.Pipe() device.closingReader, device.closingWriter, err = os.Pipe()
if err != nil { if err != nil {