From 58a4703b0b5f01f333f6f82b4cfcb0c774ecffeb Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 19 Oct 2021 16:09:19 -0600 Subject: manager: warn about dnscache and old virtio driver Signed-off-by: Jason A. Donenfeld --- tunnel/addressconfig.go | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'tunnel') diff --git a/tunnel/addressconfig.go b/tunnel/addressconfig.go index 907cc546..bf3352b3 100644 --- a/tunnel/addressconfig.go +++ b/tunnel/addressconfig.go @@ -13,7 +13,6 @@ import ( "sort" "golang.org/x/sys/windows" - "golang.org/x/sys/windows/svc/mgr" "golang.zx2c4.com/wireguard/windows/conf" "golang.zx2c4.com/wireguard/windows/tunnel/firewall" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" @@ -57,25 +56,6 @@ func cleanupAddressesOnDisconnectedInterfaces(family winipcfg.AddressFamily, add } } -func isDnsCacheDisabled() (bool, string) { - scm, err := mgr.Connect() - if err != nil { - return false, "" - } - defer scm.Disconnect() - svc := mgr.Service{Name: "dnscache"} - svc.Handle, err = windows.OpenService(scm.Handle, windows.StringToUTF16Ptr(svc.Name), windows.SERVICE_QUERY_CONFIG) - if err != nil { - return false, "" - } - defer svc.Close() - cfg, err := svc.Config() - if err != nil { - return false, "" - } - return cfg.StartType == mgr.StartDisabled, cfg.DisplayName -} - func configureInterface(family winipcfg.AddressFamily, conf *conf.Config, luid winipcfg.LUID) error { estimatedRouteCount := 0 for _, peer := range conf.Peers { @@ -184,11 +164,6 @@ func configureInterface(family winipcfg.AddressFamily, conf *conf.Config, luid w err = luid.SetDNS(family, conf.Interface.DNS, conf.Interface.DNSSearch) if err != nil { - if err == windows.RPC_S_INVALID_BINDING || err == windows.ERROR_SERVICE_NOT_ACTIVE { - if disabled, name := isDnsCacheDisabled(); disabled { - err = fmt.Errorf("the %q service (dnscache) is disabled; please re-enable it", name) - } - } return fmt.Errorf("unable to set DNS %v %v: %w", conf.Interface.DNS, conf.Interface.DNSSearch, err) } return nil -- cgit v1.2.3-59-g8ed1b