gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 15:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

added address struct

Browse source
This commit is contained in:
0xdcarns 2022-04-27 15:51:29 -04:00
parent 8496a834c3
commit 55dd7c18f7
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
netclient/functions/list.go
View file

@ -15,13 +15,13 @@ import (
// Peer - the peer struct for list // Peer - the peer struct for list
type Peer struct { type Peer struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Interface string `json:"interface,omitempty"` Interface string `json:"interface,omitempty"`
PrivateIPv4 string `json:"private_ipv4,omitempty"` PrivateIPv4 string `json:"private_ipv4,omitempty"`
PrivateIPv6 string `json:"private_ipv6,omitempty"` PrivateIPv6 string `json:"private_ipv6,omitempty"`
PublicKey string `json:"public_key,omitempty"` PublicKey string `json:"public_key,omitempty"`
PublicEndpoint string `json:"public_endpoint,omitempty"` PublicEndpoint string `json:"public_endpoint,omitempty"`
Addresses string `json:"addresses,omitempty"` Addresses []address `json:"addresses,omitempty"`
} }
// Network - the local node network representation for list command // Network - the local node network representation for list command
@ -32,6 +32,11 @@ type Network struct {
Peers []Peer `json:"peers"` Peers []Peer `json:"peers"`
} }
type address struct {
CIDR string `json:"cidr,omitempty"`
IP string `json:"ip,omitempty"`
}
// List - lists the current peers for the local node with name and node ID // List - lists the current peers for the local node with name and node ID
func List(network string) error { func List(network string) error {
nets := []Network{} nets := []Network{}
@ -123,12 +128,13 @@ func getPeers(network string) ([]Peer, error) {
peers := []Peer{} peers := []Peer{}
for _, peer := range nodeGET.Peers { for _, peer := range nodeGET.Peers {
var addresses = "" var addresses = []address{}
for j := range peer.AllowedIPs { for j := range peer.AllowedIPs {
addresses += peer.AllowedIPs[j].String() newAddress := address{
if j < len(peer.AllowedIPs)-1 { CIDR: peer.AllowedIPs[j].String(),
addresses += "," IP: peer.AllowedIPs[j].IP.String(),
} }
addresses = append(addresses, newAddress)
} }
peers = append(peers, Peer{ peers = append(peers, Peer{
PublicKey: peer.PublicKey.String(), PublicKey: peer.PublicKey.String(),