diff --git a/netclient/functions/list.go b/netclient/functions/list.go index 4ff08cd5..7c9ece94 100644 --- a/netclient/functions/list.go +++ b/netclient/functions/list.go @@ -14,6 +14,7 @@ import ( "google.golang.org/grpc/metadata" ) +// Peer - the peer struct for list type Peer struct { Name string `json:"name"` Interface string `json:"interface,omitempty"` @@ -22,12 +23,15 @@ type Peer struct { PublicEndpoint string `json:"public_endpoint,omitempty"` } +// Network - the local node network representation for list command type Network struct { Name string `json:"name"` + ID string `json:"node_id"` CurrentNode Peer `json:"current_node"` Peers []Peer `json:"peers"` } +// List - lists the current peers for the local node with name and node ID func List(network string) error { nets := []Network{} var err error @@ -69,6 +73,7 @@ func getNetwork(network string) (Network, error) { } return Network{ Name: network, + ID: cfg.Node.ID, Peers: peers, CurrentNode: Peer{ Name: cfg.Node.Name, diff --git a/serverctl/iptables.go b/serverctl/iptables.go index 084d256e..00317a19 100644 --- a/serverctl/iptables.go +++ b/serverctl/iptables.go @@ -84,7 +84,7 @@ func setForwardPolicy() error { // port forward from an entry, can contain a dns name for lookup func iptablesPortForward(entry string, inport string, outport string, isIP bool) error { - logger.Log(1, "forwarding "+entry+" traffic from host port "+inport+" to container port "+outport) + logger.Log(2, "forwarding "+entry+" traffic from host port "+inport+" to container port "+outport) var address string if !isIP {