dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Regularize JSON stuff

Browse source
This commit is contained in:
Adam Ierymenko 2019-10-02 09:34:44 -07:00
parent b9911d0db7
commit c3e0f262d1
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
13 changed files with 164 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

4
go/cmd/zerotier/cli/network.go
View file

@ -48,7 +48,7 @@ func Network(basePath, authToken string, args []string, jsonOutput bool) {
fmt.Printf("%s: %s\n", nwids, network.Config.Name)
fmt.Printf("\tstatus:\t%s\n", networkStatusStr(network.Config.Status))
enabled := "no"
if network.TapDeviceEnabled {
if network.PortEnabled {
enabled = "yes"
}
bridge := "no"
@ -59,7 +59,7 @@ func Network(basePath, authToken string, args []string, jsonOutput bool) {
if network.Config.BroadcastEnabled {
broadcast = "on"
}
fmt.Printf("\tport:\t%s dev %s type %s mtu %d enabled %s bridge %s broadcast %s\n", network.Config.MAC.String(), network.TapDeviceName, network.TapDeviceType, network.Config.MTU, enabled, bridge, broadcast)
fmt.Printf("\tport:\t%s dev %s type %s mtu %d enabled %s bridge %s broadcast %s\n", network.Config.MAC.String(), network.PortName, network.PortType, network.Config.MTU, enabled, bridge, broadcast)
fmt.Printf("\tmanaged addresses:\t")
for i, a := range network.Config.AssignedAddresses {
if i > 0 {