]> git.ipfire.org Git - thirdparty/wireguard-go.git/commitdiff
wintun: give better errors when ndis interface listing fails
authorJason A. Donenfeld <Jason@zx2c4.com>
Wed, 28 Aug 2019 14:39:26 +0000 (08:39 -0600)
committerJason A. Donenfeld <Jason@zx2c4.com>
Wed, 28 Aug 2019 14:39:26 +0000 (08:39 -0600)
tun/wintun/wintun_windows.go

index bae1089a2c99da0bb93e684c836117a30f2af285..b558fd63e85b9cc0b9f48decc876259088a4ae41 100644 (file)
@@ -687,11 +687,11 @@ func (wintun *Wintun) deviceData() (setupapi.DevInfo, *setupapi.DevInfoData, err
 func (wintun *Wintun) AdapterHandle() (windows.Handle, error) {
        interfaces, err := setupapi.CM_Get_Device_Interface_List(wintun.devInstanceID, &deviceInterfaceNetGUID, setupapi.CM_GET_DEVICE_INTERFACE_LIST_PRESENT)
        if err != nil {
-               return windows.InvalidHandle, err
+               return windows.InvalidHandle, fmt.Errorf("Error listing NDIS interfaces: %v", err)
        }
        handle, err := windows.CreateFile(windows.StringToUTF16Ptr(interfaces[0]), windows.GENERIC_READ|windows.GENERIC_WRITE, windows.FILE_SHARE_READ|windows.FILE_SHARE_WRITE|windows.FILE_SHARE_DELETE, nil, windows.OPEN_EXISTING, 0, 0)
        if err != nil {
-               return windows.InvalidHandle, fmt.Errorf("Open NDIS device failed: %v", err)
+               return windows.InvalidHandle, fmt.Errorf("Error opening NDIS device: %v", err)
        }
        return handle, nil
 }