From b4f5ed6618ea5e1cc62601ab4fd6b395e9db8b99 Mon Sep 17 00:00:00 2001 From: Deon Thomas Date: Sun, 8 May 2022 15:06:12 -0400 Subject: [PATCH] order ip address output, IPv4 first --- cmd/headscale/cli/nodes.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cmd/headscale/cli/nodes.go b/cmd/headscale/cli/nodes.go index aafd9b9..805d2ee 100644 --- a/cmd/headscale/cli/nodes.go +++ b/cmd/headscale/cli/nodes.go @@ -4,7 +4,6 @@ import ( "fmt" "log" "strconv" - "strings" "time" survey "github.com/AlecAivazis/survey/v2" @@ -13,6 +12,7 @@ import ( "github.com/pterm/pterm" "github.com/spf13/cobra" "google.golang.org/grpc/status" + "inet.af/netaddr" "tailscale.com/types/key" ) @@ -452,6 +452,16 @@ func nodesToPtables( // Shared into this namespace namespace = pterm.LightYellow(machine.Namespace.Name) } + + var IpAddresses string + if netaddr.MustParseIP(machine.IpAddresses[0]).Is4() { + IpAddresses = machine.IpAddresses[0] + IpAddresses += ", " + machine.IpAddresses[1] + } else { + IpAddresses = machine.IpAddresses[1] + IpAddresses += ", " + machine.IpAddresses[0] + } + tableData = append( tableData, []string{ @@ -459,7 +469,7 @@ func nodesToPtables( machine.Name, nodeKey.ShortString(), namespace, - strings.Join(machine.IpAddresses, ", "), + IpAddresses, strconv.FormatBool(ephemeral), lastSeenTime, online,