devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-30 02:43:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

order Ip Address, IPv4 first, cleanup

Browse source
This commit is contained in:
Deon Thomas 2022-05-08 15:21:10 -04:00
parent b4f5ed6618
commit 6ed79b7bb8
No known key found for this signature in database
GPG key ID: 0FF7DAE12CA62D67
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/headscale/cli/nodes.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"log" "log"
"strconv" "strconv"
"strings"
"time" "time"
survey "github.com/AlecAivazis/survey/v2" survey "github.com/AlecAivazis/survey/v2"
@ -453,13 +454,14 @@ func nodesToPtables(
namespace = pterm.LightYellow(machine.Namespace.Name) namespace = pterm.LightYellow(machine.Namespace.Name)
} }
var IpAddresses string var IpV4Address string
if netaddr.MustParseIP(machine.IpAddresses[0]).Is4() { var IpV6Address string
IpAddresses = machine.IpAddresses[0] for _, addr := range machine.IpAddresses {
IpAddresses += ", " + machine.IpAddresses[1] if netaddr.MustParseIP(addr).Is4() {
IpV4Address = addr
} else { } else {
IpAddresses = machine.IpAddresses[1] IpV6Address = addr
IpAddresses += ", " + machine.IpAddresses[0] }
} }
tableData = append( tableData = append(
@ -469,7 +471,7 @@ func nodesToPtables(
machine.Name, machine.Name,
nodeKey.ShortString(), nodeKey.ShortString(),
namespace, namespace,
IpAddresses, strings.Join([]string{IpV4Address, IpV6Address}, ", "),
strconv.FormatBool(ephemeral), strconv.FormatBool(ephemeral),
lastSeenTime, lastSeenTime,
online, online,