diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-16 15:39:42 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-05-16 15:39:42 +0200 |
commit | fae6416229ae5535bc3c6d2cd5fd97c86e020a93 (patch) | |
tree | 77c624f768385edf8791b4904f01f8d7069ab283 /service/install.go | |
parent | firewall: correct protocol condition in NDP filters (diff) | |
download | wireguard-windows-fae6416229ae5535bc3c6d2cd5fd97c86e020a93.tar.xz wireguard-windows-fae6416229ae5535bc3c6d2cd5fd97c86e020a93.zip |
service: use more upstream constants
Diffstat (limited to 'service/install.go')
-rw-r--r-- | service/install.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/service/install.go b/service/install.go index a989ac0e..1d977262 100644 --- a/service/install.go +++ b/service/install.go @@ -8,12 +8,12 @@ package service import ( "errors" "os" - "syscall" "time" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/mgr" + "golang.zx2c4.com/wireguard/windows/conf" ) @@ -130,22 +130,22 @@ func InstallTunnel(configPath string) error { service, err := m.OpenService(serviceName) if err == nil { status, err := service.Query() - if err != nil && err != syscall.Errno(serviceMARKED_FOR_DELETE) { + if err != nil && err != windows.ERROR_SERVICE_MARKED_FOR_DELETE { service.Close() return err } - if status.State != svc.Stopped && err != syscall.Errno(serviceMARKED_FOR_DELETE) { + if status.State != svc.Stopped && err != windows.ERROR_SERVICE_MARKED_FOR_DELETE { service.Close() return errors.New("Tunnel already installed and running") } err = service.Delete() service.Close() - if err != nil && err != syscall.Errno(serviceMARKED_FOR_DELETE) { + if err != nil && err != windows.ERROR_SERVICE_MARKED_FOR_DELETE { return err } for { service, err = m.OpenService(serviceName) - if err != nil && err != syscall.Errno(serviceMARKED_FOR_DELETE) { + if err != nil && err != windows.ERROR_SERVICE_MARKED_FOR_DELETE { break } service.Close() @@ -185,7 +185,7 @@ func UninstallTunnel(name string) error { service.Control(svc.Stop) err = service.Delete() err2 := service.Close() - if err != nil && err != syscall.Errno(serviceMARKED_FOR_DELETE) { + if err != nil && err != windows.ERROR_SERVICE_MARKED_FOR_DELETE { return err } return err2 |