From 6db9c4a17333cf88fbef5de281f20f83b85e4bdf Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Thu, 10 Dec 2020 17:23:01 -0800 Subject: [PATCH] wgenginer/router/dns: use constant from golang.org/x/sys/windows Made available in https://golang.org/cl/277153 --- go.mod | 2 +- go.sum | 2 ++ wgengine/router/dns/registry_windows.go | 5 +---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 72302adae..2b4634f03 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( golang.org/x/net v0.0.0-20201110031124-69a78807bb2b golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 - golang.org/x/sys v0.0.0-20201210223839-7e3030f88018 + golang.org/x/sys v0.0.0-20201211002650-1f0c578a6b29 golang.org/x/term v0.0.0-20201207232118-ee85cb95a76b golang.org/x/time v0.0.0-20191024005414-555d28b269f0 golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d diff --git a/go.sum b/go.sum index f3260a82d..424159b6e 100644 --- a/go.sum +++ b/go.sum @@ -204,6 +204,8 @@ golang.org/x/sys v0.0.0-20201202213521-69691e467435 h1:25AvDqqB9PrNqj1FLf2/70I4W golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201210223839-7e3030f88018 h1:XKi8B/gRBuTZN1vU9gFsLMm6zVz5FSCDzm8JYACnjy8= golang.org/x/sys v0.0.0-20201210223839-7e3030f88018/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201211002650-1f0c578a6b29 h1:hAYi5mzhvBeCfkgaIHGZ8R+Q04WjSW5ZvQO3BZ94dHY= +golang.org/x/sys v0.0.0-20201211002650-1f0c578a6b29/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201207232118-ee85cb95a76b h1:a0ErnNnPKmhDyIXQvdZr+Lq8dc8xpMeqkF8y5PgQU4Q= golang.org/x/term v0.0.0-20201207232118-ee85cb95a76b/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/wgengine/router/dns/registry_windows.go b/wgengine/router/dns/registry_windows.go index ec365e239..f8e1f514a 100644 --- a/wgengine/router/dns/registry_windows.go +++ b/wgengine/router/dns/registry_windows.go @@ -18,9 +18,6 @@ import ( "golang.org/x/sys/windows/registry" ) -// REG_NOTIFY_CHANGE_NAME notifies the caller if a subkey is added or deleted. -const REG_NOTIFY_CHANGE_NAME uint32 = 0x00000001 - func openKeyWait(k registry.Key, path string, access uint32, timeout time.Duration) (registry.Key, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() @@ -39,7 +36,7 @@ func openKeyWait(k registry.Key, path string, access uint32, timeout time.Durati var key registry.Key for { - err = windows.RegNotifyChangeKeyValue(windows.Handle(k), false, REG_NOTIFY_CHANGE_NAME, event, true) + err = windows.RegNotifyChangeKeyValue(windows.Handle(k), false, windows.REG_NOTIFY_CHANGE_NAME, event, true) if err != nil { return 0, fmt.Errorf("windows.RegNotifyChangeKeyValue: %v", err) }