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

wintun: Fix double-quoted strings escaping on output

Browse source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-03-08 09:43:54 +01:00
parent 30ab07e354
commit 33c3528430
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tun/wintun/setupapi/setupapi_windows.go
View file

@ -257,7 +257,7 @@ func (deviceInfoSet DevInfo) GetInterfaceID(deviceInfoData *DevInfoData) (*windo
// Convert to windows.GUID. // Convert to windows.GUID.
ifid, err := guid.FromString(value) ifid, err := guid.FromString(value)
if err != nil { if err != nil {
return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: \"%v\")", value) return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: %q)", value)
} }
return ifid, nil return ifid, nil

6
tun/wintun/wintun_windows.go
View file

@ -216,7 +216,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
} }
if driverVersion == 0 { if driverVersion == 0 {
return nil, false, fmt.Errorf("No driver for device \"%v\" installed", hardwareID) return nil, false, fmt.Errorf("No driver for device %q installed", hardwareID)
} }
// Call appropriate class installer. // Call appropriate class installer.
@ -266,7 +266,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
// Convert to windows.GUID. // Convert to windows.GUID.
ifid, err := guid.FromString(value) ifid, err := guid.FromString(value)
if err != nil { if err != nil {
return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: \"%v\")", value) return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: %q)", value)
} }
wintun := (*Wintun)(ifid) wintun := (*Wintun)(ifid)
@ -277,7 +277,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err
return nil, err return nil, err
} }
return nil, errors.New(fmt.Sprintf("RegOpenKeyEx(\"%v\") failed: ", keyNetName) + err.Error()) return nil, errors.New(fmt.Sprintf("RegOpenKeyEx(%q) failed: ", keyNetName) + err.Error())
} }
defer keyNet.Close() defer keyNet.Close()