Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00
Code Issues Projects Releases Wiki Activity

order ip address output, IPv4 first

Browse Source
This commit is contained in:
Deon Thomas 2022-05-08 15:06:12 -04:00
parent 3fbfc5a649
commit b4f5ed6618
No known key found for this signature in database
GPG Key ID: 0FF7DAE12CA62D67
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/headscale/cli/nodes.go
View File

@ -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,