diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-03-05 02:29:41 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-03-05 05:36:21 +0100 |
| commit | d539b335e8a7a87dda3da259958bb52183fb760e (patch) | |
| tree | 55d388c2c0b3bfb6164f564740a8b8881ebdc315 /service/install.go | |
| parent | build: musl.cc now offers zips (diff) | |
| download | wireguard-windows-d539b335e8a7a87dda3da259958bb52183fb760e.tar.xz wireguard-windows-d539b335e8a7a87dda3da259958bb52183fb760e.zip | |
conf: validate tunnel name
Diffstat (limited to 'service/install.go')
| -rw-r--r-- | service/install.go | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/service/install.go b/service/install.go index bb2fb046..4203d066 100644 --- a/service/install.go +++ b/service/install.go @@ -122,7 +122,10 @@ func InstallTunnel(configPath string) error { return err } - serviceName := "WireGuard Tunnel: " + name + serviceName, err := ServiceNameOfTunnel(name) + if err != nil { + return err + } service, err := m.OpenService(serviceName) if err == nil { status, err := service.Query() @@ -169,7 +172,10 @@ func UninstallTunnel(name string) error { if err != nil { return err } - serviceName := "WireGuard Tunnel: " + name + serviceName, err := ServiceNameOfTunnel(name) + if err != nil { + return err + } service, err := m.OpenService(serviceName) if err != nil { return err @@ -188,5 +194,9 @@ func RunTunnel(confPath string) error { if err != nil { return err } - return svc.Run("WireGuard Tunnel: "+name, &tunnelService{confPath}) + serviceName, err := ServiceNameOfTunnel(name) + if err != nil { + return err + } + return svc.Run(serviceName, &tunnelService{confPath}) } |