snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

wintun: set friendly a bit better

Browse source 
This is still wrong, but NETSETUPPKEY_Driver_FriendlyName seems a bit
tricky to use.
This commit is contained in:
Jason A. Donenfeld 2019-08-20 15:48:08 +02:00
parent eb786cd7c1
commit ef23100a4f
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tun/wintun/wintun_windows.go
View file

@ -316,6 +316,12 @@ func CreateInterface(description string, requestedGUID *windows.GUID) (wintun *W
} }
rebootRequired = checkReboot(devInfoList, deviceData) rebootRequired = checkReboot(devInfoList, deviceData)
err = devInfoList.SetDeviceRegistryPropertyString(deviceData, setupapi.SPDRP_DEVICEDESC, deviceTypeName)
if err != nil {
err = fmt.Errorf("SetDeviceRegistryPropertyString(SPDRP_DEVICEDESC) failed: %v", err)
return
}
// DIF_INSTALLDEVICE returns almost immediately, while the device installation // DIF_INSTALLDEVICE returns almost immediately, while the device installation
// continues in the background. It might take a while, before all registry // continues in the background. It might take a while, before all registry
// keys and values are populated. // keys and values are populated.
@ -342,24 +348,6 @@ func CreateInterface(description string, requestedGUID *windows.GUID) (wintun *W
return return
} }
// Name ourselves.
deviceRegKey, err := registry.OpenKey(registry.LOCAL_MACHINE, wintun.deviceRegKeyName(), registry.SET_VALUE)
if err != nil {
err = fmt.Errorf("Device-level registry key open failed: %v", err)
return
}
defer deviceRegKey.Close()
err = deviceRegKey.SetStringValue("DeviceDesc", deviceTypeName)
if err != nil {
err = fmt.Errorf("SetStringValue(DeviceDesc) failed: %v", err)
return
}
err = deviceRegKey.SetStringValue("FriendlyName", deviceTypeName)
if err != nil {
err = fmt.Errorf("SetStringValue(FriendlyName) failed: %v", err)
return
}
// Wait for network registry key to emerge and populate. // Wait for network registry key to emerge and populate.
netRegKey, err := registryEx.OpenKeyWait( netRegKey, err := registryEx.OpenKeyWait(
registry.LOCAL_MACHINE, registry.LOCAL_MACHINE,
@ -572,23 +560,23 @@ func (wintun *Wintun) SetInterfaceName(ifname string) error {
if err != nil { if err != nil {
return err return err
} }
// TODO: This only sometimes works.
deviceRegKey, err := registry.OpenKey(registry.LOCAL_MACHINE, wintun.deviceRegKeyName(), registry.SET_VALUE) deviceRegKey, err := registry.OpenKey(registry.LOCAL_MACHINE, wintun.deviceRegKeyName(), registry.SET_VALUE)
if err != nil { if err != nil {
return fmt.Errorf("Device-level registry key open failed: %v", err) return fmt.Errorf("Device-level registry key open failed: %v", err)
} }
defer deviceRegKey.Close() defer deviceRegKey.Close()
err = deviceRegKey.SetStringValue("DeviceDesc", deviceTypeName)
if err != nil {
return err
}
err = deviceRegKey.SetStringValue("FriendlyName", deviceTypeName) err = deviceRegKey.SetStringValue("FriendlyName", deviceTypeName)
if err != nil { if err != nil {
return err return err
} }
// We have to tell the various runtime COM services about the new name too. We ignore the // We have to tell the various runtime COM services about the new name too. We ignore the
// error because netshell isn't available on servercore. // error because netshell isn't available on servercore.
// TODO: netsh.exe falls back to NciSetConnection in this case. If somebody complains, maybe // TODO: netsh.exe falls back to NciSetConnection in this case. If somebody complains, maybe
// we should do the same. // we should do the same.
// TODO: This only sometimes works.
netshell.HrRenameConnection(&wintun.cfgInstanceID, windows.StringToUTF16Ptr(ifname)) netshell.HrRenameConnection(&wintun.cfgInstanceID, windows.StringToUTF16Ptr(ifname))
return nil return nil
} }