From 00faf66d861eb051191c4871e505decc8c7d26ed Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Sun, 26 Apr 2020 07:48:38 +0200 Subject: [PATCH] Supersede InterfaceInfoList's Item method with InterfaceInfo Rather than repetitively calling Info method to calculate InterfaceInfo struct address and return it one by one, a more effective method called InterfaceInfo was introduced. The later returns all interface infos as a Go slice. Signed-off-by: Simon Rozman --- wlanapi_windows.go | 9 +++++++++ wlanapi_windows_test.go | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/wlanapi_windows.go b/wlanapi_windows.go index 4cf97eb..eaff7ae 100644 --- a/wlanapi_windows.go +++ b/wlanapi_windows.go @@ -60,6 +60,8 @@ type InterfaceInfoList struct { } // Item returns interface info at the given index. +// +// Deprecated: Use InterfaceInfo method to obtain interface info as a slice. func (iil *InterfaceInfoList) Item(idx uint32) *InterfaceInfo { if idx > iil.NumberOfItems { panic("index out of range") @@ -70,6 +72,13 @@ func (iil *InterfaceInfoList) Item(idx uint32) *InterfaceInfo { return (*InterfaceInfo)(unsafe.Pointer(addr)) } +// InterfaceInfo returns interface info. +func (iil *InterfaceInfoList) InterfaceInfo() []InterfaceInfo { + addr := uintptr(unsafe.Pointer(iil)) + addr += unsafe.Sizeof(InterfaceInfoList{}) + return (*[(1 << 21) - 1]InterfaceInfo)(unsafe.Pointer(addr))[:iil.NumberOfItems] +} + // Close frees the memory. func (iil *InterfaceInfoList) Close() { wlanFreeMemory(unsafe.Pointer(iil)) diff --git a/wlanapi_windows_test.go b/wlanapi_windows_test.go index b8a5b32..0387689 100644 --- a/wlanapi_windows_test.go +++ b/wlanapi_windows_test.go @@ -53,9 +53,7 @@ func Test(t *testing.T) { } defer ifaces.Close() - for i := uint32(0); i < ifaces.NumberOfItems; i++ { - ii := ifaces.Item(i) - + for _, ii := range ifaces.InterfaceInfo() { t.Logf("Interface: %v, state: %v, GUID: %v", ii.InterfaceDescription(), ii.State,