diff options
| author | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2018-05-05 04:15:41 +0200 |
|---|---|---|
| committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2018-05-05 04:15:41 +0200 |
| commit | d8d592787df648dfa1043cfd23e842d53f3b3f27 (patch) | |
| tree | f07258a517340938d5508bb7480c320e53bd0d01 | |
| parent | 7a83f2565a13624d8cb9ca6adf1aced721777a9c (diff) | |
| parent | 142e53f69827e6778d809d9606bb7cd4e77694a2 (diff) | |
Merge branch 'master' of ssh://git.zx2c4.com/wireguard-go
| -rw-r--r-- | tun_darwin.go | 2 | ||||
| -rw-r--r-- | tun_linux.go | 2 | ||||
| -rw-r--r-- | uapi_darwin.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tun_darwin.go b/tun_darwin.go index 5514563..1d66c66 100644 --- a/tun_darwin.go +++ b/tun_darwin.go @@ -46,7 +46,7 @@ var sockaddrCtlSize uintptr = 32 func CreateTUN(name string) (TUNDevice, error) { ifIndex := -1 - if (name != "utun") { + if name != "utun" { fmt.Sscanf(name, "utun%d", &ifIndex) if ifIndex < 0 { return nil, fmt.Errorf("Interface name must be utun[0-9]*") diff --git a/tun_linux.go b/tun_linux.go index 446cc17..e3e1512 100644 --- a/tun_linux.go +++ b/tun_linux.go @@ -11,6 +11,7 @@ package main */ import ( + "bytes" "encoding/binary" "errors" "fmt" @@ -19,7 +20,6 @@ import ( "net" "os" "strconv" - "bytes" "strings" "syscall" "time" diff --git a/uapi_darwin.go b/uapi_darwin.go index 69b0e3d..449fb98 100644 --- a/uapi_darwin.go +++ b/uapi_darwin.go @@ -94,9 +94,9 @@ func UAPIListen(name string, file *os.File) (net.Listener, error) { go func(l *UAPIListener) { event := unix.Kevent_t{ - Ident: uint64(uapi.keventFd), + Ident: uint64(uapi.keventFd), 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, } events := make([]unix.Kevent_t, 1) |