Issue #8 Use win32 API to set nameservers

crc-org · Aug 1, 2019 · 8150af8 · 8150af8
1 parent 35dd647
commit 8150af8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/pkg/crc/services/dns/dns_windows.go b/pkg/crc/services/dns/dns_windows.go
@@ -10,18 +10,18 @@ import (
 	"github.com/code-ready/crc/pkg/crc/services"
 
 	"github.com/code-ready/crc/pkg/os/windows/powershell"
+	"github.com/code-ready/crc/pkg/os/windows/win32"
 )
 
 func runPostStartForOS(serviceConfig services.ServicePostStartConfig, result *services.ServicePostStartResult) (services.ServicePostStartResult, error) {
-	mainInterface := getMainInterface()
-	serverAddresses := getInterfaceNameserverValues(mainInterface)
-	serverAddresses = append([]string{serviceConfig.IP}, serverAddresses...)
+	// TODO: localize
+	networkInterface := "vEthernet (Default Switch)" //getMainInterface()
 
-	setInterfaceNameserverValues(mainInterface, serverAddresses)
+	setInterfaceNameserverValue(networkInterface, serviceConfig.IP)
 
 	time.Sleep(2 * time.Second)
 
-	if !contains(getInterfaceNameserverValues(mainInterface), serviceConfig.IP) {
+	if !contains(getInterfaceNameserverValues(networkInterface), serviceConfig.IP) {
 		err := errors.New("Nameserver not successfully set")
 		result.Success = false
 		result.Error = err.Error()
@@ -60,11 +60,11 @@ func formatValues(serverAddresses []string) string {
 	return out
 }
 
-func setInterfaceNameserverValues(iface string, serverAddresses []string) {
-	setDNSServerCommand := fmt.Sprintf(`Set-DNSClientServerAddress "%s" -ServerAddresses (%s)`,
-		iface, formatValues(serverAddresses))
+func setInterfaceNameserverValue(iface string, address string) {
+	exe := "netsh"
+	args := fmt.Sprintf(`interface ip set dns "%s" static %s primary`, iface, address)
 
-	powershell.ExecuteAsAdmin(setDNSServerCommand)
+	win32.ShellExecute(win32.HWND_DESKTOP, "runas", exe, args, "", 0)
 }
 
 func getMainInterface() string {

diff --git a/pkg/os/windows/win32/shell32_windows.go b/pkg/os/windows/win32/shell32_windows.go
@@ -1,10 +1,10 @@
 package win32
 
 import (
+	"errors"
+	"fmt"
 	"syscall"
 	"unsafe"
-
-	"github.com/code-ready/crc/pkg/crc/errors"
 )
 
 var (
@@ -35,9 +35,9 @@ func ShellExecute(hwnd HWND, verb, file, parameters, directory string, showCmd i
 
 	ret, _, _ := procShellExecute.Call(uintptr(hwnd), op, toUintptr(file), params, dir, uintptr(showCmd))
 
-	if ret == 0 {
+	if ret == 0 || ret < 32 {
 		return nil
 	}
 
-	return errors.Newf("win32 error %v", ret)
+	return errors.New(fmt.Sprintf("win32 error %v", ret))
 }