wintun: match suffix numbers

diff --git a/tun/wintun/wintun_windows.go b/tun/wintun/wintun_windows.go
index c1f50256b74accd66e14383d52c4c695ec6c2583..81da2517b0e13df44577b88724fee13d7ec8524a 100644 (file)
--- a/tun/wintun/wintun_windows.go
+++ b/tun/wintun/wintun_windows.go
@@ -121,8 +121,15 @@ func GetInterface(ifname string) (*Wintun, error) {
                if err != nil {
                        continue
                }
+               ifname2 = strings.ToLower(ifname2)
+               ifname3 := strings.TrimRight(ifname2, "0123456789")
+               if ifname3 != ifname2 && len(ifname3) > 1 && ifname3[len(ifname3)-1] == ' ' {
+                       ifname3 = ifname3[:len(ifname3)-1]
+               } else {
+                       ifname3 = ""
+               }
 
-               if ifname == strings.ToLower(ifname2) {
+               if ifname == ifname2 || (len(ifname3) > 0 && ifname == ifname3) {
                        err = devInfoList.BuildDriverInfoList(deviceData, setupapi.SPDIT_COMPATDRIVER)
                        if err != nil {
                                return nil, fmt.Errorf("SetupDiBuildDriverInfoList failed: %v", err)