wintun: make description consistent across fields

diff --git a/tun/tun_windows.go b/tun/tun_windows.go
index a66f7097ea92b90a3cbd40a718fb1e7fa411ffd9..aa54ad52c7203e19be211ab516b6ef297f8838fd 100644 (file)
--- a/tun/tun_windows.go
+++ b/tun/tun_windows.go
@@ -108,7 +108,7 @@ func CreateTUNWithRequestedGUID(ifname string, requestedGUID *windows.GUID) (Dev
        } else if err == windows.ERROR_ALREADY_EXISTS {
                return nil, fmt.Errorf("Foreign network interface with the same name exists")
        }
-       wt, _, err = wintun.CreateInterface("WireGuard Tunnel Adapter", requestedGUID)
+       wt, _, err = wintun.CreateInterface(requestedGUID)
        if err != nil {
                return nil, fmt.Errorf("Unable to create Wintun interface: %v", err)
        }

diff --git a/tun/wintun/wintun_windows.go b/tun/wintun/wintun_windows.go
index 1caa4a10770c49deaf53f17c3347496fb59969a8..c1f50256b74accd66e14383d52c4c695ec6c2583 100644 (file)
--- a/tun/wintun/wintun_windows.go
+++ b/tun/wintun/wintun_windows.go
@@ -157,17 +157,14 @@ func GetInterface(ifname string) (*Wintun, error) {
        return nil, windows.ERROR_OBJECT_NOT_FOUND
 }
 
-// CreateInterface creates a Wintun interface. description is a string that
-// supplies the text description of the device. The description is optional
-// and can be "". requestedGUID is the GUID of the created network interface,
-// which then influences NLA generation deterministically. If it is set to nil,
-// the GUID is chosen by the system at random, and hence a new NLA entry is
-// created for each new interface. It is called "requested" GUID because the
-// API it uses is completely undocumented, and so there could be minor
-// interesting complications with its usage. This function returns the network
-// interface ID and a flag if reboot is required.
-//
-func CreateInterface(description string, requestedGUID *windows.GUID) (wintun *Wintun, rebootRequired bool, err error) {
+// CreateInterface creates a Wintun interface. requestedGUID is the GUID of the
+// created network interface, which then influences NLA generation
+// deterministically. If it is set to nil, the GUID is chosen by the system at
+// random, and hence a new NLA entry is created for each new interface. It is
+// called "requested" GUID because the API it uses is completely undocumented,
+// and so there could be minor  interesting complications with its usage. This
+// function returns the network interface ID and a flag if reboot is required.
+func CreateInterface(requestedGUID *windows.GUID) (wintun *Wintun, rebootRequired bool, err error) {
        // Create an empty device info set for network adapter device class.
        devInfoList, err := setupapi.SetupDiCreateDeviceInfoListEx(&deviceClassNetGUID, 0, "")
        if err != nil {
@@ -184,7 +181,7 @@ func CreateInterface(description string, requestedGUID *windows.GUID) (wintun *W
        }
 
        // Create a new device info element and add it to the device info set.
-       deviceData, err := devInfoList.CreateDeviceInfo(className, &deviceClassNetGUID, description, 0, setupapi.DICD_GENERATE_ID)
+       deviceData, err := devInfoList.CreateDeviceInfo(className, &deviceClassNetGUID, deviceTypeName, 0, setupapi.DICD_GENERATE_ID)
        if err != nil {
                err = fmt.Errorf("SetupDiCreateDeviceInfo failed: %v", err)
                return