diff --git a/peer/app.go b/peer/app.go index d0ddd5e..2c94a76 100644 --- a/peer/app.go +++ b/peer/app.go @@ -134,23 +134,20 @@ func (a *App) logNetworkState() { for _, p := range peers { ip := p.VPNIP.As4()[3] + up := "DOWN" + if p.Up() { + up = "UP " + } - switch p.State { - case StateDirect: - if p.Role == control.Client { - fmt.Fprintf(&b, " %24s %03d DIRECT @ %s rtt=%s\n", - p.Name, ip, p.WGEndpoint(), p.RTT.Round(time.Millisecond)) - } else { - fmt.Fprintf(&b, " %24s %03d DIRECT @ %s\n", - p.Name, ip, p.WGEndpoint()) - } - - case StateProbing: - fmt.Fprintf(&b, " %24s %03d PROBING @ %s\n", - p.Name, ip, p.PreferredEndpoint()) - case StateRelayed: - fmt.Fprintf(&b, " %24s %03d RELAYED\n", p.Name, ip) + endpoint := p.WGEndpoint() + if endpoint.IsValid() { + fmt.Fprintf(&b, " %24s %03d %s %s seen=%s @ %s\n", + p.Name, ip, p.State, up, time.Since(p.LastPing).Round(time.Millisecond), endpoint) + } else { + fmt.Fprintf(&b, " %24s %03d %s %s seen=%s\n", + p.Name, ip, p.State, up, time.Since(p.LastPing).Round(time.Millisecond)) } } + log.Print(b.String()) } diff --git a/peer/remote.go b/peer/remote.go index 3668255..ab6387d 100644 --- a/peer/remote.go +++ b/peer/remote.go @@ -12,8 +12,8 @@ import ( type PeerState string const ( - StateRelayed = PeerState("RELAY") - StateProbing = PeerState("PROBE") + StateRelayed = PeerState("RELAY ") + StateProbing = PeerState("PROBE ") StateDirect = PeerState("DIRECT") )