yggdrasil-network/water
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/water.git synced 2025-05-19 08:25:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Styling fixes for Windows device selection support

Browse source
This commit is contained in:
Dmitry Shihovtsev 2019-03-14 15:05:06 +06:00 • committed by Song Gao
parent 86871951e7
commit d689e71bf7
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
params_windows.go
View file

@ -9,9 +9,9 @@ type PlatformSpecificParams struct {
// use the default ComponentId. The default ComponentId is set to tap0901,
// the one used by OpenVPN.
ComponentID string
// InterfaceName is a friendly name of the network adapter as set in Control Panel.
// Of course, you may have multiple tap0901 adapters on the system, in which
// case we need a friendlier way to identify them. In that case we can use
// the friendly name of the network adapter as set in Control Panel.
// case we need a friendlier way to identify them.
InterfaceName string
// Network is required when creating a TUN interface. The library will call
// net.ParseCIDR() to parse this string into LocalIP, RemoteNetaddr,
@ -29,7 +29,6 @@ type PlatformSpecificParams struct {
func defaultPlatformSpecificParams() PlatformSpecificParams {
return PlatformSpecificParams{
ComponentID: "tap0901",
InterfaceName: "",
Network: "192.168.1.10/24",
}
}

26
syscalls_windows.go
View file

@ -17,6 +17,11 @@ import (
// or just install OpenVPN
// https://github.com/OpenVPN/openvpn
const (
// tapDriverKey is a location of the TAP driver key.
tapDriverKey = `SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}`
)
var (
errIfceNameNotFound = errors.New("Failed to find the name of interface")
// Device Control Codes
@ -140,9 +145,7 @@ func tap_control_code(request, method uint32) uint32 {
// getdeviceid finds out a TAP device from registry, it *may* requires privileged right to prevent some weird issue.
func getdeviceid(componentID string, interfaceName string) (deviceid string, err error) {
// TAP driver key location
regkey := `SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}`
k, err := registry.OpenKey(registry.LOCAL_MACHINE, regkey, registry.READ)
k, err := registry.OpenKey(registry.LOCAL_MACHINE, tapDriverKey, registry.READ)
if err != nil {
return "", fmt.Errorf("Failed to open the adapter registry, TAP driver may be not installed, %v", err)
}
@ -154,7 +157,7 @@ func getdeviceid(componentID string, interfaceName string) (deviceid string, err
}
// find the one matched ComponentId
for _, v := range keys {
key, err := registry.OpenKey(registry.LOCAL_MACHINE, regkey+"\\"+v, registry.READ)
key, err := registry.OpenKey(registry.LOCAL_MACHINE, tapDriverKey+"\\"+v, registry.READ)
if err != nil {
continue
}
@ -170,19 +173,14 @@ func getdeviceid(componentID string, interfaceName string) (deviceid string, err
continue
}
if len(interfaceName) > 0 {
key2 := `SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\`+val+`\Connection`
key2 := fmt.Sprintf("%s\\%s\\Connection", tapDriverKey, val)
k2, err := registry.OpenKey(registry.LOCAL_MACHINE, key2, registry.READ)
if err != nil {
fmt.Println("Unable to open", key2)
continue
}
defer k2.Close()
val, _, err := k2.GetStringValue("Name")
if err != nil {
fmt.Println("Unable to get Name value from", key2)
continue
}
if val != interfaceName {
if err != nil || val != interfaceName {
continue
}
}
@ -192,10 +190,10 @@ func getdeviceid(componentID string, interfaceName string) (deviceid string, err
key.Close()
}
if len(interfaceName) > 0 {
return "", fmt.Errorf("Failed to find the tap device in registry with specified ComponentId '%s' and InterfaceName '%s', TAP driver may be not installed or you may have specified an interface name that doesn't exist", componentID)
} else {
return "", fmt.Errorf("Failed to find the tap device in registry with specified ComponentId '%s', TAP driver may be not installed", componentID)
return "", fmt.Errorf("Failed to find the tap device in registry with specified ComponentId '%s' and InterfaceName '%s', TAP driver may be not installed or you may have specified an interface name that doesn't exist", componentID, interfaceName)
}
return "", fmt.Errorf("Failed to find the tap device in registry with specified ComponentId '%s', TAP driver may be not installed", componentID)
}
// setStatus is used to bring up or bring down the interface