Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set online status in lite requests #1555

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Set online status in lite requests #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f22cdac
set online status in lite requests
kradalby Sep 24, 2023
1e225e2
add todo
kradalby Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions hscontrol/db/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,16 +635,6 @@ func (hsdb *HSDatabase) IsRoutesEnabled(node *types.Node, routeStr string) bool
return false
}

func OnlineNodeMap(peers types.Nodes) map[tailcfg.NodeID]bool {
ret := make(map[tailcfg.NodeID]bool)

for _, peer := range peers {
ret[tailcfg.NodeID(peer.ID)] = peer.IsOnline()
}

return ret
}

func (hsdb *HSDatabase) ListOnlineNodes(
node *types.Node,
) (map[tailcfg.NodeID]bool, error) {
Expand All @@ -656,7 +646,7 @@ func (hsdb *HSDatabase) ListOnlineNodes(
return nil, err
}

return OnlineNodeMap(peers), nil
return peers.OnlineNodeMap(), nil
}

// enableRoutes enables new routes based on a list of new routes.
Expand Down
7 changes: 3 additions & 4 deletions hscontrol/mapper/mapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"time"

mapset "github.com/deckarep/golang-set/v2"
"github.com/juanfont/headscale/hscontrol/db"
"github.com/juanfont/headscale/hscontrol/policy"
"github.com/juanfont/headscale/hscontrol/types"
"github.com/juanfont/headscale/hscontrol/util"
Expand Down Expand Up @@ -218,9 +217,6 @@ func (m *Mapper) fullMapResponse(
return nil, err
}

// TODO(kradalby): Move this into appendPeerChanges?
resp.OnlineChange = db.OnlineNodeMap(peers)

err = appendPeerChanges(
resp,
pol,
Expand Down Expand Up @@ -618,5 +614,8 @@ func appendPeerChanges(
resp.UserProfiles = profiles
resp.SSHPolicy = sshPolicy

// TODO(kradalby): This currently does not take last seen in keepalives into account
resp.OnlineChange = peers.OnlineNodeMap()

return nil
}
10 changes: 10 additions & 0 deletions hscontrol/types/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ type (
Nodes []*Node
)

func (nodes Nodes) OnlineNodeMap() map[tailcfg.NodeID]bool {
ret := make(map[tailcfg.NodeID]bool)

for _, node := range nodes {
ret[tailcfg.NodeID(node.ID)] = node.IsOnline()
}

return ret
}

type NodeAddresses []netip.Addr

func (na NodeAddresses) Sort() {
Expand Down
Loading