eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

handle route updates correctly

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2023-09-11 11:45:46 -05:00 • committed by Kristoffer Dalby
parent c957f893bd
commit 096ac31bb3
3 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hscontrol/db/routes.go
View file

@ -278,6 +278,12 @@ func (hsdb *HSDatabase) saveMachineRoutes(machine *types.Machine) error {
advertisedRoutes[prefix] = false
}
log.Trace().
Str("machine", machine.Hostname).
Interface("advertisedRoutes", advertisedRoutes).
Interface("currentRoutes", currentRoutes).
Msg("updating routes")
for pos, route := range currentRoutes {
if _, ok := advertisedRoutes[netip.Prefix(route.Prefix)]; ok {
if !route.Advertised {

18
hscontrol/poll.go
View file

@ -66,6 +66,9 @@ func (h *Headscale) handlePoll(
) {
logInfo, logErr := logPollFunc(mapRequest, machine, isNoise)
// This is the mechanism where the node gives us inforamtion about its
// current configuration.
//
// If OmitPeers is true, Stream is false, and ReadOnly is false,
// then te server will let clients update their endpoints without
// breaking existing long-polling (Stream == true) connections.
@ -84,8 +87,11 @@ func (h *Headscale) handlePoll(
Msg("Received endpoint update")
now := time.Now().UTC()
machine.Endpoints = mapRequest.Endpoints
machine.LastSeen = &now
machine.Hostname = mapRequest.Hostinfo.Hostname
machine.HostInfo = types.HostInfo(*mapRequest.Hostinfo)
machine.DiscoKey = util.DiscoPublicKeyStripPrefix(mapRequest.DiscoKey)
machine.Endpoints = mapRequest.Endpoints
if err := h.db.MachineSave(machine); err != nil {
logErr(err, "Failed to persist/update machine in the database")
@ -94,6 +100,14 @@ func (h *Headscale) handlePoll(
return
}
err := h.db.SaveMachineRoutes(machine)
if err != nil {
logErr(err, "Error processing machine routes")
http.Error(writer, "", http.StatusInternalServerError)
return
}
h.nodeNotifier.NotifyWithIgnore(
types.StateUpdate{
Type: types.StatePeerChanged,
@ -134,6 +148,8 @@ func (h *Headscale) handlePoll(
return
}
now := time.Now().UTC()
machine.LastSeen = &now
machine.Hostname = mapRequest.Hostinfo.Hostname
machine.HostInfo = types.HostInfo(*mapRequest.Hostinfo)
machine.DiscoKey = util.DiscoPublicKeyStripPrefix(mapRequest.DiscoKey)