From cd92fad3695a961e2b8631d1f4f8241f76e12e9b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 10 Sep 2014 13:15:56 +0100 Subject: [PATCH] Simplify lookup in our_connected_peers --- connection_maker.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/connection_maker.go b/connection_maker.go index 15d27400..9cd6b945 100644 --- a/connection_maker.go +++ b/connection_maker.go @@ -123,15 +123,13 @@ func (cm *ConnectionMaker) checkStateAndAttemptConnections(now time.Time) { // Now look for peers that someone else is connected to, but we don't have a connection to. cm.router.Peers.ForEach(func(name PeerName, peer *Peer) { peer.ForEachConnection(func(peer2 PeerName, conn Connection) { - if peer2 != ourself.Name { - if _, found := our_connected_peers[peer2]; !found { - address := conn.RemoteTCPAddr() - if host, port, err := ExtractHostPort(address); err == nil { - if port != Port { - cm.addToTargets(false, address) - } - cm.addToTargets(false, host) + if peer2 != ourself.Name && !our_connected_peers[peer2] { + address := conn.RemoteTCPAddr() + if host, port, err := ExtractHostPort(address); err == nil { + if port != Port { + cm.addToTargets(false, address) } + cm.addToTargets(false, host) } } })