CodeCow/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-06-03 21:01:54 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixup! cmd/tailscale/cli: add routecheck command

Browse Source 
Switch to `tailscale routecheck --probe` instead of `--force`.

Don’t render prefixes that only have one router.

Display the routecheck timestamp in local time.

Signed-off-by: Simon Law <sfllaw@tailscale.com>
This commit is contained in:
Simon Law 2026-05-30 18:55:49 -07:00
parent 1cac053d55
commit 79e84ecbe3
No known key found for this signature in database
GPG Key ID: B83D1EE07548341D
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/tailscale/cli/routecheck.go
View File

@ -6,9 +6,11 @@
package cli
import (
"cmp"
"context"
"flag"
"fmt"
"slices"
"strings"
"text/tabwriter"
"time"
@ -36,19 +38,19 @@ func init() {
var routecheckFlagSet = func() *flag.FlagSet {
fs := newFlagSet("routecheck")
fs.BoolVar(&routecheckArgs.force, "force", false, "force probe to generate a new reachability report")
fs.BoolVar(&routecheckArgs.probe, "probe", false, "probe now to generate a new reachability report")
fs.StringVar(&routecheckArgs.format, "format", "", `output format: empty (for human-readable), "json" or "json-line"`)
return fs
}()
var routecheckArgs struct {
force bool
probe bool
format string
}
func runRoutecheck(ctx context.Context, args []string) error {
routeCheck := localClient.RouteCheck
if routecheckArgs.force {
if routecheckArgs.probe {
routeCheck = localClient.RouteCheckProbe
}
rp, err := routeCheck(ctx)
@ -74,10 +76,17 @@ func printRouteCheckReport(rp *routecheck.Report) error {
}
if rp == nil {
return fmt.Errorf("routecheck: no report")
return fmt.Errorf("routecheck: report unavailable")
}
routes := rp.RoutablePrefixes()
// Don’t render prefixes that only have one router:
for pfx, nodes := range routes {
if len(nodes) <= 1 {
delete(routes, pfx)
}
}
if enc != nil {
out := struct {
Done time.Time `json:"done"`
@ -97,11 +106,14 @@ func printRouteCheckReport(rp *routecheck.Report) error {
w := tabwriter.NewWriter(Stdout, 10, 5, 5, ' ', 0)
defer w.Flush()
fmt.Fprintf(w, "\nReachable routers at %s:\n", rp.Done.UTC().Format(time.DateTime+"Z07:00"))
fmt.Fprintf(w, "\n %s\t%s\t%s\t", "PREFIX", "IP", "HOSTNAME")
fmt.Fprintf(w, "\nReachable routers at %s:\n", rp.Done.Local().Format(time.DateTime+"Z07:00"))
fmt.Fprintf(w, "\n %s\t%s\t%s", "PREFIX", "IP", "HOSTNAME")
for prefix, nodes := range routes.Sorted() {
slices.SortFunc(nodes, func(a, b routecheck.Node) int {
return cmp.Compare(a.Name, b.Name) // order by hostname
})
for _, n := range nodes {
fmt.Fprintf(w, "\n %s\t%s\t%s\t", prefix, n.Addr, strings.TrimSuffix(n.Name, "."))
fmt.Fprintf(w, "\n %s\t%s\t%s", prefix, n.Addr, strings.TrimSuffix(n.Name, "."))
}
}
fmt.Fprintln(w)