Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-06-05 01:20:21 +02:00
Code Issues Projects Releases Wiki Activity

mapper: make online non-ptr

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2025-05-14 11:58:55 +02:00
parent 62b489dc68
commit a360c98f1b
No known key found for this signature in database
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hscontrol/grpcv1.go
View File

@ -544,6 +544,7 @@ func nodesToProto(polMan policy.PolicyManager, isLikelyConnected *xsync.MapOf[ty
// currently connected nodes.
if val, ok := isLikelyConnected.Load(node.ID); ok && val {
resp.Online = true
resp.LastSeen = timestamppb.New(time.Now())
}
var tags []string

4
hscontrol/mapper/mapper.go
View File

@ -504,7 +504,7 @@ func (m *Mapper) ListPeers(nodeID types.NodeID, peerIDs ...types.NodeID) (types.
for _, peer := range peers {
online := m.notif.IsLikelyConnected(peer.ID)
peer.IsOnline = &online
peer.IsOnline = online
}
return peers, nil
@ -520,7 +520,7 @@ func (m *Mapper) ListNodes(nodeIDs ...types.NodeID) (types.Nodes, error) {
for _, node := range nodes {
online := m.notif.IsLikelyConnected(node.ID)
node.IsOnline = &online
node.IsOnline = online
}
return nodes, nil

3
hscontrol/mapper/mapper_test.go
View File

@ -17,6 +17,7 @@ import (
"tailscale.com/tailcfg"
"tailscale.com/types/dnstype"
"tailscale.com/types/key"
"tailscale.com/types/ptr"
)
var iap = func(ipStr string) *netip.Addr {
@ -184,6 +185,7 @@ func Test_fullMapResponse(t *testing.T) {
}),
Created: created,
Tags: []string{},
Online: ptr.To(false),
LastSeen: &lastSeen,
MachineAuthorized: true,
@ -239,6 +241,7 @@ func Test_fullMapResponse(t *testing.T) {
Hostinfo: hiview(tailcfg.Hostinfo{}),
Created: created,
Tags: []string{},
Online: ptr.To(false),
LastSeen: &lastSeen,
MachineAuthorized: true,

8
hscontrol/mapper/tail.go
View File

@ -9,6 +9,7 @@ import (
"github.com/samber/lo"
"tailscale.com/net/tsaddr"
"tailscale.com/tailcfg"
"tailscale.com/types/ptr"
)
func tailNodes(
@ -107,7 +108,7 @@ func tailNode(
Hostinfo: node.Hostinfo.View(),
Created: node.CreatedAt.UTC(),
Online: node.IsOnline,
Online: ptr.To(node.IsOnline),
Tags: tags,
@ -125,7 +126,10 @@ func tailNode(
tNode.CapMap[tailcfg.NodeAttrRandomizeClientPort] = []tailcfg.RawMessage{}
}
if node.IsOnline == nil || !*node.IsOnline {
if node.IsOnline {
// If the node is online, return the current time.
tNode.LastSeen = ptr.To(time.Now())
} else {
// LastSeen is only set when node is
// not connected to the control server.
tNode.LastSeen = node.LastSeen

4
hscontrol/mapper/tail_test.go
View File

@ -15,6 +15,7 @@ import (
"tailscale.com/net/tsaddr"
"tailscale.com/tailcfg"
"tailscale.com/types/key"
"tailscale.com/types/ptr"
)
func TestTailNode(t *testing.T) {
@ -73,6 +74,7 @@ func TestTailNode(t *testing.T) {
Tags: []string{},
MachineAuthorized: true,
Online: ptr.To(false),
CapMap: tailcfg.NodeCapMap{
tailcfg.CapabilityFileSharing: []tailcfg.RawMessage{},
tailcfg.CapabilityAdmin: []tailcfg.RawMessage{},
@ -158,6 +160,7 @@ func TestTailNode(t *testing.T) {
Tags: []string{},
Online: ptr.To(false),
LastSeen: &lastSeen,
MachineAuthorized: true,
@ -186,6 +189,7 @@ func TestTailNode(t *testing.T) {
Hostinfo: hiview(tailcfg.Hostinfo{}),
Tags: []string{},
MachineAuthorized: true,
Online: ptr.To(false),
CapMap: tailcfg.NodeCapMap{
tailcfg.CapabilityFileSharing: []tailcfg.RawMessage{},

4
hscontrol/types/node.go
View File

@ -110,7 +110,7 @@ type Node struct {
UpdatedAt time.Time
DeletedAt *time.Time
IsOnline *bool `gorm:"-"`
IsOnline bool `gorm:"-"`
}
type Nodes []*Node
@ -512,7 +512,7 @@ func (node *Node) ApplyPeerChange(change *tailcfg.PeerChange) {
}
if change.Online != nil {
node.IsOnline = change.Online
node.IsOnline = *change.Online
}
if change.Endpoints != nil {