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:15:41 +02:00
parent 7a83f2565a 142e53f698
commit d8d592787d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tun_darwin.go
View file

@ -46,7 +46,7 @@ var sockaddrCtlSize uintptr = 32
func CreateTUN(name string) (TUNDevice, error) { func CreateTUN(name string) (TUNDevice, error) {
ifIndex := -1 ifIndex := -1
if (name != "utun") { if name != "utun" {
fmt.Sscanf(name, "utun%d", &ifIndex) fmt.Sscanf(name, "utun%d", &ifIndex)
if ifIndex < 0 { if ifIndex < 0 {
return nil, fmt.Errorf("Interface name must be utun[0-9]*") return nil, fmt.Errorf("Interface name must be utun[0-9]*")

2
tun_linux.go
View file

@ -11,6 +11,7 @@ package main
*/ */
import ( import (
"bytes"
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt" "fmt"
@ -19,7 +20,6 @@ import (
"net" "net"
"os" "os"
"strconv" "strconv"
"bytes"
"strings" "strings"
"syscall" "syscall"
"time" "time"

4
uapi_darwin.go
View file

@ -94,9 +94,9 @@ func UAPIListen(name string, file *os.File) (net.Listener, error) {
go func(l *UAPIListener) { go func(l *UAPIListener) {
event := unix.Kevent_t{ event := unix.Kevent_t{
Ident: uint64(uapi.keventFd), Ident: uint64(uapi.keventFd),
Filter: unix.EVFILT_VNODE, Filter: unix.EVFILT_VNODE,
Flags: unix.EV_ADD | unix.EV_ENABLE | unix.EV_ONESHOT, Flags: unix.EV_ADD | unix.EV_ENABLE | unix.EV_ONESHOT,
Fflags: unix.NOTE_WRITE, Fflags: unix.NOTE_WRITE,
} }
events := make([]unix.Kevent_t, 1) events := make([]unix.Kevent_t, 1)