From 075621d3ccbfff946f29799d9fbd0e2c78983360 Mon Sep 17 00:00:00 2001 From: maxos Date: Mon, 31 Oct 2022 22:51:01 -0700 Subject: [PATCH 1/2] fix(phys-addr-length): fix physical address length mismatch --- .gitignore | 1 + netroute_windows.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/netroute_windows.go b/netroute_windows.go index 505c2e3..67c5014 100644 --- a/netroute_windows.go +++ b/netroute_windows.go @@ -193,12 +193,18 @@ func getIface(index uint32) *net.Interface { return nil } + physAddrLen := int(ifRow.PhysAddrLen) + if len(ifRow.PhysAddr) < physAddrLen && physAddrLen >= 0 { + physAddrLen = len(ifRow.PhysAddr) + } + physAddr := ifRow.PhysAddr[:physAddrLen] + ifaces, err := net.Interfaces() if err != nil { return nil } for _, iface := range ifaces { - if bytes.Equal(iface.HardwareAddr, ifRow.PhysAddr[:]) { + if bytes.Equal(iface.HardwareAddr, physAddr) { return &iface } } From b72d8b5ea26b49e609fdc56203fe257f2b2c5cef Mon Sep 17 00:00:00 2001 From: Will Date: Tue, 1 Nov 2022 13:15:25 +0000 Subject: [PATCH 2/2] Delete .gitignore separate gitignore change from PR --- .gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 485dee6..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea