From 4a296b50f7f8925fa08def99a6399a887312aee4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 24 Aug 2019 10:14:16 +0200 Subject: tunnel: move Run into own module to reduce file size Signed-off-by: Jason A. Donenfeld --- manager/install.go | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'manager/install.go') diff --git a/manager/install.go b/manager/install.go index 69a9ad3c..cff1289a 100644 --- a/manager/install.go +++ b/manager/install.go @@ -15,7 +15,7 @@ import ( "golang.org/x/sys/windows/svc/mgr" "golang.zx2c4.com/wireguard/windows/conf" - "golang.zx2c4.com/wireguard/windows/tunnel" + "golang.zx2c4.com/wireguard/windows/services" ) var cachedServiceManager *mgr.Mgr @@ -105,10 +105,6 @@ func UninstallManager() error { return err2 } -func RunManager() error { - return svc.Run("WireGuardManager", &managerService{}) -} - func InstallTunnel(configPath string) error { m, err := serviceManager() if err != nil { @@ -124,7 +120,7 @@ func InstallTunnel(configPath string) error { return err } - serviceName, err := ServiceNameOfTunnel(name) + serviceName, err := services.ServiceNameOfTunnel(name) if err != nil { return err } @@ -177,7 +173,7 @@ func UninstallTunnel(name string) error { if err != nil { return err } - serviceName, err := ServiceNameOfTunnel(name) + serviceName, err := services.ServiceNameOfTunnel(name) if err != nil { return err } @@ -193,15 +189,3 @@ func UninstallTunnel(name string) error { } return err2 } - -func RunTunnel(confPath string) error { - name, err := conf.NameFromPath(confPath) - if err != nil { - return err - } - serviceName, err := ServiceNameOfTunnel(name) - if err != nil { - return err - } - return svc.Run(serviceName, &tunnel.Service{confPath}) -} -- cgit v1.2.3-59-g8ed1b