diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-21 08:40:44 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-21 09:16:12 +0200 |
commit | 68fea631d8e97aa7395b944916e569cf66553e73 (patch) | |
tree | 5ebd8d7c0227fd1b59cf961328814335f024060d /tun/wintun/nci | |
parent | ef23100a4f86948e0466dce980d8604ad95f13df (diff) |
wintun: use nci.dll directly instead of buggy netshell
Diffstat (limited to 'tun/wintun/nci')
-rw-r--r-- | tun/wintun/nci/mksyscall.go | 8 | ||||
-rw-r--r-- | tun/wintun/nci/nci_windows.go | 28 | ||||
-rw-r--r-- | tun/wintun/nci/zsyscall_windows.go | 60 |
3 files changed, 96 insertions, 0 deletions
diff --git a/tun/wintun/nci/mksyscall.go b/tun/wintun/nci/mksyscall.go new file mode 100644 index 0000000..15408f4 --- /dev/null +++ b/tun/wintun/nci/mksyscall.go @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: MIT + * + * Copyright (C) 2019 WireGuard LLC. All Rights Reserved. + */ + +package nci + +//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go nci_windows.go diff --git a/tun/wintun/nci/nci_windows.go b/tun/wintun/nci/nci_windows.go new file mode 100644 index 0000000..9dc6699 --- /dev/null +++ b/tun/wintun/nci/nci_windows.go @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: MIT + * + * Copyright (C) 2019 WireGuard LLC. All Rights Reserved. + */ + +package nci + +import "golang.org/x/sys/windows" + +//sys nciSetConnectionName(guid *windows.GUID, newName *uint16) (ret error) = nci.NciSetConnectionName +//sys nciGetConnectionName(guid *windows.GUID, destName *uint16, inDestNameBytes uint32, outDestNameBytes *uint32) (ret error) = nci.NciGetConnectionName + +func SetConnectionName(guid *windows.GUID, newName string) error { + newName16, err := windows.UTF16PtrFromString(newName) + if err != nil { + return err + } + return nciSetConnectionName(guid, newName16) +} + +func ConnectionName(guid *windows.GUID) (string, error) { + var name [0x400]uint16 + err := nciGetConnectionName(guid, &name[0], uint32(len(name)*2), nil) + if err != nil { + return "", err + } + return windows.UTF16ToString(name[:]), nil +} diff --git a/tun/wintun/nci/zsyscall_windows.go b/tun/wintun/nci/zsyscall_windows.go new file mode 100644 index 0000000..2a7b79e --- /dev/null +++ b/tun/wintun/nci/zsyscall_windows.go @@ -0,0 +1,60 @@ +// Code generated by 'go generate'; DO NOT EDIT. + +package nci + +import ( + "syscall" + "unsafe" + + "golang.org/x/sys/windows" +) + +var _ unsafe.Pointer + +// Do the interface allocations only once for common +// Errno values. +const ( + errnoERROR_IO_PENDING = 997 +) + +var ( + errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING) +) + +// errnoErr returns common boxed Errno values, to prevent +// allocations at runtime. +func errnoErr(e syscall.Errno) error { + switch e { + case 0: + return nil + case errnoERROR_IO_PENDING: + return errERROR_IO_PENDING + } + // TODO: add more here, after collecting data on the common + // error values see on Windows. (perhaps when running + // all.bat?) + return e +} + +var ( + modnci = windows.NewLazySystemDLL("nci.dll") + + procNciSetConnectionName = modnci.NewProc("NciSetConnectionName") + procNciGetConnectionName = modnci.NewProc("NciGetConnectionName") +) + +func nciSetConnectionName(guid *windows.GUID, newName *uint16) (ret error) { + r0, _, _ := syscall.Syscall(procNciSetConnectionName.Addr(), 2, uintptr(unsafe.Pointer(guid)), uintptr(unsafe.Pointer(newName)), 0) + if r0 != 0 { + ret = syscall.Errno(r0) + } + return +} + +func nciGetConnectionName(guid *windows.GUID, destName *uint16, inDestNameBytes uint32, outDestNameBytes *uint32) (ret error) { + r0, _, _ := syscall.Syscall6(procNciGetConnectionName.Addr(), 4, uintptr(unsafe.Pointer(guid)), uintptr(unsafe.Pointer(destName)), uintptr(inDestNameBytes), uintptr(unsafe.Pointer(outDestNameBytes)), 0, 0) + if r0 != 0 { + ret = syscall.Errno(r0) + } + return +} |