TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-09 16:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailcfg: make Node.Hostinfo a HostinfoView

Browse Source 
Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali
2022-02-15 08:19:44 -08:00
committed by Maisem Ali
parent 53998e26a6
commit 72d8672ef7
15 changed files with 72 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wgengine/magicsock/debughttp.go
View File

@@ -191,7 +191,7 @@ func peerDebugName(p *tailcfg.Node) string {
if i := strings.Index(n, "."); i != -1 {
return n[:i]
}
return p.Hostinfo.Hostname
return p.Hostinfo.Hostname()
}
func ipPortLess(a, b netaddr.IPPort) bool {

2
wgengine/magicsock/magicsock.go
View File

@@ -901,7 +901,7 @@ func (c *Conn) Ping(peer *tailcfg.Node, res *ipnstate.PingResult, cb func(*ipnst
}
res.NodeName = peer.Name // prefer DNS name
if res.NodeName == "" {
res.NodeName = peer.Hostinfo.Hostname // else hostname
res.NodeName = peer.Hostinfo.Hostname() // else hostname
} else {
if i := strings.Index(res.NodeName, "."); i != -1 {
res.NodeName = res.NodeName[:i]

2
wgengine/wgcfg/nmcfg/nmcfg.go
View File

@@ -21,7 +21,7 @@ import (
func nodeDebugName(n *tailcfg.Node) string {
name := n.Name
if name == "" {
name = n.Hostinfo.Hostname
name = n.Hostinfo.Hostname()
}
if i := strings.Index(name, "."); i != -1 {
name = name[:i]