TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-13 06:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

hostinfo: add SetOSVersion like SetDeviceModel, deprecate ipn.Prefs way

Browse Source 
Turns out the iOS client has been only sending the OS version it first
started at. This whole hostinfo-via-prefs mechanism was never a good idea.
Start removing it.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-10-05 13:23:47 -07:00
committed by Brad Fitzpatrick
parent 98b3fa78aa
commit 81269fad28
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@@ -2275,7 +2275,7 @@ func applyPrefsToHostinfo(hi *tailcfg.Hostinfo, prefs *ipn.Prefs) {
if h := prefs.Hostname; h != "" {
hi.Hostname = h
}
if v := prefs.OSVersion; v != "" {
if v := prefs.OSVersion; v != "" && hi.OSVersion == "" {
hi.OSVersion = v
// The Android app annotates when Google Play Services

6
ipn/prefs.go
View File

@@ -128,9 +128,15 @@ type Prefs struct {
Hostname string
// OSVersion overrides tailcfg.Hostinfo's OSVersion.
//
// Deprecated: we're in the process of deleting this and using
// hostinfo.SetFoo methods instead.
OSVersion string
// DeviceModel overrides tailcfg.Hostinfo's DeviceModel.
//
// Deprecated: we're in the process of deleting this and using
// hostinfo.SetFoo methods instead.
DeviceModel string
// NotepadURLs is a debugging setting that opens OAuth URLs in