Hesham/wireguard-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wintun: fix scope of error object

Browse Source
This commit is contained in:
Jason A. Donenfeld 2019-05-10 16:59:24 +02:00
parent 7e962a9932
commit f9dcfccbb7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tun/wintun/wintun_windows.go
View File

@ -277,6 +277,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
var wintun *Wintun var wintun *Wintun
var rebootRequired bool var rebootRequired bool
var key registry.Key
// Install the device. // Install the device.
err = devInfoList.CallClassInstaller(setupapi.DIF_INSTALLDEVICE, deviceData) err = devInfoList.CallClassInstaller(setupapi.DIF_INSTALLDEVICE, deviceData)
@ -295,7 +296,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
// keys and values are populated. // keys and values are populated.
// Wait for device registry key to emerge and populate. // Wait for device registry key to emerge and populate.
key, err := registryEx.OpenKeyWait( key, err = registryEx.OpenKeyWait(
registry.LOCAL_MACHINE, registry.LOCAL_MACHINE,
fmt.Sprintf("SYSTEM\\CurrentControlSet\\Control\\Class\\%v\\%04d", guid.ToString(&deviceClassNetGUID), deviceData.DevInst), fmt.Sprintf("SYSTEM\\CurrentControlSet\\Control\\Class\\%v\\%04d", guid.ToString(&deviceClassNetGUID), deviceData.DevInst),
registry.QUERY_VALUE|registryEx.KEY_NOTIFY, registry.QUERY_VALUE|registryEx.KEY_NOTIFY,
@ -321,7 +322,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
if err == nil { if err == nil {
// Wait for network registry key to emerge and populate. // Wait for network registry key to emerge and populate.
key, err := registryEx.OpenKeyWait( key, err = registryEx.OpenKeyWait(
registry.LOCAL_MACHINE, registry.LOCAL_MACHINE,
wintun.GetNetRegKeyName(), wintun.GetNetRegKeyName(),
registry.QUERY_VALUE|registryEx.KEY_NOTIFY, registry.QUERY_VALUE|registryEx.KEY_NOTIFY,
@ -334,7 +335,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
if err == nil { if err == nil {
// Wait for TCP/IP adapter registry key to emerge and populate. // Wait for TCP/IP adapter registry key to emerge and populate.
key, err := registryEx.OpenKeyWait( key, err = registryEx.OpenKeyWait(
registry.LOCAL_MACHINE, registry.LOCAL_MACHINE,
wintun.GetTcpipAdapterRegKeyName(), registry.QUERY_VALUE|registryEx.KEY_NOTIFY, wintun.GetTcpipAdapterRegKeyName(), registry.QUERY_VALUE|registryEx.KEY_NOTIFY,
waitForRegistryTimeout) waitForRegistryTimeout)
@ -346,7 +347,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
if err == nil { if err == nil {
// Wait for TCP/IP interface registry key to emerge. // Wait for TCP/IP interface registry key to emerge.
key, err := registryEx.OpenKeyWait( key, err = registryEx.OpenKeyWait(
registry.LOCAL_MACHINE, registry.LOCAL_MACHINE,
wintun.GetTcpipInterfaceRegKeyName(), registry.QUERY_VALUE, wintun.GetTcpipInterfaceRegKeyName(), registry.QUERY_VALUE,
waitForRegistryTimeout) waitForRegistryTimeout)
@ -361,7 +362,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
if err == nil { if err == nil {
// Disable dead gateway detection on our interface. // Disable dead gateway detection on our interface.
key, err := registry.OpenKey(registry.LOCAL_MACHINE, wintun.GetTcpipInterfaceRegKeyName(), registry.SET_VALUE) key, err = registry.OpenKey(registry.LOCAL_MACHINE, wintun.GetTcpipInterfaceRegKeyName(), registry.SET_VALUE)
if err != nil { if err != nil {
err = errors.New("Error opening interface-specific TCP/IP network registry key: " + err.Error()) err = errors.New("Error opening interface-specific TCP/IP network registry key: " + err.Error())
} }