TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-08 09:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: log Hostinfo on change

Browse Source 
Fixes #830

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2020-10-19 08:30:36 -07:00
parent 7c8ca28c74
commit 22024a38c3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/controlclient/direct.go
View File

@ -228,6 +228,8 @@ func (c *Direct) SetHostinfo(hi *tailcfg.Hostinfo) bool {
return false return false
} }
c.hostinfo = hi.Clone() c.hostinfo = hi.Clone()
j, _ := json.Marshal(c.hostinfo)
c.logf("HostInfo: %s", j)
return true return true
} }

14
tailcfg/tailcfg.go
View File

@ -259,7 +259,7 @@ type Service struct {
_ structs.Incomparable _ structs.Incomparable
Proto ServiceProto // TCP or UDP Proto ServiceProto // TCP or UDP
Port uint16 // port number service is listening on Port uint16 // port number service is listening on
Description string // text description of service Description string `json:",omitempty"` // text description of service
// TODO(apenwarr): allow advertising services on subnet IPs? // TODO(apenwarr): allow advertising services on subnet IPs?
// TODO(apenwarr): add "tags" here for each service? // TODO(apenwarr): add "tags" here for each service?
@ -275,13 +275,13 @@ type Hostinfo struct {
// TODO(crawshaw): mark all these fields ",omitempty" when all the // TODO(crawshaw): mark all these fields ",omitempty" when all the
// iOS apps are updated with the latest swift version of this struct. // iOS apps are updated with the latest swift version of this struct.
IPNVersion string // version of this code IPNVersion string // version of this code
FrontendLogID string // logtail ID of frontend instance FrontendLogID string `json:",omitempty"` // logtail ID of frontend instance
BackendLogID string // logtail ID of backend instance BackendLogID string `json:",omitempty"` // logtail ID of backend instance
OS string // operating system the client runs on (a version.OS value) OS string // operating system the client runs on (a version.OS value)
OSVersion string // operating system version, with optional distro prefix ("Debian 10.4", "Windows 10 Pro 10.0.19041") OSVersion string `json:",omitempty"` // operating system version, with optional distro prefix ("Debian 10.4", "Windows 10 Pro 10.0.19041")
DeviceModel string // mobile phone model ("Pixel 3a", "iPhone 11 Pro") DeviceModel string `json:",omitempty"` // mobile phone model ("Pixel 3a", "iPhone 11 Pro")
Hostname string // name of the host the client runs on Hostname string // name of the host the client runs on
GoArch string // the host's GOARCH value (of the running binary) GoArch string `json:",omitempty"` // the host's GOARCH value (of the running binary)
RoutableIPs []wgcfg.CIDR `json:",omitempty"` // set of IP ranges this client can route RoutableIPs []wgcfg.CIDR `json:",omitempty"` // set of IP ranges this client can route
RequestTags []string `json:",omitempty"` // set of ACL tags this node wants to claim RequestTags []string `json:",omitempty"` // set of ACL tags this node wants to claim
Services []Service `json:",omitempty"` // services advertised by this machine Services []Service `json:",omitempty"` // services advertised by this machine
@ -328,7 +328,7 @@ type NetInfo struct {
PreferredDERP int PreferredDERP int
// LinkType is the current link type, if known. // LinkType is the current link type, if known.
LinkType string // "wired", "wifi", "mobile" (LTE, 4G, 3G, etc) LinkType string `json:",omitempty"` // "wired", "wifi", "mobile" (LTE, 4G, 3G, etc)
// DERPLatency is the fastest recent time to reach various // DERPLatency is the fastest recent time to reach various
// DERP STUN servers, in seconds. The map key is the // DERP STUN servers, in seconds. The map key is the