diff --git a/router/local_peer.go b/router/local_peer.go index 239fce4c..f20b0676 100644 --- a/router/local_peer.go +++ b/router/local_peer.go @@ -75,6 +75,12 @@ func (peer *LocalPeer) RelayBroadcast(srcPeer *Peer, df bool, frame []byte, dec } } +func (peer *LocalPeer) Info() string { + peer.RLock() + defer peer.RUnlock() + return peer.Peer.Info() +} + func (peer *LocalPeer) Connections() ConnectionSet { connections := make(ConnectionSet) peer.RLock() diff --git a/router/peer.go b/router/peer.go index 46d024b0..29ffe6d7 100644 --- a/router/peer.go +++ b/router/peer.go @@ -37,8 +37,6 @@ func (peer *Peer) String() string { } func (peer *Peer) Info() string { - peer.RLock() - defer peer.RUnlock() return fmt.Sprint(peer.String(), " (v", peer.version, ") (UID ", peer.UID, ")") } diff --git a/router/peers.go b/router/peers.go index 6a5606d9..1074b267 100644 --- a/router/peers.go +++ b/router/peers.go @@ -160,12 +160,13 @@ func (peers *Peers) String() string { fmt.Fprintf(&buf, " -> %s [%v%s]\n", conn.Remote(), conn.RemoteTCPAddr(), established) } peers.ForEach(func(peer *Peer) { - fmt.Fprintln(&buf, peer.Info()) if peer == peers.ourself.Peer { + fmt.Fprintln(&buf, peers.ourself.Info()) for conn := range peers.ourself.Connections() { printConnection(conn) } } else { + fmt.Fprintln(&buf, peer.Info()) // Modifying peer.connections requires a write lock on // Peers, and since we are holding a read lock (due to the // ForEach), access without locking the peer is safe.