diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-05 14:01:21 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-04-05 14:01:21 +0200 |
| commit | e64de87e6418fb1938e264d6d21271caac25818f (patch) | |
| tree | 92096c6a7a4eb82d7ac14d7d590026bbc7f387bb /service | |
| parent | ui: lock to OS thread (diff) | |
| download | wireguard-windows-e64de87e6418fb1938e264d6d21271caac25818f.tar.xz wireguard-windows-e64de87e6418fb1938e264d6d21271caac25818f.zip | |
service: use WireGuardTunnel$ prefix
Diffstat (limited to 'service')
| -rw-r--r-- | service/install.go | 10 | ||||
| -rw-r--r-- | service/names.go | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/service/install.go b/service/install.go index 7f39b2bc..95c42b2f 100644 --- a/service/install.go +++ b/service/install.go @@ -42,7 +42,7 @@ func InstallManager() error { //TODO: Do we want to bail if executable isn't being run from the right location? - serviceName := "WireGuard Manager" + serviceName := "WireGuardManager" service, err := m.OpenService(serviceName) if err == nil { status, err := service.Query() @@ -73,7 +73,7 @@ func InstallManager() error { ServiceType: windows.SERVICE_WIN32_OWN_PROCESS, StartType: mgr.StartAutomatic, ErrorControl: mgr.ErrorNormal, - DisplayName: serviceName, + DisplayName: "WireGuard Manager", } service, err = m.CreateService(serviceName, path, config, "/managerservice") @@ -89,7 +89,7 @@ func UninstallManager() error { if err != nil { return err } - serviceName := "WireGuard Manager" + serviceName := "WireGuardManager" service, err := m.OpenService(serviceName) if err != nil { return err @@ -104,7 +104,7 @@ func UninstallManager() error { } func RunManager() error { - return svc.Run("WireGuard Manager", &managerService{}) + return svc.Run("WireGuardManager", &managerService{}) } func InstallTunnel(configPath string) error { @@ -156,7 +156,7 @@ func InstallTunnel(configPath string) error { ServiceType: windows.SERVICE_WIN32_OWN_PROCESS, StartType: mgr.StartAutomatic, ErrorControl: mgr.ErrorNormal, - DisplayName: serviceName, + DisplayName: "WireGuard Tunnel: " + name, } service, err = m.CreateService(serviceName, path, config, "/tunnelservice", configPath) diff --git a/service/names.go b/service/names.go index 453f3b29..ced657aa 100644 --- a/service/names.go +++ b/service/names.go @@ -14,7 +14,7 @@ func ServiceNameOfTunnel(tunnelName string) (string, error) { if !conf.TunnelNameIsValid(tunnelName) { return "", errors.New("Tunnel name is not valid") } - return "WireGuard Tunnel: " + tunnelName, nil + return "WireGuardTunnel$" + tunnelName, nil } func PipePathOfTunnel(tunnelName string) (string, error) { |