diff options
| author |   Simon Rozman <simon@rozman.si> | 2019-05-24 09:08:59 +0200 |
|---|---|---|
| committer | Simon Rozman <simon@rozman.si> | 2019-05-24 11:27:40 +0200 |
| commit | 1dec89e3a3d4e735ae926722c448d67fe657234e (patch) | |
| tree | 5ff178881bc53c5486f901f69f402e4759c6d93a /tunnel/winipcfg | |
| parent | manager: don't forget to close pipe in runtime config (diff) | |
| download | wireguard-windows-1dec89e3a3d4e735ae926722c448d67fe657234e.tar.xz wireguard-windows-1dec89e3a3d4e735ae926722c448d67fe657234e.zip | |
winipcfg: switch to windows.GetAdaptersAddresses
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to '')
| -rw-r--r-- | tunnel/winipcfg/winipcfg.go | 3 | ||||
| -rw-r--r-- | tunnel/winipcfg/zwinipcfg_windows.go | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/tunnel/winipcfg/winipcfg.go b/tunnel/winipcfg/winipcfg.go index bc878606..5af9f1aa 100644 --- a/tunnel/winipcfg/winipcfg.go +++ b/tunnel/winipcfg/winipcfg.go @@ -21,7 +21,6 @@ import ( // Interface-related functions // -//sys getAdaptersAddresses(family uint32, flags GAAFlags, reserved uintptr, adapterAddresses *IPAdapterAddresses, sizePointer *uint32) (ret error) = iphlpapi.GetAdaptersAddresses //sys initializeIPInterfaceEntry(row *MibIPInterfaceRow) = iphlpapi.InitializeIpInterfaceEntry //sys getIPInterfaceTable(family AddressFamily, table **mibIPInterfaceTable) (ret error) = iphlpapi.GetIpInterfaceTable //sys getIPInterfaceEntry(row *MibIPInterfaceRow) (ret error) = iphlpapi.GetIpInterfaceEntry @@ -39,7 +38,7 @@ func GetAdaptersAddresses(family uint32, flags GAAFlags) ([]*IPAdapterAddresses, for { b = make([]byte, size) - err := getAdaptersAddresses(family, flags, 0, (*IPAdapterAddresses)(unsafe.Pointer(&b[0])), &size) + err := windows.GetAdaptersAddresses(family, uint32(flags), 0, (*windows.IpAdapterAddresses)(unsafe.Pointer(&b[0])), &size) if err == nil { break } diff --git a/tunnel/winipcfg/zwinipcfg_windows.go b/tunnel/winipcfg/zwinipcfg_windows.go index b08f887f..8f37ac26 100644 --- a/tunnel/winipcfg/zwinipcfg_windows.go +++ b/tunnel/winipcfg/zwinipcfg_windows.go @@ -40,7 +40,6 @@ var ( modiphlpapi = windows.NewLazySystemDLL("iphlpapi.dll") procFreeMibTable = modiphlpapi.NewProc("FreeMibTable") - procGetAdaptersAddresses = modiphlpapi.NewProc("GetAdaptersAddresses") procInitializeIpInterfaceEntry = modiphlpapi.NewProc("InitializeIpInterfaceEntry") procGetIpInterfaceTable = modiphlpapi.NewProc("GetIpInterfaceTable") procGetIpInterfaceEntry = modiphlpapi.NewProc("GetIpInterfaceEntry") @@ -76,14 +75,6 @@ func freeMibTable(memory unsafe.Pointer) { return } -func getAdaptersAddresses(family uint32, flags GAAFlags, reserved uintptr, adapterAddresses *IPAdapterAddresses, sizePointer *uint32) (ret error) { - r0, _, _ := syscall.Syscall6(procGetAdaptersAddresses.Addr(), 5, uintptr(family), uintptr(flags), uintptr(reserved), uintptr(unsafe.Pointer(adapterAddresses)), uintptr(unsafe.Pointer(sizePointer)), 0) - if r0 != 0 { - ret = syscall.Errno(r0) - } - return -} - func initializeIPInterfaceEntry(row *MibIPInterfaceRow) { syscall.Syscall(procInitializeIpInterfaceEntry.Addr(), 1, uintptr(unsafe.Pointer(row)), 0, 0) return |