services: use more reliable method of detecting boot-up

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

4 files changed, 7 insertions, 11 deletions

diff --git a/manager/install.go b/manager/install.go
index f74fecf0..2ab94bc1 100644
--- a/manager/install.go
+++ b/manager/install.go
@@ -17,7 +17,6 @@ import (
 	"golang.org/x/sys/windows/svc/mgr"
 
 	"golang.zx2c4.com/wireguard/windows/conf"
-	"golang.zx2c4.com/wireguard/windows/services"
 )
 
 var cachedServiceManager *mgr.Mgr
@@ -130,7 +129,7 @@ func InstallTunnel(configPath string) error {
 		return err
 	}
 
-	serviceName, err := services.ServiceNameOfTunnel(name)
+	serviceName, err := conf.ServiceNameOfTunnel(name)
 	if err != nil {
 		return err
 	}
@@ -183,7 +182,7 @@ func UninstallTunnel(name string) error {
 	if err != nil {
 		return err
 	}
-	serviceName, err := services.ServiceNameOfTunnel(name)
+	serviceName, err := conf.ServiceNameOfTunnel(name)
 	if err != nil {
 		return err
 	}
@@ -211,7 +210,7 @@ func changeTunnelServiceConfigFilePath(name, oldPath, newPath string) {
 	if err != nil {
 		return
 	}
-	serviceName, err := services.ServiceNameOfTunnel(name)
+	serviceName, err := conf.ServiceNameOfTunnel(name)
 	if err != nil {
 		return
 	}
diff --git a/manager/ipc_server.go b/manager/ipc_server.go
index 504b5cce..dccbce28 100644
--- a/manager/ipc_server.go
+++ b/manager/ipc_server.go
@@ -20,7 +20,6 @@ import (
 	"golang.org/x/sys/windows/svc"
 
 	"golang.zx2c4.com/wireguard/windows/conf"
-	"golang.zx2c4.com/wireguard/windows/services"
 	"golang.zx2c4.com/wireguard/windows/updater"
 )
 
@@ -130,7 +129,7 @@ func (s *ManagerService) Stop(tunnelName string) error {
 }
 
 func (s *ManagerService) WaitForStop(tunnelName string) error {
-	serviceName, err := services.ServiceNameOfTunnel(tunnelName)
+	serviceName, err := conf.ServiceNameOfTunnel(tunnelName)
 	if err != nil {
 		return err
 	}
@@ -161,7 +160,7 @@ func (s *ManagerService) Delete(tunnelName string) error {
 }
 
 func (s *ManagerService) State(tunnelName string) (TunnelState, error) {
-	serviceName, err := services.ServiceNameOfTunnel(tunnelName)
+	serviceName, err := conf.ServiceNameOfTunnel(tunnelName)
 	if err != nil {
 		return 0, err
 	}
diff --git a/manager/service.go b/manager/service.go
index 15ea88f0..db03c3a8 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -22,7 +22,6 @@ import (
 	"golang.zx2c4.com/wireguard/windows/elevate"
 	"golang.zx2c4.com/wireguard/windows/ringlogger"
 	"golang.zx2c4.com/wireguard/windows/services"
-	"golang.zx2c4.com/wireguard/windows/version"
 )
 
 type managerService struct{}
@@ -54,8 +53,7 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
 		return
 	}
 
-	log.Println("Starting", version.UserAgent())
-
+	services.PrintStarting()
 	checkForPitfalls()
 
 	path, err := os.Executable()
diff --git a/manager/tunneltracker.go b/manager/tunneltracker.go
index 103388f2..96020635 100644
--- a/manager/tunneltracker.go
+++ b/manager/tunneltracker.go
@@ -278,7 +278,7 @@ func trackExistingTunnels() error {
 			continue
 		}
 		trackedTunnelsLock.Unlock()
-		serviceName, err := services.ServiceNameOfTunnel(name)
+		serviceName, err := conf.ServiceNameOfTunnel(name)
 		if err != nil {
 			continue
 		}