Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-10-28 10:51:44 +01:00
Code Issues Projects Releases Wiki Activity

dont panic if node is not available for route

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2025-01-23 12:01:25 +01:00
parent 27bb1201f4
commit e10dfe08b9
No known key found for this signature in database
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/headscale/cli/routes.go
View File

@ -251,10 +251,15 @@ func routesToPtables(routes []*v1.Route) pterm.TableData {
isPrimaryStr = strconv.FormatBool(route.GetIsPrimary()) isPrimaryStr = strconv.FormatBool(route.GetIsPrimary())
} }
var nodeName string
if route.GetNode() != nil {
nodeName = route.GetNode().GetGivenName()
}
tableData = append(tableData, tableData = append(tableData,
[]string{ []string{
strconv.FormatUint(route.GetId(), Base10), strconv.FormatUint(route.GetId(), Base10),
route.GetNode().GetGivenName(), nodeName,
route.GetPrefix(), route.GetPrefix(),
strconv.FormatBool(route.GetAdvertised()), strconv.FormatBool(route.GetAdvertised()),
strconv.FormatBool(route.GetEnabled()), strconv.FormatBool(route.GetEnabled()),

5
hscontrol/types/routes.go
View File

@ -79,7 +79,6 @@ func (rs Routes) Proto() []*v1.Route {
for _, route := range rs { for _, route := range rs {
protoRoute := v1.Route{ protoRoute := v1.Route{
Id: uint64(route.ID), Id: uint64(route.ID),
Node: route.Node.Proto(),
Prefix: route.Prefix.String(), Prefix: route.Prefix.String(),
Advertised: route.Advertised, Advertised: route.Advertised,
Enabled: route.Enabled, Enabled: route.Enabled,
@ -88,6 +87,10 @@ func (rs Routes) Proto() []*v1.Route {
UpdatedAt: timestamppb.New(route.UpdatedAt), UpdatedAt: timestamppb.New(route.UpdatedAt),
} }
if route.Node != nil {
protoRoute.Node = route.Node.Proto()
}
if route.DeletedAt.Valid { if route.DeletedAt.Valid {
protoRoute.DeletedAt = timestamppb.New(route.DeletedAt.Time) protoRoute.DeletedAt = timestamppb.New(route.DeletedAt.Time)
} }