TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-19 19:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: note package type in Hostinfo

Browse Source 
Fixes tailscale/corp#440

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
(cherry picked from commit 4ec01323c135c44f4f85acd8e2330a8e8542de71)
This commit is contained in:
Brad Fitzpatrick 2021-02-15 13:23:11 -08:00
parent 8319b45be7
commit 90c249cf26
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
control/controlclient/direct.go
View File

@ -22,6 +22,7 @@ import (
"net/url" "net/url"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"reflect" "reflect"
"runtime" "runtime"
"sort" "sort"
@ -230,10 +231,25 @@ func NewHostinfo() *tailcfg.Hostinfo {
Hostname: hostname, Hostname: hostname,
OS: version.OS(), OS: version.OS(),
OSVersion: osv, OSVersion: osv,
Package: packageType(),
GoArch: runtime.GOARCH, GoArch: runtime.GOARCH,
} }
} }
func packageType() string {
switch runtime.GOOS {
case "windows":
if _, err := os.Stat(`C:\ProgramData\chocolatey\lib\tailscale`); err == nil {
return "choco"
}
case "darwin":
// Using tailscaled or IPNExtension?
exe, _ := os.Executable()
return filepath.Base(exe)
}
return ""
}
// SetHostinfo clones the provided Hostinfo and remembers it for the // SetHostinfo clones the provided Hostinfo and remembers it for the
// next update. It reports whether the Hostinfo has changed. // next update. It reports whether the Hostinfo has changed.
func (c *Direct) SetHostinfo(hi *tailcfg.Hostinfo) bool { func (c *Direct) SetHostinfo(hi *tailcfg.Hostinfo) bool {